Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Tomi Valkeinen 9 years ago
parent
5ca28914b8
commit
9960aa7cb5
61 changed files with 6 additions and 6 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/gpu/drm/Makefile
  2. 2 1
      drivers/gpu/drm/omapdrm/Kconfig
  3. 3 0
      drivers/gpu/drm/omapdrm/Makefile
  4. 0 0
      drivers/gpu/drm/omapdrm/displays/Kconfig
  5. 0 0
      drivers/gpu/drm/omapdrm/displays/Makefile
  6. 0 0
      drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
  7. 0 0
      drivers/gpu/drm/omapdrm/displays/connector-dvi.c
  8. 0 0
      drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
  9. 0 0
      drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
  10. 0 0
      drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
  11. 0 0
      drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
  12. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-dpi.c
  13. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
  14. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
  15. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
  16. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
  17. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
  18. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
  19. 0 0
      drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
  20. 0 0
      drivers/gpu/drm/omapdrm/dss/Kconfig
  21. 0 0
      drivers/gpu/drm/omapdrm/dss/Makefile
  22. 0 0
      drivers/gpu/drm/omapdrm/dss/apply.c
  23. 0 0
      drivers/gpu/drm/omapdrm/dss/core.c
  24. 0 0
      drivers/gpu/drm/omapdrm/dss/dispc-compat.c
  25. 0 0
      drivers/gpu/drm/omapdrm/dss/dispc-compat.h
  26. 0 0
      drivers/gpu/drm/omapdrm/dss/dispc.c
  27. 0 0
      drivers/gpu/drm/omapdrm/dss/dispc.h
  28. 0 0
      drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
  29. 0 0
      drivers/gpu/drm/omapdrm/dss/display-sysfs.c
  30. 0 0
      drivers/gpu/drm/omapdrm/dss/display.c
  31. 0 0
      drivers/gpu/drm/omapdrm/dss/dpi.c
  32. 0 0
      drivers/gpu/drm/omapdrm/dss/dsi.c
  33. 0 0
      drivers/gpu/drm/omapdrm/dss/dss-of.c
  34. 0 0
      drivers/gpu/drm/omapdrm/dss/dss.c
  35. 0 0
      drivers/gpu/drm/omapdrm/dss/dss.h
  36. 0 0
      drivers/gpu/drm/omapdrm/dss/dss_features.c
  37. 0 0
      drivers/gpu/drm/omapdrm/dss/dss_features.h
  38. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi.h
  39. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi4.c
  40. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
  41. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
  42. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi5.c
  43. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
  44. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi5_core.h
  45. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi_common.c
  46. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
  47. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
  48. 0 0
      drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
  49. 0 0
      drivers/gpu/drm/omapdrm/dss/manager-sysfs.c
  50. 0 0
      drivers/gpu/drm/omapdrm/dss/manager.c
  51. 0 0
      drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
  52. 0 0
      drivers/gpu/drm/omapdrm/dss/output.c
  53. 0 0
      drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c
  54. 0 0
      drivers/gpu/drm/omapdrm/dss/overlay.c
  55. 0 0
      drivers/gpu/drm/omapdrm/dss/pll.c
  56. 0 0
      drivers/gpu/drm/omapdrm/dss/rfbi.c
  57. 0 0
      drivers/gpu/drm/omapdrm/dss/sdi.c
  58. 0 0
      drivers/gpu/drm/omapdrm/dss/venc.c
  59. 0 0
      drivers/gpu/drm/omapdrm/dss/video-pll.c
  60. 0 2
      drivers/video/fbdev/omap2/Kconfig
  61. 0 2
      drivers/video/fbdev/omap2/Makefile

+ 1 - 1
drivers/gpu/drm/Makefile
View File 

@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
 
 obj-$(CONFIG_DRM_ATMEL_HLCDC)	+= atmel-hlcdc/
 
 obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
 
 obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
 
-obj-$(CONFIG_DRM_OMAP)	+= omapdrm/
 
+obj-y			+= omapdrm/
 
 obj-y			+= tilcdc/
 
 obj-$(CONFIG_DRM_QXL) += qxl/
 
 obj-$(CONFIG_DRM_BOCHS) += bochs/

+ 2 - 1
drivers/gpu/drm/omapdrm/Kconfig
View File 

@@ -1,4 +1,3 @@
 
-
 
 config DRM_OMAP
 
 	tristate "OMAP DRM"
 
 	depends on DRM
 
@@ -24,3 +23,5 @@ config DRM_OMAP_NUM_CRTCS
 
 	  Select the number of video overlays which can be used as framebuffers.
 
 	  The remaining overlays are reserved for video.
 
 
+source "drivers/gpu/drm/omapdrm/dss/Kconfig"
 
+source "drivers/gpu/drm/omapdrm/displays/Kconfig"

+ 3 - 0
drivers/gpu/drm/omapdrm/Makefile
View File 

