[PATCH v6 2/8] drm/msm/dpu: add DPU_PINGPONG_DSC feature bit for DPU < 7.0.0

[Abhinav Kumar]

On 5/10/2023 9:29 PM, Dmitry Baryshkov wrote:
> On 11/05/2023 01:07, Kuogee Hsieh wrote:
>> DPU < 7.0.0 requires the PINGPONG block to be involved during
>> DSC setting up. Since DPU >= 7.0.0, enabling and starting the DSC
>> encoder engine moved to INTF with the help of the flush mechanism.
> 
> Nit: was moved.
> 
>> Add a DPU_PINGPONG_DSC feature bit to restrict the availability of
>> dpu_hw_pp_setup_dsc() and dpu_hw_pp_dsc_{enable,disable}() on the
>> PINGPONG block to DPU < 7.0.0 hardware, as the registers are not
>> available [in the PINGPONG block] on DPU 7.0.0 and higher anymore.
> 
> this looks good
> 
>> Existing call-sites to these callbacks already skip calling into
>> them if the function pointer is NULL.
> 
> This is more relevant for patch 3 commit message.
> 
>> Add DPU_PINGPONG_DSC feature
>> bit to all chipset with DPU < 7.0.0.
> 
> This is incorrect, as we do not change the catalog in this patch.
> 

Sorry but why not? The changes done to dpu_hw_catalog.c do exactly that.

>>
>> changes in v6:
>> -- split patches and rearrange to keep catalog related files at this 
>> patch
>>
>> Signed-off-by: Kuogee Hsieh <quic_khsieh at quicinc.com>
>> ---
>>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 +++---
>>   drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 4 +++-
>>   2 files changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c 
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> index 82b58c6..78e4bf6 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> @@ -76,13 +76,13 @@
>>       (BIT(DPU_DIM_LAYER) | BIT(DPU_MIXER_COMBINED_ALPHA))
>>   #define PINGPONG_SDM845_MASK \
>> -    (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_TE))
>> +    (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_TE) | 
>> BIT(DPU_PINGPONG_DSC))
>>   #define PINGPONG_SDM845_TE2_MASK \
>> -    (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2))
>> +    (PINGPONG_SDM845_MASK | BIT(DPU_PINGPONG_TE2) | 
>> BIT(DPU_PINGPONG_DSC))
>>   #define PINGPONG_SM8150_MASK \
>> -    (BIT(DPU_PINGPONG_DITHER))
>> +    (BIT(DPU_PINGPONG_DITHER) | BIT(DPU_PINGPONG_DSC))
>>   #define CTL_SC7280_MASK \
>>       (BIT(DPU_CTL_ACTIVE_CFG) | \
>> 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 6ee48f0..dc0a4da 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
>> @@ -144,7 +144,8 @@ enum {
>>    * @DPU_PINGPONG_TE2        Additional tear check block for split pipes
>>    * @DPU_PINGPONG_SPLIT      PP block supports split fifo
>>    * @DPU_PINGPONG_SLAVE      PP block is a suitable slave for split fifo
>> - * @DPU_PINGPONG_DITHER,    Dither blocks
>> + * @DPU_PINGPONG_DITHER     Dither blocks
>> + * @DPU_PINGPONG_DSC        PP ops functions required for DSC
>>    * @DPU_PINGPONG_MAX
>>    */
>>   enum {
>> @@ -153,6 +154,7 @@ enum {
>>       DPU_PINGPONG_SPLIT,
>>       DPU_PINGPONG_SLAVE,
>>       DPU_PINGPONG_DITHER,
>> +    DPU_PINGPONG_DSC,
>>       DPU_PINGPONG_MAX
>>   };
>