[PATCH v16] drm/msm/dpu: add DSC blocks to the catalog of MSM8998 and SC8180X

[Abhinav Kumar]

On 6/6/2023 11:57 AM, Marijn Suijten wrote:
> On 2023-06-06 11:31:39, Kuogee Hsieh wrote:
>> From: Abhinav Kumar <quic_abhinavk at quicinc.com>
>>
>> Some platforms have DSC blocks which have not been declared in the catalog.
>> Complete DSC 1.1 support for all platforms by adding the missing blocks to
>> MSM8998 and SC8180X.
> 
> Still a NACK, as pointed out in v15 both the title and this commit
> description point to SC8180X but that catalog entry is not touched at
> all anymore after rebasing on top of f5abecfe339e4 ("drm/msm/dpu: enable
> DSPP and DSC on sc8180x").
> 
> - Marijn
> 

Yeah we should fix the commit text and the title. Apologies for that.

>>
>> Changes in v9:
>> -- add MSM8998 and SC8180x to commit title
>>
>> Changes in v10:
>> -- fix grammar at commit text
>>
>> Changes in v12:
>> -- fix "titil" with "title" at changes in v9
>>
>> Changes in v14:
>> -- "dsc" tp "DSC" at commit title
>>
>> Changes in v15:
>> -- fix merge conflicts at dpu_5_1_sc8180x.h
>>
>> Changes in v16
>> -- fix cherry-pick error by deleting both redundant .dsc and .dsc_count
>>     assignment from dpu_5_1_sc8180x.h
>>
>> Signed-off-by: Abhinav Kumar <quic_abhinavk at quicinc.com>
>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
>> Reviewed-by: Marijn Suijten <marijn.suijten at somainline.org>
>> ---
>>   drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
>> index 3c732a0..7d0d0e7 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h
>> @@ -126,6 +126,11 @@ static const struct dpu_pingpong_cfg msm8998_pp[] = {
>>   			DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
>>   };
>>   
>> +static const struct dpu_dsc_cfg msm8998_dsc[] = {
>> +	DSC_BLK("dsc_0", DSC_0, 0x80000, 0),
>> +	DSC_BLK("dsc_1", DSC_1, 0x80400, 0),
>> +};
>> +
>>   static const struct dpu_dspp_cfg msm8998_dspp[] = {
>>   	DSPP_BLK("dspp_0", DSPP_0, 0x54000, DSPP_SC7180_MASK,
>>   		 &msm8998_dspp_sblk),
>> @@ -199,6 +204,8 @@ const struct dpu_mdss_cfg dpu_msm8998_cfg = {
>>   	.dspp = msm8998_dspp,
>>   	.pingpong_count = ARRAY_SIZE(msm8998_pp),
>>   	.pingpong = msm8998_pp,
>> +	.dsc_count = ARRAY_SIZE(msm8998_dsc),
>> +	.dsc = msm8998_dsc,
>>   	.intf_count = ARRAY_SIZE(msm8998_intf),
>>   	.intf = msm8998_intf,
>>   	.vbif_count = ARRAY_SIZE(msm8998_vbif),
>> -- 
>> 2.7.4
>>