From: Yongqin Liu <yongqin.liu@linaro.org> To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Marijn Suijten <marijn.suijten@somainline.org>, Stephen Boyd <swboyd@chromium.org>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Bjorn Andersson <andersson@kernel.org>, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: Re: [PATCH 1/2] drm/msm/dpu: do not enable color-management if DSPPs are not available Date: Thu, 15 Jun 2023 14:28:22 +0800 [thread overview] Message-ID: <CAMSo37UVzFyigaTvKjxV-4Gvit8H4n8DtwC=2PYWGTr6L555Rg@mail.gmail.com> (raw) In-Reply-To: <20230612182534.3345805-1-dmitry.baryshkov@linaro.org> On Tue, 13 Jun 2023 at 02:25, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > We can not support color management without DSPP blocks being provided > in the HW catalog. Do not enable color management for CRTCs if num_dspps > is 0. > > Fixes: 4259ff7ae509 ("drm/msm/dpu: add support for pcc color block in dpu driver") > Reported-by: Yongqin Liu <yongqin.liu@linaro.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Thanks for this fix! With it applied to the ACK android-mainline branch, the "dpu error" problem reported here: https://lore.kernel.org/lkml/CAMSo37VmhB1-PUp1qu8gaxOXtu98eEYmWd71FOai+cwLb-JvSg@mail.gmail.com/ is not reproduced. Tested-by: Yongqin Liu <yongqin.liu@linaro.org> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 6e684a7b49a1..1edf2b6b0a26 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -1463,6 +1463,8 @@ static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { > struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, > struct drm_plane *cursor) > { > + struct msm_drm_private *priv = dev->dev_private; > + struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms); > struct drm_crtc *crtc = NULL; > struct dpu_crtc *dpu_crtc = NULL; > int i, ret; > @@ -1494,7 +1496,8 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, > > drm_crtc_helper_add(crtc, &dpu_crtc_helper_funcs); > > - drm_crtc_enable_color_mgmt(crtc, 0, true, 0); > + if (dpu_kms->catalog->dspp_count) > + drm_crtc_enable_color_mgmt(crtc, 0, true, 0); > > /* save user friendly CRTC name for later */ > snprintf(dpu_crtc->name, DPU_CRTC_NAME_SIZE, "crtc%u", crtc->base.id); > -- > 2.39.2 > -- Best Regards, Yongqin Liu --------------------------------------------------------------- #mailing list linaro-android@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-android
WARNING: multiple messages have this Message-ID (diff)
From: Yongqin Liu <yongqin.liu@linaro.org> To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: freedreno@lists.freedesktop.org, Bjorn Andersson <andersson@kernel.org>, Abhinav Kumar <quic_abhinavk@quicinc.com>, dri-devel@lists.freedesktop.org, Stephen Boyd <swboyd@chromium.org>, linux-arm-msm@vger.kernel.org, Marijn Suijten <marijn.suijten@somainline.org>, Sean Paul <sean@poorly.run> Subject: Re: [PATCH 1/2] drm/msm/dpu: do not enable color-management if DSPPs are not available Date: Thu, 15 Jun 2023 14:28:22 +0800 [thread overview] Message-ID: <CAMSo37UVzFyigaTvKjxV-4Gvit8H4n8DtwC=2PYWGTr6L555Rg@mail.gmail.com> (raw) In-Reply-To: <20230612182534.3345805-1-dmitry.baryshkov@linaro.org> On Tue, 13 Jun 2023 at 02:25, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > > We can not support color management without DSPP blocks being provided > in the HW catalog. Do not enable color management for CRTCs if num_dspps > is 0. > > Fixes: 4259ff7ae509 ("drm/msm/dpu: add support for pcc color block in dpu driver") > Reported-by: Yongqin Liu <yongqin.liu@linaro.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Thanks for this fix! With it applied to the ACK android-mainline branch, the "dpu error" problem reported here: https://lore.kernel.org/lkml/CAMSo37VmhB1-PUp1qu8gaxOXtu98eEYmWd71FOai+cwLb-JvSg@mail.gmail.com/ is not reproduced. Tested-by: Yongqin Liu <yongqin.liu@linaro.org> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 6e684a7b49a1..1edf2b6b0a26 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -1463,6 +1463,8 @@ static const struct drm_crtc_helper_funcs dpu_crtc_helper_funcs = { > struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, > struct drm_plane *cursor) > { > + struct msm_drm_private *priv = dev->dev_private; > + struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms); > struct drm_crtc *crtc = NULL; > struct dpu_crtc *dpu_crtc = NULL; > int i, ret; > @@ -1494,7 +1496,8 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane, > > drm_crtc_helper_add(crtc, &dpu_crtc_helper_funcs); > > - drm_crtc_enable_color_mgmt(crtc, 0, true, 0); > + if (dpu_kms->catalog->dspp_count) > + drm_crtc_enable_color_mgmt(crtc, 0, true, 0); > > /* save user friendly CRTC name for later */ > snprintf(dpu_crtc->name, DPU_CRTC_NAME_SIZE, "crtc%u", crtc->base.id); > -- > 2.39.2 > -- Best Regards, Yongqin Liu --------------------------------------------------------------- #mailing list linaro-android@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-android
next prev parent reply other threads:[~2023-06-15 6:28 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-12 18:25 [PATCH 1/2] drm/msm/dpu: do not enable color-management if DSPPs are not available Dmitry Baryshkov 2023-06-12 18:25 ` Dmitry Baryshkov 2023-06-12 18:25 ` [PATCH 2/2] drm/msm/dpu/catalog: define DSPP blocks found on sdm845 Dmitry Baryshkov 2023-06-12 18:25 ` Dmitry Baryshkov 2023-06-12 19:35 ` Abhinav Kumar 2023-06-12 19:35 ` Abhinav Kumar 2023-06-12 19:39 ` Dmitry Baryshkov 2023-06-12 19:39 ` Dmitry Baryshkov 2023-06-12 23:11 ` Marijn Suijten 2023-06-12 23:11 ` Marijn Suijten 2023-06-14 7:51 ` [Freedreno] " Sumit Semwal 2023-06-14 7:51 ` Sumit Semwal 2023-06-12 18:42 ` [PATCH 1/2] drm/msm/dpu: do not enable color-management if DSPPs are not available Abhinav Kumar 2023-06-12 18:42 ` Abhinav Kumar 2023-06-12 23:09 ` Marijn Suijten 2023-06-12 23:09 ` Marijn Suijten 2023-06-14 7:49 ` [Freedreno] " Sumit Semwal 2023-06-14 7:49 ` Sumit Semwal 2023-06-15 6:28 ` Yongqin Liu [this message] 2023-06-15 6:28 ` Yongqin Liu 2023-06-15 11:31 ` Dmitry Baryshkov 2023-06-15 11:31 ` Dmitry Baryshkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CAMSo37UVzFyigaTvKjxV-4Gvit8H4n8DtwC=2PYWGTr6L555Rg@mail.gmail.com' \ --to=yongqin.liu@linaro.org \ --cc=airlied@gmail.com \ --cc=andersson@kernel.org \ --cc=daniel@ffwll.ch \ --cc=dmitry.baryshkov@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=marijn.suijten@somainline.org \ --cc=quic_abhinavk@quicinc.com \ --cc=robdclark@gmail.com \ --cc=sean@poorly.run \ --cc=swboyd@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.