Commit 9960aa7c authored by Tomi Valkeinen's avatar Tomi Valkeinen

drm/omap: move omapdss & displays under omapdrm

Now that omapfb has its own copy of omapdss and display drivers, we can
move omapdss and display drivers which omapdrm uses to omapdrm's
directory.

We also need to change the main drm Makefile so that omapdrm directory
is always entered, because omapdss has a file that can't be built as a
module.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
parent 5ca28914
...@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/ ...@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/ obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/ obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/ obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
obj-$(CONFIG_DRM_OMAP) += omapdrm/ obj-y += omapdrm/
obj-y += tilcdc/ obj-y += tilcdc/
obj-$(CONFIG_DRM_QXL) += qxl/ obj-$(CONFIG_DRM_QXL) += qxl/
obj-$(CONFIG_DRM_BOCHS) += bochs/ obj-$(CONFIG_DRM_BOCHS) += bochs/
......
config DRM_OMAP config DRM_OMAP
tristate "OMAP DRM" tristate "OMAP DRM"
depends on DRM depends on DRM
...@@ -24,3 +23,5 @@ config DRM_OMAP_NUM_CRTCS ...@@ -24,3 +23,5 @@ config DRM_OMAP_NUM_CRTCS
Select the number of video overlays which can be used as framebuffers. Select the number of video overlays which can be used as framebuffers.
The remaining overlays are reserved for video. The remaining overlays are reserved for video.
source "drivers/gpu/drm/omapdrm/dss/Kconfig"
source "drivers/gpu/drm/omapdrm/displays/Kconfig"
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
# Direct Rendering Infrastructure (DRI) # Direct Rendering Infrastructure (DRI)
# #
obj-y += dss/
obj-y += displays/
ccflags-y := -Iinclude/drm -Werror ccflags-y := -Iinclude/drm -Werror
omapdrm-y := omap_drv.o \ omapdrm-y := omap_drv.o \
omap_irq.o \ omap_irq.o \
......
if ARCH_OMAP2PLUS if ARCH_OMAP2PLUS
source "drivers/video/fbdev/omap2/dss/Kconfig"
source "drivers/video/fbdev/omap2/omapfb/Kconfig" source "drivers/video/fbdev/omap2/omapfb/Kconfig"
source "drivers/video/fbdev/omap2/displays-new/Kconfig"
endif endif
obj-y += dss/
obj-y += displays-new/
obj-y += omapfb/ obj-y += omapfb/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment