From 14be3200cd5f4ccece246f969c9c3645c3c12bd3 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 12 Feb 2018 08:18:27 -0500 Subject: [PATCH] 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 Reviewed-by: Sean Paul --- drivers/gpu/drm/msm/Makefile | 46 +++++++++---------- .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4.xml.h | 0 .../drm/msm/{mdp => disp}/mdp4/mdp4_crtc.c | 0 .../msm/{mdp => disp}/mdp4/mdp4_dsi_encoder.c | 0 .../msm/{mdp => disp}/mdp4/mdp4_dtv_encoder.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_irq.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.h | 2 +- .../{mdp => disp}/mdp4/mdp4_lcdc_encoder.c | 0 .../{mdp => disp}/mdp4/mdp4_lvds_connector.c | 0 .../msm/{mdp => disp}/mdp4/mdp4_lvds_pll.c | 0 .../drm/msm/{mdp => disp}/mdp4/mdp4_plane.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5.xml.h | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.h | 0 .../msm/{mdp => disp}/mdp5/mdp5_cmd_encoder.c | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_irq.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.h | 2 +- .../drm/msm/{mdp => disp}/mdp5/mdp5_mdss.c | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_mixer.c | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_mixer.h | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_pipe.c | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_pipe.h | 0 .../drm/msm/{mdp => disp}/mdp5/mdp5_plane.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.c | 0 .../gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.h | 0 .../drm/msm/{mdp => disp}/mdp_common.xml.h | 0 .../gpu/drm/msm/{mdp => disp}/mdp_format.c | 0 drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.c | 0 drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.h | 0 35 files changed, 25 insertions(+), 25 deletions(-) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4.xml.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_crtc.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_dsi_encoder.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_dtv_encoder.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_irq.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_kms.h (99%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lcdc_encoder.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_connector.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_lvds_pll.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp4/mdp4_plane.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5.xml.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cfg.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_cmd_encoder.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_crtc.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_ctl.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_encoder.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_irq.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_kms.h (99%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mdss.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_mixer.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_pipe.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_plane.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp5/mdp5_smp.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp_common.xml.h (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp_format.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.c (100%) rename drivers/gpu/drm/msm/{mdp => disp}/mdp_kms.h (100%) diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index f74d449476f4..cd40c050b2d7 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/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 diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h b/drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h rename to drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h similarity index 99% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h index a1b3e31e959e..0c13f8697bfe 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h +++ b/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; diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_pll.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_pll.c diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c rename to drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.h diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h similarity index 99% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h index 9b3fe01089d1..aeb94aa461b5 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h +++ b/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" diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h rename to drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h diff --git a/drivers/gpu/drm/msm/mdp/mdp_common.xml.h b/drivers/gpu/drm/msm/disp/mdp_common.xml.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp_common.xml.h rename to drivers/gpu/drm/msm/disp/mdp_common.xml.h diff --git a/drivers/gpu/drm/msm/mdp/mdp_format.c b/drivers/gpu/drm/msm/disp/mdp_format.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp_format.c rename to drivers/gpu/drm/msm/disp/mdp_format.c diff --git a/drivers/gpu/drm/msm/mdp/mdp_kms.c b/drivers/gpu/drm/msm/disp/mdp_kms.c similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp_kms.c rename to drivers/gpu/drm/msm/disp/mdp_kms.c diff --git a/drivers/gpu/drm/msm/mdp/mdp_kms.h b/drivers/gpu/drm/msm/disp/mdp_kms.h similarity index 100% rename from drivers/gpu/drm/msm/mdp/mdp_kms.h rename to drivers/gpu/drm/msm/disp/mdp_kms.h -- 2.30.2