In preparation to merger of formats databases, pull format flag
definitions to mdp_format.h header, so that they are visibile to both
dpu and mdp drivers.
Signed-off-by: Dmitry Baryshkov
---
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 98 ++---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 31 +++--
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 4 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 4 +-
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 8 +--
drivers/gpu/drm/msm/disp/mdp_format.c | 6 +-
drivers/gpu/drm/msm/disp/mdp_format.h | 39
drivers/gpu/drm/msm/disp/mdp_kms.h | 4 +-
drivers/gpu/drm/msm/msm_drv.h | 4 --
9 files changed, 109 insertions(+), 89 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
index caf536788ece..0c2afded0e56 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c
@@ -44,8 +44,8 @@ bp, flg, fm, np)
\
.unpack_tight = 1,\
.unpack_count = uc, \
.bpp = bp,\
- .fetch_mode = fm, \
- .flags = flg, \
+ .base.fetch_mode = fm,\
+ .base.flags = flg,\
.num_planes = np, \
.tile_height = DPU_TILE_HEIGHT_DEFAULT\
}
@@ -63,8 +63,8 @@ alpha, bp, flg, fm, np, th)
\
.unpack_tight = 1,\
.unpack_count = uc, \
.bpp = bp,\
- .fetch_mode = fm, \
- .flags = flg, \
+ .base.fetch_mode = fm,\
+ .base.flags = flg,\
.num_planes = np, \
.tile_height = th \
}
@@ -83,8 +83,8 @@ alpha, chroma, count, bp, flg, fm, np)
\
.unpack_tight = 1,\
.unpack_count = count,\
.bpp = bp,\
- .fetch_mode = fm, \
- .flags = flg, \
+ .base.fetch_mode = fm,\
+ .base.flags = flg,\
.num_planes = np, \
.tile_height = DPU_TILE_HEIGHT_DEFAULT\
}
@@ -101,8 +101,8 @@ alpha, chroma, count, bp, flg, fm, np)
\
.unpack_tight = 1,\
.unpack_count = 2,\
.bpp = 2, \
- .fetch_mode = fm, \
- .flags = flg, \
+ .base.fetch_mode = fm,\
+ .base.flags = flg,\
.num_planes = np, \
.tile_height = DPU_TILE_HEIGHT_DEFAULT\
}
@@ -120,8 +120,8 @@ flg, fm, np, th)
\
.unpack_tight = 1,\
.unpack_count = 2,\
.bpp = 2, \
- .fetch_mode = fm, \
- .flags = flg, \
+ .base.fetch_mode = fm,\
+ .base.flags = flg,\
.num_planes = np, \
.tile_height = th \
}
@@ -138,8 +138,8 @@ flg, fm, np, th)
