diff options
| author | Dave Airlie | 2018-12-06 04:43:22 +0100 |
|---|---|---|
| committer | Dave Airlie | 2018-12-06 04:43:56 +0100 |
| commit | 1f9a5dce3548d54d810b23e4e0b1d8c6d73a52d4 (patch) | |
| tree | 1d257e265325b04909278b52fe18cea616bf674f /drivers/gpu/drm/Makefile | |
| parent | Merge tag 'exynos-drm-next-for-v4.21' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | drm/vmwgfx: Use the standard atomic helpers for page-flip (diff) | |
| download | kernel-qcow2-linux-1f9a5dce3548d54d810b23e4e0b1d8c6d73a52d4.tar.gz kernel-qcow2-linux-1f9a5dce3548d54d810b23e4e0b1d8c6d73a52d4.tar.xz kernel-qcow2-linux-1f9a5dce3548d54d810b23e4e0b1d8c6d73a52d4.zip | |
Merge tag 'vmwgfx-next-2018-12-05' of git://people.freedesktop.org/~thomash/linux into drm-next
Pull request of 2018-12-05
Page flip with damage by Deepak and others,
Various vmwgfx minor fixes anc cleanups.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thellstrom@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181205103554.3675-1-thellstrom@vmware.com
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index e490fe2687db..ce8d1d384319 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -37,7 +37,7 @@ drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper drm_kms_helper_common.o drm_dp_dual_mode_helper.o \ drm_simple_kms_helper.o drm_modeset_helper.o \ drm_scdc_helper.o drm_gem_framebuffer_helper.o \ - drm_atomic_state_helper.o + drm_atomic_state_helper.o drm_damage_helper.o drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o |