Commit 1071a22c authored by Ryan McCann's avatar Ryan McCann Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: Drop unused num argument from relevant macros 



Drop unused parameter "num" from VIG_SBLK_NOSCALE and DMA sub-block
macros. Update calls to relevant macros to reflect change.

Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRyan McCann <quic_rmccann@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/546196/
Link: https://lore.kernel.org/r/20230622-devcoredump_patch-v5-2-67e8b66c4723@quicinc.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 90370511

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c

+10 −10
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static const uint32_t wb2_formats[] = { 
	.rotation_cfg = rot_cfg, \

	}



#define _DMA_SBLK(num, sdma_pri) \

#define _DMA_SBLK(sdma_pri) \

	{ \

	.maxdwnscale = SSPP_UNITY_SCALE, \

	.maxupscale = SSPP_UNITY_SCALE, \
@@ -319,10 +319,10 @@ static const struct dpu_sspp_sub_blks sdm845_vig_sblk_2 = 
static const struct dpu_sspp_sub_blks sdm845_vig_sblk_3 =

				_VIG_SBLK("3", 8, DPU_SSPP_SCALER_QSEED3);



static const struct dpu_sspp_sub_blks sdm845_dma_sblk_0 = _DMA_SBLK("8", 1);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_1 = _DMA_SBLK("9", 2);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_2 = _DMA_SBLK("10", 3);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_3 = _DMA_SBLK("11", 4);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_0 = _DMA_SBLK(1);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_1 = _DMA_SBLK(2);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_2 = _DMA_SBLK(3);

static const struct dpu_sspp_sub_blks sdm845_dma_sblk_3 = _DMA_SBLK(4);



static const struct dpu_sspp_sub_blks sc7180_vig_sblk_0 =

				_VIG_SBLK("0", 4, DPU_SSPP_SCALER_QSEED4);
@@ -350,10 +350,10 @@ static const struct dpu_sspp_sub_blks sm8550_vig_sblk_2 = 
				_VIG_SBLK("2", 9, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sm8550_vig_sblk_3 =

				_VIG_SBLK("3", 10, DPU_SSPP_SCALER_QSEED4);

static const struct dpu_sspp_sub_blks sm8550_dma_sblk_4 = _DMA_SBLK("12", 5);

static const struct dpu_sspp_sub_blks sm8550_dma_sblk_5 = _DMA_SBLK("13", 6);

static const struct dpu_sspp_sub_blks sm8550_dma_sblk_4 = _DMA_SBLK(5);

static const struct dpu_sspp_sub_blks sm8550_dma_sblk_5 = _DMA_SBLK(6);



#define _VIG_SBLK_NOSCALE(num, sdma_pri) \

#define _VIG_SBLK_NOSCALE(sdma_pri) \

	{ \

	.maxdwnscale = SSPP_UNITY_SCALE, \

	.maxupscale = SSPP_UNITY_SCALE, \
@@ -364,8 +364,8 @@ static const struct dpu_sspp_sub_blks sm8550_dma_sblk_5 = _DMA_SBLK("13", 6); 
	.virt_num_formats = ARRAY_SIZE(plane_formats), \

	}



static const struct dpu_sspp_sub_blks qcm2290_vig_sblk_0 = _VIG_SBLK_NOSCALE("0", 2);

static const struct dpu_sspp_sub_blks qcm2290_dma_sblk_0 = _DMA_SBLK("8", 1);

static const struct dpu_sspp_sub_blks qcm2290_vig_sblk_0 = _VIG_SBLK_NOSCALE(2);

static const struct dpu_sspp_sub_blks qcm2290_dma_sblk_0 = _DMA_SBLK(1);



/*************************************************************

 * MIXER sub blocks config