diff options
author | Dave Airlie <airlied@redhat.com> | 2020-02-28 16:21:14 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-02-28 16:22:41 +1000 |
commit | 60347451ddb0646c1a9cc5b9581e5bcf648ad1aa (patch) | |
tree | 73cd9298b66b4a84b0e3f02346202f905f5840bd /drivers/gpu/drm/omapdrm/dss/Makefile | |
parent | Merge tag 'amd-drm-next-5.7-2020-02-26' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
parent | drm/virtio: add virtio_gpu_is_shmem helper (diff) | |
download | linux-dev-60347451ddb0646c1a9cc5b9581e5bcf648ad1aa.tar.xz linux-dev-60347451ddb0646c1a9cc5b9581e5bcf648ad1aa.zip |
Merge tag 'drm-misc-next-2020-02-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.7
UAPI Changes:
Cross-subsystem Changes:
Core Changes:
- bridge: huge rework to get rid of omap_dss custom display drivers
Driver Changes:
- hisilicon: some fixes related to modes it can deal with / default to
- virtio: shmem and gpu context fixes and enhancements
- sun4i: Support for LVDS on the A33
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227113222.cdwzy4cvcqjtbmou@gilmour.lan
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/Makefile')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/Makefile b/drivers/gpu/drm/omapdrm/dss/Makefile index 5950c3f52c2e..f967e6948f2e 100644 --- a/drivers/gpu/drm/omapdrm/dss/Makefile +++ b/drivers/gpu/drm/omapdrm/dss/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_OMAP2_DSS_INIT) += omapdss-boot-init.o obj-$(CONFIG_OMAP_DSS_BASE) += omapdss-base.o -omapdss-base-y := base.o display.o dss-of.o output.o +omapdss-base-y := base.o display.o output.o obj-$(CONFIG_OMAP2_DSS) += omapdss.o # Core DSS files |