Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04381b98 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

drm: Move plane helpers into drm_kms_helper.ko 



The drm core shouldn't depend upon any helpers, and we make sure this
doesn't accidentally happen by moving them into the helper-only
drm_kms_helper.ko module.

v2: Don't break the build for vmwgfx, spotted by Matt.

v3: Unbreak the depency loop around CONFIG_FB (not actually a loop
since it involves select). Reported by Chris.

Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 6e9f798d

drivers/gpu/drm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ 
		drm_crtc.o drm_modes.o drm_edid.o \

		drm_info.o drm_debugfs.o drm_encoder_slave.o \

		drm_trace_points.o drm_global.o drm_prime.o \

		drm_rect.o drm_vma_manager.o drm_flip_work.o \

		drm_plane_helper.o

		drm_rect.o drm_vma_manager.o drm_flip_work.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drm-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_gem_cma_helper.o
@@ -23,7 +22,8 @@ drm-$(CONFIG_DRM_PANEL) += drm_panel.o 


drm-usb-y   := drm_usb.o



drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o

drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \

		drm_plane_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_KMS_FB_HELPER) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o

drivers/gpu/drm/vmwgfx/Kconfig

+5 −2
Original line number Diff line number Diff line 
config DRM_VMWGFX

	tristate "DRM driver for VMware Virtual GPU"

	depends on DRM && PCI && FB

	depends on DRM && PCI

	select FB_DEFERRED_IO

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select DRM_TTM

	# Only needed for the transitional use of drm_crtc_init - can be removed

	# again once vmwgfx sets up the primary plane itself.

	select DRM_KMS_HELPER

	help

	  Choose this option if you would like to run 3D acceleration

	  in a VMware virtual machine.
@@ -14,7 +17,7 @@ config DRM_VMWGFX 
	  The compiled module will be called "vmwgfx.ko".



config DRM_VMWGFX_FBCON

	depends on DRM_VMWGFX

	depends on DRM_VMWGFX && FB

	bool "Enable framebuffer console under vmwgfx by default"

	help

	   Choose this option if you are shipping a new vmwgfx