| Message ID | 20230624-sm6125-dpu-v1-9-1d5a638cebf2@somainline.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | drm/msm: Add SM6125 MDSS/DPU hardware and enable Sony Xperia 10 II panel | expand |
On 24/06/2023 03:41, Marijn Suijten wrote: > SM6125's UBWC hardware decoder is version 3.0, and supports decoding > UBWC 1.0. I think it's UBWC encoder version, see https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/display-kernel.lnx.5.15.1.r17-rel/msm/sde/sde_hw_top.c?ref_type=heads#L357 This is a part of https://patchwork.freedesktop.org/patch/538279/?series=118074&rev=1 (no, you don't have to rebase on that patchset, it is not reviewed yet). > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > drivers/gpu/drm/msm/msm_mdss.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c > index 05648c910c68..bf68bae23264 100644 > --- a/drivers/gpu/drm/msm/msm_mdss.c > +++ b/drivers/gpu/drm/msm/msm_mdss.c > @@ -559,6 +559,13 @@ static const struct msm_mdss_data sm6115_data = { > .ubwc_static = 0x11f, > }; > > +static const struct msm_mdss_data sm6125_data = { > + .ubwc_version = UBWC_1_0, > + .ubwc_dec_version = UBWC_3_0, > + .ubwc_swizzle = 1, > + .highest_bank_bit = 1, > +}; > + > static const struct msm_mdss_data sm8250_data = { > .ubwc_version = UBWC_4_0, > .ubwc_dec_version = UBWC_4_0, > @@ -579,6 +586,7 @@ static const struct of_device_id mdss_dt_match[] = { > { .compatible = "qcom,sc8180x-mdss", .data = &sc8180x_data }, > { .compatible = "qcom,sc8280xp-mdss", .data = &sc8280xp_data }, > { .compatible = "qcom,sm6115-mdss", .data = &sm6115_data }, > + { .compatible = "qcom,sm6125-mdss", .data = &sm6125_data }, > { .compatible = "qcom,sm6350-mdss", .data = &sm6350_data }, > { .compatible = "qcom,sm6375-mdss", .data = &sm6350_data }, > { .compatible = "qcom,sm8150-mdss", .data = &sm8150_data }, >
On 2023-06-27 11:49:07, Dmitry Baryshkov wrote: > On 24/06/2023 03:41, Marijn Suijten wrote: > > SM6125's UBWC hardware decoder is version 3.0, and supports decoding > > UBWC 1.0. > > I think it's UBWC encoder version, see > https://git.codelinaro.org/clo/la/platform/vendor/opensource/display-drivers/-/blob/display-kernel.lnx.5.15.1.r17-rel/msm/sde/sde_hw_top.c?ref_type=heads#L357 > > This is a part of > https://patchwork.freedesktop.org/patch/538279/?series=118074&rev=1 > > (no, you don't have to rebase on that patchset, it is not reviewed yet). Thanks for clarifying this. I always thought that there only was a (decoder) hardware version, that is able to decode a specific format version of the UBWC data format. And that it was confusingly using the same enum. I will reword the message. (Also didn't really see why MDSS would have to _encode_ to UBWC, for readbacks?) - Marijn > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > > --- > > drivers/gpu/drm/msm/msm_mdss.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c > > index 05648c910c68..bf68bae23264 100644 > > --- a/drivers/gpu/drm/msm/msm_mdss.c > > +++ b/drivers/gpu/drm/msm/msm_mdss.c > > @@ -559,6 +559,13 @@ static const struct msm_mdss_data sm6115_data = { > > .ubwc_static = 0x11f, > > }; > > > > +static const struct msm_mdss_data sm6125_data = { > > + .ubwc_version = UBWC_1_0, > > + .ubwc_dec_version = UBWC_3_0, > > + .ubwc_swizzle = 1, > > + .highest_bank_bit = 1, > > +}; > > + > > static const struct msm_mdss_data sm8250_data = { > > .ubwc_version = UBWC_4_0, > > .ubwc_dec_version = UBWC_4_0, > > @@ -579,6 +586,7 @@ static const struct of_device_id mdss_dt_match[] = { > > { .compatible = "qcom,sc8180x-mdss", .data = &sc8180x_data }, > > { .compatible = "qcom,sc8280xp-mdss", .data = &sc8280xp_data }, > > { .compatible = "qcom,sm6115-mdss", .data = &sm6115_data }, > > + { .compatible = "qcom,sm6125-mdss", .data = &sm6125_data }, > > { .compatible = "qcom,sm6350-mdss", .data = &sm6350_data }, > > { .compatible = "qcom,sm6375-mdss", .data = &sm6350_data }, > > { .compatible = "qcom,sm8150-mdss", .data = &sm8150_data }, > > > > -- > With best wishes > Dmitry >
diff --git a/drivers/gpu/drm/msm/msm_mdss.c b/drivers/gpu/drm/msm/msm_mdss.c index 05648c910c68..bf68bae23264 100644 --- a/drivers/gpu/drm/msm/msm_mdss.c +++ b/drivers/gpu/drm/msm/msm_mdss.c @@ -559,6 +559,13 @@ static const struct msm_mdss_data sm6115_data = { .ubwc_static = 0x11f, }; +static const struct msm_mdss_data sm6125_data = { + .ubwc_version = UBWC_1_0, + .ubwc_dec_version = UBWC_3_0, + .ubwc_swizzle = 1, + .highest_bank_bit = 1, +}; + static const struct msm_mdss_data sm8250_data = { .ubwc_version = UBWC_4_0, .ubwc_dec_version = UBWC_4_0, @@ -579,6 +586,7 @@ static const struct of_device_id mdss_dt_match[] = { { .compatible = "qcom,sc8180x-mdss", .data = &sc8180x_data }, { .compatible = "qcom,sc8280xp-mdss", .data = &sc8280xp_data }, { .compatible = "qcom,sm6115-mdss", .data = &sm6115_data }, + { .compatible = "qcom,sm6125-mdss", .data = &sm6125_data }, { .compatible = "qcom,sm6350-mdss", .data = &sm6350_data }, { .compatible = "qcom,sm6375-mdss", .data = &sm6350_data }, { .compatible = "qcom,sm8150-mdss", .data = &sm8150_data },
SM6125's UBWC hardware decoder is version 3.0, and supports decoding UBWC 1.0. Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> --- drivers/gpu/drm/msm/msm_mdss.c | 8 ++++++++ 1 file changed, 8 insertions(+)