summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/drm_legacy.h
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2021-01-12 09:10:33 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2021-01-13 14:22:37 +0100
commit02e415f879d2ad011419586e5930d71d668ef1eb (patch)
tree97af1c58cfe941aab8b5fc0a7cdede959f41427e /drivers/gpu/drm/drm_legacy.h
parent413c6466349b5a1f1a3b0d1c62e6074f90ee5eab (diff)
drm: Merge CONFIG_DRM_VM into CONFIG_DRM_LEGACY
CONFIG_DRM_VM gets selected by CONFIG_DRM_LEGACY, but nothing else. So remove it and build drm_vm.o as part of CONFIG_DRM_LEGACY. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210112081035.6882-5-tzimmermann@suse.de
Diffstat (limited to 'drivers/gpu/drm/drm_legacy.h')
-rw-r--r--drivers/gpu/drm/drm_legacy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h
index 1be3ea320474..f71358f9eac9 100644
--- a/drivers/gpu/drm/drm_legacy.h
+++ b/drivers/gpu/drm/drm_legacy.h
@@ -127,7 +127,7 @@ static inline void drm_legacy_master_rmmaps(struct drm_device *dev,
static inline void drm_legacy_rmmaps(struct drm_device *dev) {}
#endif
-#if IS_ENABLED(CONFIG_DRM_VM) && IS_ENABLED(CONFIG_DRM_LEGACY)
+#if IS_ENABLED(CONFIG_DRM_LEGACY)
void drm_legacy_vma_flush(struct drm_device *d);
#else
static inline void drm_legacy_vma_flush(struct drm_device *d)