| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <e9f493fa-77f2-0a5b-5e09-bd1baae8a8d0@quicinc.com>
Date: Fri, 28 Apr 2023 18:08:26 -0700
From: Abhinav Kumar <quic_abhinavk@...cinc.com>
To: Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
Kuogee Hsieh <quic_khsieh@...cinc.com>,
<dri-devel@...ts.freedesktop.org>, <robdclark@...il.com>,
<sean@...rly.run>, <swboyd@...omium.org>, <dianders@...omium.org>,
<vkoul@...nel.org>, <daniel@...ll.ch>, <airlied@...il.com>,
<agross@...nel.org>, <andersson@...nel.org>
CC: <quic_sbillaka@...cinc.com>, <marijn.suijten@...ainline.org>,
<freedreno@...ts.freedesktop.org>, <linux-arm-msm@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 5/7] drm/msm/dpu: add DPU_PINGPONG_DSC feature PP_BLK
and PP_BLK_TE
On 4/28/2023 5:45 PM, Dmitry Baryshkov wrote:
> On 29/04/2023 02:45, Kuogee Hsieh wrote:
>> Legacy DPU requires PP hardware block involved into setting up DSC
>
> Nit: to be envolved
>
>> data path. This patch add DDPU_PINGPONG_DSC feature bit to both
>
> adds
>
>> PP_BLK and PP_BLK_TE so that both dpu_hw_pp_setup_dsc() and
>> dpu_hw_pp_dsc_enable() will be executed during DSC path setup.
>
> Would it be easier to add PP_BLK_NO_DSC instead and make DSC enabled by
> default for PP_BLK / PP_BLK_TE?
>
No because for some chipsets like qcm2290, it has a ping pong block but
no DSC.
>>
>> Reported-by : Marijn Suijten <marijn.suijten@...ainline.org>
>> Signed-off-by: Kuogee Hsieh <quic_khsieh@...cinc.com>
>> ---
>> .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 12 +++++-----
>> .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 8 +++----
>> .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 26
>> ++++++++++------------
>> .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 24
>> ++++++++++----------
>> .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 26
>> ++++++++++------------
>> .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 4 ++--
>> .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 2 +-
>> .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 2 +-
>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 8 +++----
>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 ++
>> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 9 +++++---
>> 11 files changed, 62 insertions(+), 61 deletions(-)
>>
>> 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 17f821c..b7cd746 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
>> @@ -112,16 +112,16 @@ static const struct dpu_lm_cfg msm8998_lm[] = {
>> };
>> static const struct dpu_pingpong_cfg msm8998_pp[] = {
>> - PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk_te,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> + PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000,
>> BIT(DPU_PINGPONG_DSC), 0,
>> + sdm845_pp_sblk_te, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> - PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk_te,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> + PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800,
>> BIT(DPU_PINGPONG_DSC), 0,
>> + sdm845_pp_sblk_te, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
>> - PP_BLK("pingpong_2", PINGPONG_2, 0x71000, 0, sdm845_pp_sblk,
>> + PP_BLK("pingpong_2", PINGPONG_2, 0x71000, 0, 0, sdm845_pp_sblk,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
>> - PP_BLK("pingpong_3", PINGPONG_3, 0x71800, 0, sdm845_pp_sblk,
>> + PP_BLK("pingpong_3", PINGPONG_3, 0x71800, 0, 0, sdm845_pp_sblk,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
>> };
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
>> index ceca741..8888bd9 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
>> @@ -110,16 +110,16 @@ static const struct dpu_lm_cfg sdm845_lm[] = {
>> };
>> static const struct dpu_pingpong_cfg sdm845_pp[] = {
>> - PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk_te,
>> + PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000,
>> BIT(DPU_PINGPONG_DSC), 0, sdm845_pp_sblk_te,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> - PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk_te,
>> + PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800,
>> BIT(DPU_PINGPONG_DSC), 0, sdm845_pp_sblk_te,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
>> - PP_BLK("pingpong_2", PINGPONG_2, 0x71000, 0, sdm845_pp_sblk,
>> + PP_BLK("pingpong_2", PINGPONG_2, 0x71000, BIT(DPU_PINGPONG_DSC),
>> 0, sdm845_pp_sblk,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
>> - PP_BLK("pingpong_3", PINGPONG_3, 0x71800, 0, sdm845_pp_sblk,
>> + PP_BLK("pingpong_3", PINGPONG_3, 0x71800, BIT(DPU_PINGPONG_DSC),
>> 0, sdm845_pp_sblk,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
>> };
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>> index 42b0e58..3a7dffa 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h
>> @@ -128,24 +128,22 @@ static const struct dpu_dspp_cfg sm8150_dspp[] = {
>> };
>> static const struct dpu_pingpong_cfg sm8150_pp[] = {
>> - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_0,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> - PP_BLK("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> + PP_BLK("pingpong_1", PINGPONG_1, 0x70800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_0,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
>> - PP_BLK("pingpong_2", PINGPONG_2, 0x71000, MERGE_3D_1,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> + PP_BLK("pingpong_2", PINGPONG_2, 0x71000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_1,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
>> - PP_BLK("pingpong_3", PINGPONG_3, 0x71800, MERGE_3D_1,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> + PP_BLK("pingpong_3", PINGPONG_3, 0x71800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_1,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
>> - PP_BLK("pingpong_4", PINGPONG_4, 0x72000, MERGE_3D_2,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
>> - -1),
>> - PP_BLK("pingpong_5", PINGPONG_5, 0x72800, MERGE_3D_2,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
>> - -1),
>> + PP_BLK("pingpong_4", PINGPONG_4, 0x72000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_2,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), -1),
>> + PP_BLK("pingpong_5", PINGPONG_5, 0x72800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_2,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), -1),
>> };
>> static const struct dpu_merge_3d_cfg sm8150_merge_3d[] = {
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
>> index 5bb9882..e766a2d 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h
>> @@ -116,23 +116,23 @@ static const struct dpu_lm_cfg sc8180x_lm[] = {
>> };
>> static const struct dpu_pingpong_cfg sc8180x_pp[] = {
>> - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_0,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> - PP_BLK("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> + PP_BLK("pingpong_1", PINGPONG_1, 0x70800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_0,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
>> - PP_BLK("pingpong_2", PINGPONG_2, 0x71000, MERGE_3D_1,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> + PP_BLK("pingpong_2", PINGPONG_2, 0x71000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_1,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
>> - PP_BLK("pingpong_3", PINGPONG_3, 0x71800, MERGE_3D_1,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> + PP_BLK("pingpong_3", PINGPONG_3, 0x71800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_1,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
>> - PP_BLK("pingpong_4", PINGPONG_4, 0x72000, MERGE_3D_2,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
>> + PP_BLK("pingpong_4", PINGPONG_4, 0x72000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_2,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
>> -1),
>> - PP_BLK("pingpong_5", PINGPONG_5, 0x72800, MERGE_3D_2,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
>> + PP_BLK("pingpong_5", PINGPONG_5, 0x72800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_2,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
>> -1),
>> };
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
>> index ed130582..137b151 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h
>> @@ -129,24 +129,22 @@ static const struct dpu_dspp_cfg sm8250_dspp[] = {
>> };
>> static const struct dpu_pingpong_cfg sm8250_pp[] = {
>> - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, MERGE_3D_0,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_0,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> - PP_BLK("pingpong_1", PINGPONG_1, 0x70800, MERGE_3D_0,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> + PP_BLK("pingpong_1", PINGPONG_1, 0x70800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_0,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
>> - PP_BLK("pingpong_2", PINGPONG_2, 0x71000, MERGE_3D_1,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> + PP_BLK("pingpong_2", PINGPONG_2, 0x71000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_1,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
>> - PP_BLK("pingpong_3", PINGPONG_3, 0x71800, MERGE_3D_1,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> + PP_BLK("pingpong_3", PINGPONG_3, 0x71800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_1,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
>> - PP_BLK("pingpong_4", PINGPONG_4, 0x72000, MERGE_3D_2,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30),
>> - -1),
>> - PP_BLK("pingpong_5", PINGPONG_5, 0x72800, MERGE_3D_2,
>> sdm845_pp_sblk,
>> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31),
>> - -1),
>> + PP_BLK("pingpong_4", PINGPONG_4, 0x72000, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_2,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 30), -1),
>> + PP_BLK("pingpong_5", PINGPONG_5, 0x72800, BIT(DPU_PINGPONG_DSC),
>> MERGE_3D_2,
>> + sdm845_pp_sblk, DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 31), -1),
>> };
>> static const struct dpu_merge_3d_cfg sm8250_merge_3d[] = {
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
>> index a46b117..e5631a2 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h
>> @@ -80,8 +80,8 @@ static const struct dpu_dspp_cfg sc7180_dspp[] = {
>> };
>> static const struct dpu_pingpong_cfg sc7180_pp[] = {
>> - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk, -1,
>> -1),
>> - PP_BLK("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk, -1,
>> -1),
>> + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, 0, sdm845_pp_sblk,
>> -1, -1),
>> + PP_BLK("pingpong_1", PINGPONG_1, 0x70800, 0, 0, sdm845_pp_sblk,
>> -1, -1),
>> };
>> static const struct dpu_intf_cfg sc7180_intf[] = {
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
>> index 988d820..7b4ad0f 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h
>> @@ -60,7 +60,7 @@ static const struct dpu_dspp_cfg sm6115_dspp[] = {
>> };
>> static const struct dpu_pingpong_cfg sm6115_pp[] = {
>> - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk,
>> + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, 0, sdm845_pp_sblk,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> };
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
>> b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
>> index c9003dc..20d4d14 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h
>> @@ -57,7 +57,7 @@ static const struct dpu_dspp_cfg qcm2290_dspp[] = {
>> };
>> static const struct dpu_pingpong_cfg qcm2290_pp[] = {
>> - PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk,
>> + PP_BLK("pingpong_0", PINGPONG_0, 0x70000, 0, 0, sdm845_pp_sblk,
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
>> DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
>> };
>> 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 91bfc8a..83c0cd9 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
>> @@ -501,21 +501,21 @@ static const struct dpu_pingpong_sub_blks
>> sc7280_pp_sblk = {
>> .intr_done = _done, \
>> .intr_rdptr = _rdptr, \
>> }
>> -#define PP_BLK_TE(_name, _id, _base, _merge_3d, _sblk, _done, _rdptr) \
>> +#define PP_BLK_TE(_name, _id, _base, _features, _merge_3d, _sblk,
>> _done, _rdptr) \
>> {\
>> .name = _name, .id = _id, \
>> .base = _base, .len = 0xd4, \
>> - .features = PINGPONG_SDM845_SPLIT_MASK, \
>> + .features = PINGPONG_SDM845_SPLIT_MASK | _features, \
>> .merge_3d = _merge_3d, \
>> .sblk = &_sblk, \
>> .intr_done = _done, \
>> .intr_rdptr = _rdptr, \
>> }
>> -#define PP_BLK(_name, _id, _base, _merge_3d, _sblk, _done, _rdptr) \
>> +#define PP_BLK(_name, _id, _base, _features, _merge_3d, _sblk, _done,
>> _rdptr) \
>> {\
>> .name = _name, .id = _id, \
>> .base = _base, .len = 0xd4, \
>> - .features = PINGPONG_SDM845_MASK, \
>> + .features = PINGPONG_SDM845_MASK | _features, \
>> .merge_3d = _merge_3d, \
>> .sblk = &_sblk, \
>> .intr_done = _done, \
>> 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 fc87db1..6b49171 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h
>> @@ -144,6 +144,7 @@ enum {
>> * @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_DSC, PP block binding to DSC
>> * @DPU_PINGPONG_MAX
>> */
>> enum {
>> @@ -152,6 +153,7 @@ enum {
>> DPU_PINGPONG_SPLIT,
>> DPU_PINGPONG_SLAVE,
>> DPU_PINGPONG_DITHER,
>> + DPU_PINGPONG_DSC,
>> DPU_PINGPONG_MAX
>> };
>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> index 3822e06..f255a04 100644
>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c
>> @@ -264,9 +264,12 @@ static void _setup_pingpong_ops(struct
>> dpu_hw_pingpong *c,
>> c->ops.get_autorefresh = dpu_hw_pp_get_autorefresh_config;
>> c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr;
>> c->ops.get_line_count = dpu_hw_pp_get_line_count;
>> - c->ops.setup_dsc = dpu_hw_pp_setup_dsc;
>> - c->ops.enable_dsc = dpu_hw_pp_dsc_enable;
>> - c->ops.disable_dsc = dpu_hw_pp_dsc_disable;
>> +
>> + if (features & BIT(DPU_PINGPONG_DSC)) {
>> + c->ops.setup_dsc = dpu_hw_pp_setup_dsc;
>> + c->ops.enable_dsc = dpu_hw_pp_dsc_enable;
>> + c->ops.disable_dsc = dpu_hw_pp_dsc_disable;
>> + }
>> if (test_bit(DPU_PINGPONG_DITHER, &features))
>> c->ops.setup_dither = dpu_hw_pp_setup_dither;
>
Powered by blists - more mailing lists