From: Rob Clark Date: Sat, 30 Nov 2013 17:37:42 +0000 (-0500) Subject: drm/msm: move mdp4 -> mdp/mdp4 X-Git-Tag: v3.14-rc1~47^2~42^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e54a92ff2ec6cd70f748d990a3f6646f9b691f3;p=kernel%2Fkernel-generic.git drm/msm: move mdp4 -> mdp/mdp4 There are some little bits and pieces that mdp4 and mdp5 can share, so move things around so that we can have both in a common parent directory. Signed-off-by: Rob Clark --- diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index ca62457..6df1118 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -12,12 +12,12 @@ msm-y := \ hdmi/hdmi_i2c.o \ hdmi/hdmi_phy_8960.o \ hdmi/hdmi_phy_8x60.o \ - mdp4/mdp4_crtc.o \ - mdp4/mdp4_dtv_encoder.o \ - mdp4/mdp4_format.o \ - mdp4/mdp4_irq.o \ - mdp4/mdp4_kms.o \ - mdp4/mdp4_plane.o \ + mdp/mdp4/mdp4_crtc.o \ + mdp/mdp4/mdp4_dtv_encoder.o \ + mdp/mdp4/mdp4_format.o \ + mdp/mdp4/mdp4_irq.o \ + mdp/mdp4/mdp4_kms.o \ + mdp/mdp4/mdp4_plane.o \ msm_drv.o \ msm_fb.o \ msm_gem.o \ diff --git a/drivers/gpu/drm/msm/mdp4/mdp4.xml.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4.xml.h rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_crtc.c rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_dtv_encoder.c rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_format.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_format.c similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_format.c rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_format.c diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_irq.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_irq.c rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_kms.c rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_kms.h b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_kms.h rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h diff --git a/drivers/gpu/drm/msm/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c similarity index 100% rename from drivers/gpu/drm/msm/mdp4/mdp4_plane.c rename to drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c