ソースを参照

drm/msm: rename mdp->disp

Since new display controller is called "dpu" instead of "mdp".  Lets
make the name of the toplevel directory for the display controllers a
bit more generic.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Rob Clark 7 年 前
コミット
14be3200cd
35 ファイル変更25 行追加25 行削除
  1. 23 23
      drivers/gpu/drm/msm/Makefile
  2. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h
  3. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
  4. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c
  5. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c
  6. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c
  7. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
  8. 1 1
      drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h
  9. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c
  10. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
  11. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c
  12. 0 0
      drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
  13. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h
  14. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c
  15. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h
  16. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c
  17. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c
  18. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c
  19. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h
  20. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c
  21. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c
  22. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
  23. 1 1
      drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h
  24. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c
  25. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c
  26. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h
  27. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c
  28. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h
  29. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
  30. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
  31. 0 0
      drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h
  32. 0 0
      drivers/gpu/drm/msm/disp/mdp_common.xml.h
  33. 0 0
      drivers/gpu/drm/msm/disp/mdp_format.c
  34. 0 0
      drivers/gpu/drm/msm/disp/mdp_kms.c
  35. 0 0
      drivers/gpu/drm/msm/disp/mdp_kms.h

+ 23 - 23
drivers/gpu/drm/msm/Makefile

@@ -25,26 +25,26 @@ msm-y := \
 	edp/edp_connector.o \
 	edp/edp_ctrl.o \
 	edp/edp_phy.o \
-	mdp/mdp_format.o \
-	mdp/mdp_kms.o \
-	mdp/mdp4/mdp4_crtc.o \
-	mdp/mdp4/mdp4_dtv_encoder.o \
-	mdp/mdp4/mdp4_lcdc_encoder.o \
-	mdp/mdp4/mdp4_lvds_connector.o \
-	mdp/mdp4/mdp4_irq.o \
-	mdp/mdp4/mdp4_kms.o \
-	mdp/mdp4/mdp4_plane.o \
-	mdp/mdp5/mdp5_cfg.o \
-	mdp/mdp5/mdp5_ctl.o \
-	mdp/mdp5/mdp5_crtc.o \
-	mdp/mdp5/mdp5_encoder.o \
-	mdp/mdp5/mdp5_irq.o \
-	mdp/mdp5/mdp5_mdss.o \
-	mdp/mdp5/mdp5_kms.o \
-	mdp/mdp5/mdp5_pipe.o \
-	mdp/mdp5/mdp5_mixer.o \
-	mdp/mdp5/mdp5_plane.o \
-	mdp/mdp5/mdp5_smp.o \
+	disp/mdp_format.o \
+	disp/mdp_kms.o \
+	disp/mdp4/mdp4_crtc.o \
+	disp/mdp4/mdp4_dtv_encoder.o \
+	disp/mdp4/mdp4_lcdc_encoder.o \
+	disp/mdp4/mdp4_lvds_connector.o \
+	disp/mdp4/mdp4_irq.o \
+	disp/mdp4/mdp4_kms.o \
+	disp/mdp4/mdp4_plane.o \
+	disp/mdp5/mdp5_cfg.o \
+	disp/mdp5/mdp5_ctl.o \
+	disp/mdp5/mdp5_crtc.o \
+	disp/mdp5/mdp5_encoder.o \
+	disp/mdp5/mdp5_irq.o \
+	disp/mdp5/mdp5_mdss.o \
+	disp/mdp5/mdp5_kms.o \
+	disp/mdp5/mdp5_pipe.o \
+	disp/mdp5/mdp5_mixer.o \
+	disp/mdp5/mdp5_plane.o \
+	disp/mdp5/mdp5_smp.o \
 	msm_atomic.o \
 	msm_debugfs.o \
 	msm_drv.o \
@@ -65,19 +65,19 @@ msm-y := \
 msm-$(CONFIG_DEBUG_FS) += adreno/a5xx_debugfs.o
 
 msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
-msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o
+msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o
 msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_pll_8960.o
 msm-$(CONFIG_COMMON_CLK) += hdmi/hdmi_phy_8996.o
 
 msm-$(CONFIG_DRM_MSM_HDMI_HDCP) += hdmi/hdmi_hdcp.o
 
 msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \
-			mdp/mdp4/mdp4_dsi_encoder.o \
+			disp/mdp4/mdp4_dsi_encoder.o \
 			dsi/dsi_cfg.o \
 			dsi/dsi_host.o \
 			dsi/dsi_manager.o \
 			dsi/phy/dsi_phy.o \
-			mdp/mdp5/mdp5_cmd_encoder.o
+			disp/mdp5/mdp5_cmd_encoder.o
 
 msm-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/phy/dsi_phy_28nm.o
 msm-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += dsi/phy/dsi_phy_20nm.o

+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h → drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c


+ 1 - 1
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h → drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h

@@ -22,7 +22,7 @@
 
 #include "msm_drv.h"
 #include "msm_kms.h"
-#include "mdp/mdp_kms.h"
+#include "disp/mdp_kms.h"
 #include "mdp4.xml.h"
 
 struct device_node;

+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c → drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h → drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h → drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h → drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c


+ 1 - 1
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h → drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h

@@ -20,7 +20,7 @@
 
 #include "msm_drv.h"
 #include "msm_kms.h"
-#include "mdp/mdp_kms.h"
+#include "disp/mdp_kms.h"
 #include "mdp5_cfg.h"	/* must be included before mdp5.xml.h */
 #include "mdp5.xml.h"
 #include "mdp5_pipe.h"

+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h → drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h → drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c → drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h → drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp_common.xml.h → drivers/gpu/drm/msm/disp/mdp_common.xml.h


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp_format.c → drivers/gpu/drm/msm/disp/mdp_format.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp_kms.c → drivers/gpu/drm/msm/disp/mdp_kms.c


+ 0 - 0
drivers/gpu/drm/msm/mdp/mdp_kms.h → drivers/gpu/drm/msm/disp/mdp_kms.h