Merge struct dpu_csc_blk and struct dpu_dsc_blk into new struct
dpu_simple_blk, which contains just base and length.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
index 7cb9ef940225..4b3fb104c412 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
@@ -283,11 +283,6 @@ struct dpu_scaler_blk {
u32 version;
};
-struct dpu_csc_blk {
- u32 base;
- u32 len;
-};
-
/**
* struct dpu_pp_blk : Pixel processing sub-blk information
* @base: offset of this sub-block relative to the block offset
@@ -301,11 +296,11 @@ struct dpu_pp_blk {
};
/**
- * struct dpu_dsc_blk - DSC Encoder sub-blk information
+ * struct dpu_simple_blk - DSC Encoder sub-blk information
* @base: offset of this sub-block relative to the block offset
* @len: register block length of this sub-block
*/
-struct dpu_dsc_blk {
+struct dpu_simple_blk {
u32 base;
u32 len;
};
@@ -403,7 +398,7 @@ struct dpu_sspp_sub_blks {
u32 max_per_pipe_bw;
u32 qseed_ver;
struct dpu_scaler_blk scaler_blk;
- struct dpu_pp_blk csc_blk;
+ struct dpu_simple_blk csc_blk;
const u32 *format_list;
u32 num_formats;
@@ -444,8 +439,8 @@ struct dpu_pingpong_sub_blks {
* @ctl: DSC controller sub-block
*/
struct dpu_dsc_sub_blks {
- struct dpu_dsc_blk enc;
- struct dpu_dsc_blk ctl;
+ struct dpu_simple_blk enc;
+ struct dpu_simple_blk ctl;
};
/**
--
2.39.2
