diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-11-13 14:16:16 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-11-13 14:52:32 +1000 |
| commit | 14346c08fac465332f229fbfb0adb1d1a75de96c (patch) | |
| tree | 56875e6e322d9f6f1d99f258f80cfa5d51720021 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | |
| parent | Merge v5.10-rc3 into drm-next (diff) | |
| parent | drm/kmb: fix spelling mistakes in drm_info and drm_dbg messages (diff) | |
| download | wireguard-linux-14346c08fac465332f229fbfb0adb1d1a75de96c.tar.xz wireguard-linux-14346c08fac465332f229fbfb0adb1d1a75de96c.zip | |
Merge tag 'drm-misc-next-2020-11-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.11:
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- Remove pgprot_decrypt() before calling io_remap_pfn_range()
- Revert "drm/dp_mst: Retrieve extended DPCD caps for topology manager"
- ttm: Add multihop infrastructure
- doc: Update dma-buf
Driver Changes:
- amdgpu: Use TTM multihop
- kmb: select DRM_MIPI_DSI and depend on ARCH_KEEMBAY; Fix build warning;
Fix typos
- nouveau: Use TTM multihop; Fix out-of-bounds access
- radeon: Use TTM multihop
- ingenic: Search for scaling coefficients to to 102% of screen size
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201112080115.GA7954@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index a5a7992b5773..ed47cbac4f75 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -100,7 +100,6 @@ struct amdgpu_bo { struct amdgpu_bo *parent; struct amdgpu_bo *shadow; - struct ttm_bo_kmap_obj dma_buf_vmap; struct amdgpu_mn *mn; |