diff options
| author | Dave Airlie <[email protected]> | 2019-10-29 20:10:59 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-10-29 20:11:47 +0000 |
| commit | a24e4b09dc75357492ca19d74b02e1edebc282e8 (patch) | |
| tree | d94d65004f9b9a2a5b6e1bc4a5d1f9c322645996 /drivers/gpu/drm/lima/lima_mmu.c | |
| parent | Merge tag 'drm-next-5.5-2019-10-25' of git://people.freedesktop.org/~agd5f/li... (diff) | |
| parent | drm/tegra: Move drm_dp_link helpers to Tegra DRM (diff) | |
| download | kernel-a24e4b09dc75357492ca19d74b02e1edebc282e8.tar.gz kernel-a24e4b09dc75357492ca19d74b02e1edebc282e8.zip | |
Merge tag 'drm-misc-next-2019-10-24-2' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.5:
UAPI Changes:
-syncobj: allow querying the last submitted timeline value (David)
-fourcc: explicitly defineDRM_FORMAT_BIG_ENDIAN as unsigned (Adam)
-omap: revert the OMAP_BO_* flags that were added -- no userspace (Sean)
Cross-subsystem Changes:
-MAINTAINERS: add Mihail as komeda co-maintainer (Mihail)
Core Changes:
-edid: a few cleanups, add AVI infoframe bar info (Ville)
-todo: remove i915 device_link item and add difficulty levels (Daniel)
-dp_helpers: add a few new helpers to parse dpcd (Thierry)
Driver Changes:
-gma500: fix a few memory disclosure leaks (Kangjie)
-qxl: convert to use the new drm_gem_object_funcs.mmap (Gerd)
-various: open code dp_link helpers in preparation for helper removal (Thierry)
Cc: Chunming Zhou <[email protected]>
Cc: Adam Jackson <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Kangjie Lu <[email protected]>
Cc: Mihail Atanassov <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: Thierry Reding <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
From: Sean Paul <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20191024155535.GA10294@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/lima/lima_mmu.c')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_mmu.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/lima/lima_mmu.c b/drivers/gpu/drm/lima/lima_mmu.c index 8e1651d6a61f..97ec09dee572 100644 --- a/drivers/gpu/drm/lima/lima_mmu.c +++ b/drivers/gpu/drm/lima/lima_mmu.c @@ -8,7 +8,6 @@ #include "lima_device.h" #include "lima_mmu.h" #include "lima_vm.h" -#include "lima_object.h" #include "lima_regs.h" #define mmu_write(reg, data) writel(data, ip->iomem + reg) |