diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-08-29 08:44:10 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-08-29 08:44:53 +1000 |
| commit | 60d98e1a8dec15f6b9b3fb4174645d1e48a64c79 (patch) | |
| tree | 036a9e16307bb8651dd051e6feb83273a30b7cdf /include | |
| parent | Merge tag 'drm-xe-fixes-2025-08-27' of https://gitlab.freedesktop.org/drm/xe/... (diff) | |
| parent | Revert "drm/tegra: Use dma_buf from GEM object instance" (diff) | |
| download | linux-60d98e1a8dec15f6b9b3fb4174645d1e48a64c79.tar.gz linux-60d98e1a8dec15f6b9b3fb4174645d1e48a64c79.zip | |
Merge tag 'drm-misc-fixes-2025-08-28' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
Several nouveau fixes to remove unused code, fix an error path and be
less restrictive with the formats it accepts. A fix for amdgpu to pin
vmapped dma-buf, and a revert for tegra for a regression in the dma-buf
/ GEM code.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://lore.kernel.org/r/20250828-hypersonic-colorful-squirrel-64f04b@houat
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_gpuvm.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h index 274532facfd6..2e7088264355 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -103,7 +103,7 @@ struct drm_gpuva { } va; /** - * @gem: structure containing the &drm_gem_object and it's offset + * @gem: structure containing the &drm_gem_object and its offset */ struct { /** @@ -843,7 +843,7 @@ struct drm_gpuva_op_map { } va; /** - * @gem: structure containing the &drm_gem_object and it's offset + * @gem: structure containing the &drm_gem_object and its offset */ struct { /** @@ -1189,11 +1189,11 @@ struct drm_gpuvm_ops { /** * @sm_step_unmap: called from &drm_gpuvm_sm_map and - * &drm_gpuvm_sm_unmap to unmap an existent mapping + * &drm_gpuvm_sm_unmap to unmap an existing mapping * - * This callback is called when existent mapping needs to be unmapped. + * This callback is called when existing mapping needs to be unmapped. * This is the case when either a newly requested mapping encloses an - * existent mapping or an unmap of an existent mapping is requested. + * existing mapping or an unmap of an existing mapping is requested. * * The &priv pointer matches the one the driver passed to * &drm_gpuvm_sm_map or &drm_gpuvm_sm_unmap, respectively. |