@@ -3,6 +3,9 @@
 
 # Direct Rendering Infrastructure (DRI)
 
 #
 
 
+obj-y += dss/
 
+obj-y += displays/
 
+
 
 ccflags-y := -Iinclude/drm -Werror
 
 omapdrm-y := omap_drv.o \
 
 	omap_irq.o \

+ 0 - 0
drivers/video/fbdev/omap2/displays-new/Kconfig → drivers/gpu/drm/omapdrm/displays/Kconfig
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/Makefile → drivers/gpu/drm/omapdrm/displays/Makefile
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c → drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/connector-dvi.c → drivers/gpu/drm/omapdrm/displays/connector-dvi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/connector-hdmi.c → drivers/gpu/drm/omapdrm/displays/connector-hdmi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/encoder-opa362.c → drivers/gpu/drm/omapdrm/displays/encoder-opa362.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c → drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c → drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-dpi.c → drivers/gpu/drm/omapdrm/displays/panel-dpi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-dsi-cm.c → drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c → drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c → drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c → drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c → drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c → drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c → drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/Kconfig → drivers/gpu/drm/omapdrm/dss/Kconfig
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/Makefile → drivers/gpu/drm/omapdrm/dss/Makefile
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/apply.c → drivers/gpu/drm/omapdrm/dss/apply.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/core.c → drivers/gpu/drm/omapdrm/dss/core.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dispc-compat.c → drivers/gpu/drm/omapdrm/dss/dispc-compat.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dispc-compat.h → drivers/gpu/drm/omapdrm/dss/dispc-compat.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dispc.c → drivers/gpu/drm/omapdrm/dss/dispc.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dispc.h → drivers/gpu/drm/omapdrm/dss/dispc.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dispc_coefs.c → drivers/gpu/drm/omapdrm/dss/dispc_coefs.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/display-sysfs.c → drivers/gpu/drm/omapdrm/dss/display-sysfs.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/display.c → drivers/gpu/drm/omapdrm/dss/display.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dpi.c → drivers/gpu/drm/omapdrm/dss/dpi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dsi.c → drivers/gpu/drm/omapdrm/dss/dsi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dss-of.c → drivers/gpu/drm/omapdrm/dss/dss-of.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dss.c → drivers/gpu/drm/omapdrm/dss/dss.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dss.h → drivers/gpu/drm/omapdrm/dss/dss.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dss_features.c → drivers/gpu/drm/omapdrm/dss/dss_features.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/dss_features.h → drivers/gpu/drm/omapdrm/dss/dss_features.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi.h → drivers/gpu/drm/omapdrm/dss/hdmi.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi4.c → drivers/gpu/drm/omapdrm/dss/hdmi4.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi4_core.c → drivers/gpu/drm/omapdrm/dss/hdmi4_core.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi4_core.h → drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi5.c → drivers/gpu/drm/omapdrm/dss/hdmi5.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi5_core.c → drivers/gpu/drm/omapdrm/dss/hdmi5_core.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi5_core.h → drivers/gpu/drm/omapdrm/dss/hdmi5_core.h
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi_common.c → drivers/gpu/drm/omapdrm/dss/hdmi_common.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi_phy.c → drivers/gpu/drm/omapdrm/dss/hdmi_phy.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi_pll.c → drivers/gpu/drm/omapdrm/dss/hdmi_pll.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/hdmi_wp.c → drivers/gpu/drm/omapdrm/dss/hdmi_wp.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/manager-sysfs.c → drivers/gpu/drm/omapdrm/dss/manager-sysfs.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/manager.c → drivers/gpu/drm/omapdrm/dss/manager.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/omapdss-boot-init.c → drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/output.c → drivers/gpu/drm/omapdrm/dss/output.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/overlay-sysfs.c → drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/overlay.c → drivers/gpu/drm/omapdrm/dss/overlay.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/pll.c → drivers/gpu/drm/omapdrm/dss/pll.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/rfbi.c → drivers/gpu/drm/omapdrm/dss/rfbi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/sdi.c → drivers/gpu/drm/omapdrm/dss/sdi.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/venc.c → drivers/gpu/drm/omapdrm/dss/venc.c
View File


+ 0 - 0
drivers/video/fbdev/omap2/dss/video-pll.c → drivers/gpu/drm/omapdrm/dss/video-pll.c
View File


+ 0 - 2
drivers/video/fbdev/omap2/Kconfig
View File 

@@ -1,7 +1,5 @@
 
 if ARCH_OMAP2PLUS
 
 
-source "drivers/video/fbdev/omap2/dss/Kconfig"
 
 source "drivers/video/fbdev/omap2/omapfb/Kconfig"
 
-source "drivers/video/fbdev/omap2/displays-new/Kconfig"
 
 
 endif

+ 0 - 2
drivers/video/fbdev/omap2/Makefile
View File 

@@ -1,3 +1 @@
 
-obj-y += dss/
 
-obj-y += displays-new/
 
 obj-y += omapfb/