drm/msm/sde: remove 'mdp' from sde file names
The previous 'mdp' prefix is no longer applicable to
the new sde hardware.
Change-Id: I6981268e1b86201b45cd1816d48d2be9d80c02b6
Signed-off-by: Clarence Ip <cip@codeaurora.org>
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index 00f2b46..e9d0039 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -96,11 +96,11 @@
sde/sde_hw_dspp.o \
sde/sde_hw_intf.o \
sde/sde_hw_lm.o \
- sde/sde_hw_mdp_ctl.o \
- sde/sde_hw_mdp_util.o \
+ sde/sde_hw_ctl.o \
+ sde/sde_hw_util.o \
sde/sde_hw_sspp.o \
sde/sde_hw_wb.o \
sde/sde_hw_pingpong.o \
- sde/sde_hw_mdp_top.o \
+ sde/sde_hw_top.o \
sde/sde_hw_interrupts.o \
- sde/sde_mdp_formats.o
+ sde/sde_formats.o
diff --git a/drivers/gpu/drm/msm/sde/sde_crtc.c b/drivers/gpu/drm/msm/sde/sde_crtc.c
index 096cb34..313b82d 100644
--- a/drivers/gpu/drm/msm/sde/sde_crtc.c
+++ b/drivers/gpu/drm/msm/sde/sde_crtc.c
@@ -18,7 +18,7 @@
#include "sde_kms.h"
#include "sde_hw_lm.h"
-#include "sde_hw_mdp_ctl.h"
+#include "sde_hw_ctl.h"
#include "sde_crtc.h"
#define CTL(i) (CTL_0 + (i))
diff --git a/drivers/gpu/drm/msm/sde/sde_encoder.c b/drivers/gpu/drm/msm/sde/sde_encoder.c
index bea9a30..26816a5 100644
--- a/drivers/gpu/drm/msm/sde/sde_encoder.c
+++ b/drivers/gpu/drm/msm/sde/sde_encoder.c
@@ -18,9 +18,8 @@
#include "sde_hwio.h"
#include "sde_hw_catalog.h"
#include "sde_hw_intf.h"
-#include "sde_hw_mdp_ctl.h"
-#include "sde_mdp_formats.h"
-
+#include "sde_hw_ctl.h"
+#include "sde_formats.h"
#include "sde_encoder_phys.h"
#include "display_manager.h"
diff --git a/drivers/gpu/drm/msm/sde/sde_encoder_phys.h b/drivers/gpu/drm/msm/sde/sde_encoder_phys.h
index e6ee728..a3ca87b 100644
--- a/drivers/gpu/drm/msm/sde/sde_encoder_phys.h
+++ b/drivers/gpu/drm/msm/sde/sde_encoder_phys.h
@@ -17,7 +17,7 @@
#include "sde_kms.h"
#include "sde_hw_intf.h"
-#include "sde_hw_mdp_ctl.h"
+#include "sde_hw_ctl.h"
/**
* enum sde_enc_split_role - Role this physical encoder will play in a
diff --git a/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c b/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c
index 693e1f3..631b336 100644
--- a/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c
+++ b/drivers/gpu/drm/msm/sde/sde_encoder_phys_cmd.c
@@ -20,6 +20,6 @@
#include "sde_hwio.h"
#include "sde_hw_catalog.h"
#include "sde_hw_intf.h"
-#include "sde_mdp_formats.h"
+#include "sde_formats.h"
#include "sde_encoder_phys.h"
diff --git a/drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c b/drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c
index ee7c0f2..b6edc7f 100644
--- a/drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c
@@ -16,8 +16,8 @@
#include "drm_crtc_helper.h"
#include "sde_encoder_phys.h"
-#include "sde_mdp_formats.h"
-#include "sde_hw_mdp_top.h"
+#include "sde_formats.h"
+#include "sde_hw_top.h"
#define VBLANK_TIMEOUT msecs_to_jiffies(100)
diff --git a/drivers/gpu/drm/msm/sde/sde_mdp_formats.c b/drivers/gpu/drm/msm/sde/sde_formats.c
similarity index 98%
rename from drivers/gpu/drm/msm/sde/sde_mdp_formats.c
rename to drivers/gpu/drm/msm/sde/sde_formats.c
index 8180dc6..e881a35 100644
--- a/drivers/gpu/drm/msm/sde/sde_mdp_formats.c
+++ b/drivers/gpu/drm/msm/sde/sde_formats.c
@@ -10,8 +10,8 @@
* GNU General Public License for more details.
*/
-#include <linux/kernel.h>
-#include "sde_mdp_formats.h"
+#include "sde_kms.h"
+#include "sde_formats.h"
static struct sde_mdp_format_params sde_mdp_format_map[] = {
INTERLEAVED_RGB_FMT(ARGB8888,
diff --git a/drivers/gpu/drm/msm/sde/sde_mdp_formats.h b/drivers/gpu/drm/msm/sde/sde_formats.h
similarity index 92%
rename from drivers/gpu/drm/msm/sde/sde_mdp_formats.h
rename to drivers/gpu/drm/msm/sde/sde_formats.h
index 67f445b..9fa8a9d 100644
--- a/drivers/gpu/drm/msm/sde/sde_mdp_formats.h
+++ b/drivers/gpu/drm/msm/sde/sde_formats.h
@@ -10,8 +10,8 @@
* GNU General Public License for more details.
*/
-#ifndef _SDE_MDP_FORMATS_H
-#define _SDE_MDP_FORMATS_H
+#ifndef _SDE_FORMATS_H
+#define _SDE_FORMATS_H
#include <drm/drm_fourcc.h>
#include "sde_hw_mdss.h"
@@ -30,11 +30,11 @@
.fetch_planes = SDE_MDP_PLANE_INTERLEAVED, \
.alpha_enable = alpha, \
.element = { (e0), (e1), (e2), (e3) }, \
- .bits = { a, r, g, b}, \
+ .bits = { g, b, r, a }, \
.chroma_sample = SDE_MDP_CHROMA_RGB, \
.unpack_align_msb = 0, \
.unpack_tight = 1, \
- .unpack_count = (alpha == true) ? 4:3, \
+ .unpack_count = (alpha == true) ? 4 : 3, \
.bpp = bp, \
.fetch_mode = SDE_MDP_FETCH_LINEAR, \
.is_yuv = false, \
@@ -48,7 +48,7 @@
.fetch_planes = SDE_MDP_PLANE_INTERLEAVED, \
.alpha_enable = alpha, \
.element = { (e0), (e1), (e2), (e3)}, \
- .bits = { a, r, g, b}, \
+ .bits = { g, b, r, a }, \
.chroma_sample = chroma, \
.unpack_align_msb = 0, \
.unpack_tight = 1, \
@@ -65,7 +65,7 @@
.fetch_planes = SDE_MDP_PLANE_PSEUDO_PLANAR, \
.alpha_enable = false, \
.element = { (e0), (e1), 0, 0 }, \
- .bits = { a, r, g, b}, \
+ .bits = { g, b, r, a }, \
.chroma_sample = chroma, \
.unpack_align_msb = 0, \
.unpack_tight = 1, \
@@ -82,7 +82,7 @@
.fetch_planes = SDE_MDP_PLANE_INTERLEAVED, \
.alpha_enable = alpha, \
.element = { (e0), (e1), (e2), 0 }, \
- .bits = { a, r, g, b}, \
+ .bits = { g, b, r, a }, \
.chroma_sample = chroma, \
.unpack_align_msb = 0, \
.unpack_tight = 1, \
@@ -101,4 +101,4 @@
struct sde_mdp_format_params *sde_mdp_get_format_params(u32 format,
u32 fmt_modifier);
-#endif /*_SDE_MDP_FORMATS_H */
+#endif /*_SDE_FORMATS_H */
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_ctl.c b/drivers/gpu/drm/msm/sde/sde_hw_ctl.c
similarity index 99%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_ctl.c
rename to drivers/gpu/drm/msm/sde/sde_hw_ctl.c
index 7e513af..2eac304 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_mdp_ctl.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_ctl.c
@@ -12,7 +12,7 @@
#include <linux/delay.h>
#include "sde_hwio.h"
-#include "sde_hw_mdp_ctl.h"
+#include "sde_hw_ctl.h"
#define CTL_LAYER(lm) \
(((lm) == LM_5) ? (0x024) : (((lm) - LM_0) * 0x004))
@@ -228,7 +228,7 @@
int pipes_per_stage;
stages = _mixer_stages(ctx->mixer_hw_caps, ctx->mixer_count, lm);
- if (WARN_ON(stages < 0))
+ if (stages < 0)
return;
if (test_bit(SDE_MIXER_SOURCESPLIT,
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_ctl.h b/drivers/gpu/drm/msm/sde/sde_hw_ctl.h
similarity index 96%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_ctl.h
rename to drivers/gpu/drm/msm/sde/sde_hw_ctl.h
index 4ed35ff..d5d3445 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_mdp_ctl.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_ctl.h
@@ -10,11 +10,11 @@
* GNU General Public License for more details.
*/
-#ifndef _SDE_HW_MDP_CTL_H
-#define _SDE_HW_MDP_CTL_H
+#ifndef _SDE_HW_CTL_H
+#define _SDE_HW_CTL_H
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
#include "sde_hw_catalog.h"
struct sde_hw_ctl;
@@ -135,4 +135,4 @@
*/
void sde_hw_ctl_destroy(struct sde_hw_ctl *ctx);
-#endif /*_SDE_HW_MDP_CTL_H */
+#endif /*_SDE_HW_CTL_H */
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_hwio.h b/drivers/gpu/drm/msm/sde/sde_hw_hwio.h
similarity index 100%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_hwio.h
rename to drivers/gpu/drm/msm/sde/sde_hw_hwio.h
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c b/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c
index 99aa2e5..921df1f 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_interrupts.c
@@ -15,7 +15,7 @@
#include "sde_kms.h"
#include "sde_hw_interrupts.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
#include "sde_hw_mdss.h"
/**
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_interrupts.h b/drivers/gpu/drm/msm/sde/sde_hw_interrupts.h
index 0ddb1e78..53a693d 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_interrupts.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_interrupts.h
@@ -17,7 +17,7 @@
#include "sde_hwio.h"
#include "sde_hw_catalog.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
#include "sde_hw_mdss.h"
#define IRQ_SOURCE_MDP BIT(0)
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_intf.h b/drivers/gpu/drm/msm/sde/sde_hw_intf.h
index 63623f4..95b6ce1 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_intf.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_intf.h
@@ -15,7 +15,7 @@
#include "sde_hw_catalog.h"
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
struct sde_hw_intf;
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_lm.h b/drivers/gpu/drm/msm/sde/sde_hw_lm.h
index 8129b29..079f62f 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_lm.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_lm.h
@@ -14,7 +14,7 @@
#define _SDE_HW_LM_H
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
struct sde_hw_mixer;
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_sspp.h b/drivers/gpu/drm/msm/sde/sde_hw_sspp.h
index 23503be..db6f14f 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_sspp.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_sspp.h
@@ -15,7 +15,7 @@
#include "sde_hw_catalog.h"
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
struct sde_hw_pipe;
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_top.c b/drivers/gpu/drm/msm/sde/sde_hw_top.c
similarity index 98%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_top.c
rename to drivers/gpu/drm/msm/sde/sde_hw_top.c
index 9c97312..82a8fcd 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_mdp_top.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_top.c
@@ -12,7 +12,7 @@
#include "sde_hwio.h"
#include "sde_hw_catalog.h"
-#include "sde_hw_mdp_top.h"
+#include "sde_hw_top.h"
#define SSPP_SPARE 0x24
#define SPLIT_DISPLAY_ENABLE 0x2F4
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_top.h b/drivers/gpu/drm/msm/sde/sde_hw_top.h
similarity index 94%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_top.h
rename to drivers/gpu/drm/msm/sde/sde_hw_top.h
index b29abb9..6c15651 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_mdp_top.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_top.h
@@ -10,12 +10,12 @@
* GNU General Public License for more details.
*/
-#ifndef _SDE_HW_MDP_TOP_H
-#define _SDE_HW_MDP_TOP_H
+#ifndef _SDE_HW_TOP_H
+#define _SDE_HW_TOP_H
#include "sde_hw_catalog.h"
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
struct sde_hw_mdp;
@@ -75,4 +75,4 @@
void sde_hw_mdp_destroy(struct sde_hw_mdp *mdp);
-#endif /*_SDE_HW_MDP_TOP_H */
+#endif /*_SDE_HW_TOP_H */
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_util.c b/drivers/gpu/drm/msm/sde/sde_hw_util.c
similarity index 98%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_util.c
rename to drivers/gpu/drm/msm/sde/sde_hw_util.c
index 74562e3..22bc761 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_mdp_util.c
+++ b/drivers/gpu/drm/msm/sde/sde_hw_util.c
@@ -11,7 +11,7 @@
*/
#include "msm_drv.h"
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
/* using a file static variables for debugfs access */
static u32 sde_hw_util_log_mask = SDE_DBG_MASK_NONE;
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_mdp_util.h b/drivers/gpu/drm/msm/sde/sde_hw_util.h
similarity index 93%
rename from drivers/gpu/drm/msm/sde/sde_hw_mdp_util.h
rename to drivers/gpu/drm/msm/sde/sde_hw_util.h
index ba241c4..7866d18c 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_mdp_util.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_util.h
@@ -10,8 +10,8 @@
* GNU General Public License for more details.
*/
-#ifndef _SDE_HW_MDP_UTIL_H
-#define _SDE_HW_MDP_UTIL_H
+#ifndef _SDE_HW_UTIL_H
+#define _SDE_HW_UTIL_H
#include <linux/io.h>
#include <linux/slab.h>
@@ -46,5 +46,5 @@
u32 csc_reg_off,
struct sde_csc_cfg *data);
-#endif /* _SDE_HW_MDP_UTIL_H */
+#endif /* _SDE_HW_UTIL_H */
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_wb.h b/drivers/gpu/drm/msm/sde/sde_hw_wb.h
index 623af6e..b5a12eb 100644
--- a/drivers/gpu/drm/msm/sde/sde_hw_wb.h
+++ b/drivers/gpu/drm/msm/sde/sde_hw_wb.h
@@ -15,7 +15,7 @@
#include "sde_hw_catalog.h"
#include "sde_hw_mdss.h"
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
struct sde_hw_wb;
diff --git a/drivers/gpu/drm/msm/sde/sde_hwio.h b/drivers/gpu/drm/msm/sde/sde_hwio.h
index 38d3fa2..c95bace 100644
--- a/drivers/gpu/drm/msm/sde/sde_hwio.h
+++ b/drivers/gpu/drm/msm/sde/sde_hwio.h
@@ -13,7 +13,7 @@
#ifndef _SDE_HWIO_H
#define _SDE_HWIO_H
-#include "sde_hw_mdp_util.h"
+#include "sde_hw_util.h"
/**
* MDP TOP block Register and bit fields and defines
diff --git a/drivers/gpu/drm/msm/sde/sde_kms.h b/drivers/gpu/drm/msm/sde/sde_kms.h
index 51e6e53..ea183a98 100644
--- a/drivers/gpu/drm/msm/sde/sde_kms.h
+++ b/drivers/gpu/drm/msm/sde/sde_kms.h
@@ -17,7 +17,7 @@
#include "msm_kms.h"
#include "mdp/mdp_kms.h"
#include "sde_hw_catalog.h"
-#include "sde_hw_mdp_ctl.h"
+#include "sde_hw_ctl.h"
#include "sde_hw_lm.h"
#include "sde_hw_interrupts.h"
diff --git a/drivers/gpu/drm/msm/sde/sde_kms_utils.c b/drivers/gpu/drm/msm/sde/sde_kms_utils.c
index 9d6f28c..f0b932b 100644
--- a/drivers/gpu/drm/msm/sde/sde_kms_utils.c
+++ b/drivers/gpu/drm/msm/sde/sde_kms_utils.c
@@ -12,7 +12,7 @@
#include "sde_kms.h"
#include "sde_hw_lm.h"
-#include "sde_hw_mdp_ctl.h"
+#include "sde_hw_ctl.h"
struct sde_hw_intr *sde_rm_acquire_intr(struct sde_kms *sde_kms)
{
diff --git a/drivers/gpu/drm/msm/sde/sde_plane.c b/drivers/gpu/drm/msm/sde/sde_plane.c
index 042343b..00daa6b 100644
--- a/drivers/gpu/drm/msm/sde/sde_plane.c
+++ b/drivers/gpu/drm/msm/sde/sde_plane.c
@@ -12,9 +12,7 @@
#include <linux/debugfs.h>
#include <uapi/drm/sde_drm.h>
#include "sde_kms.h"
-#include "sde_hwio.h"
-#include "sde_hw_mdp_ctl.h"
-#include "sde_mdp_formats.h"
+#include "sde_formats.h"
#include "sde_hw_sspp.h"
#define DECIMATED_DIMENSION(dim, deci) (((dim) + ((1 << (deci)) - 1)) >> (deci))