From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: Vinod Koul <vkoul@kernel.org>, Rob Clark <robdclark@gmail.com> Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson <bjorn.andersson@linaro.org>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Jonathan Marek <jonathan@marek.ca>, Abhinav Kumar <abhinavk@codeaurora.org>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: Re: [REPOST PATCH v4 08/13] drm/msm/disp/dpu1: Don't use DSC with mode_3d Date: Thu, 10 Feb 2022 13:55:27 +0300 [thread overview] Message-ID: <3035968b-8323-5380-afe3-4ddcc1ca65c4@linaro.org> (raw) In-Reply-To: <20220210103423.271016-9-vkoul@kernel.org> On 10/02/2022 13:34, Vinod Koul wrote: > We cannot enable mode_3d when we are using the DSC. So pass > configuration to detect DSC is enabled and not enable mode_3d > when we are using DSC > > We add a helper dpu_encoder_helper_get_dsc() to detect dsc > enabled and pass this to .setup_intf_cfg() > > Signed-off-by: Vinod Koul <vkoul@kernel.org> You seem to insist on this. Ok, lets agree that you did not test any other topologies and let anybody adding support for SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE_DSC handle this. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 4 ++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 4 ++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 7 ++++++- > 3 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c > index 34a6940d12c5..ed37a4c21596 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c > @@ -70,6 +70,10 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( > intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_CMD; > intf_cfg.stream_sel = cmd_enc->stream_sel; > intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); > + intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); > + if (intf_cfg.dsc) > + intf_cfg.mode_3d = 0; > + > ctl->ops.setup_intf_cfg(ctl, &intf_cfg); > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > index ddd9d89cd456..218009855fca 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > @@ -284,6 +284,10 @@ static void dpu_encoder_phys_vid_setup_timing_engine( > intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_VID; > intf_cfg.stream_sel = 0; /* Don't care value for video mode */ > intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); > + intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); > + if (intf_cfg.dsc) > + intf_cfg.mode_3d = 0; > + > if (phys_enc->hw_pp->merge_3d) > intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx; > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > index 49659165cea8..6d5268b7da90 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > @@ -536,7 +536,12 @@ static void dpu_hw_ctl_intf_cfg(struct dpu_hw_ctl *ctx, > > intf_cfg |= (cfg->intf & 0xF) << 4; > > - if (cfg->mode_3d) { > + /* In DSC we can't set merge, so check for dsc and complain */ > + if (cfg->mode_3d && cfg->dsc) > + pr_err("DPU1: DSC and Merge 3D both are set!! it may not work\n"); > + > + /* set merge only when dsc is not set */ > + if (cfg->mode_3d && !cfg->dsc) { > intf_cfg |= BIT(19); > intf_cfg |= (cfg->mode_3d - 0x1) << 20; > } -- With best wishes Dmitry
WARNING: multiple messages have this Message-ID (diff)
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: Vinod Koul <vkoul@kernel.org>, Rob Clark <robdclark@gmail.com> Cc: Jonathan Marek <jonathan@marek.ca>, David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Abhinav Kumar <abhinavk@codeaurora.org>, Bjorn Andersson <bjorn.andersson@linaro.org>, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: Re: [REPOST PATCH v4 08/13] drm/msm/disp/dpu1: Don't use DSC with mode_3d Date: Thu, 10 Feb 2022 13:55:27 +0300 [thread overview] Message-ID: <3035968b-8323-5380-afe3-4ddcc1ca65c4@linaro.org> (raw) In-Reply-To: <20220210103423.271016-9-vkoul@kernel.org> On 10/02/2022 13:34, Vinod Koul wrote: > We cannot enable mode_3d when we are using the DSC. So pass > configuration to detect DSC is enabled and not enable mode_3d > when we are using DSC > > We add a helper dpu_encoder_helper_get_dsc() to detect dsc > enabled and pass this to .setup_intf_cfg() > > Signed-off-by: Vinod Koul <vkoul@kernel.org> You seem to insist on this. Ok, lets agree that you did not test any other topologies and let anybody adding support for SDE_RM_TOPOLOGY_DUALPIPE_3DMERGE_DSC handle this. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 4 ++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 4 ++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 7 ++++++- > 3 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c > index 34a6940d12c5..ed37a4c21596 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c > @@ -70,6 +70,10 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( > intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_CMD; > intf_cfg.stream_sel = cmd_enc->stream_sel; > intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); > + intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); > + if (intf_cfg.dsc) > + intf_cfg.mode_3d = 0; > + > ctl->ops.setup_intf_cfg(ctl, &intf_cfg); > } > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > index ddd9d89cd456..218009855fca 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c > @@ -284,6 +284,10 @@ static void dpu_encoder_phys_vid_setup_timing_engine( > intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_VID; > intf_cfg.stream_sel = 0; /* Don't care value for video mode */ > intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); > + intf_cfg.dsc = dpu_encoder_helper_get_dsc(phys_enc); > + if (intf_cfg.dsc) > + intf_cfg.mode_3d = 0; > + > if (phys_enc->hw_pp->merge_3d) > intf_cfg.merge_3d = phys_enc->hw_pp->merge_3d->idx; > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > index 49659165cea8..6d5268b7da90 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c > @@ -536,7 +536,12 @@ static void dpu_hw_ctl_intf_cfg(struct dpu_hw_ctl *ctx, > > intf_cfg |= (cfg->intf & 0xF) << 4; > > - if (cfg->mode_3d) { > + /* In DSC we can't set merge, so check for dsc and complain */ > + if (cfg->mode_3d && cfg->dsc) > + pr_err("DPU1: DSC and Merge 3D both are set!! it may not work\n"); > + > + /* set merge only when dsc is not set */ > + if (cfg->mode_3d && !cfg->dsc) { > intf_cfg |= BIT(19); > intf_cfg |= (cfg->mode_3d - 0x1) << 20; > } -- With best wishes Dmitry
next prev parent reply other threads:[~2022-02-10 10:55 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-10 10:34 [REPOST PATCH v4 00/13] drm/msm: Add Display Stream Compression Support Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 10:34 ` [REPOST PATCH v4 01/13] drm/msm/dsi: add support for dsc data Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 11:07 ` Dmitry Baryshkov 2022-02-10 11:07 ` Dmitry Baryshkov 2022-02-17 20:06 ` Abhinav Kumar 2022-02-17 20:06 ` Abhinav Kumar 2022-02-21 2:17 ` Dmitry Baryshkov 2022-02-21 2:17 ` Dmitry Baryshkov 2022-02-10 10:34 ` [REPOST PATCH v4 02/13] drm/msm/dsi: Pass DSC params to drm_panel Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 10:43 ` Dmitry Baryshkov 2022-02-10 10:43 ` Dmitry Baryshkov 2022-02-17 0:27 ` Abhinav Kumar 2022-02-17 0:27 ` Abhinav Kumar 2022-02-21 12:37 ` Dmitry Baryshkov 2022-02-21 12:37 ` Dmitry Baryshkov 2022-03-03 19:08 ` Abhinav Kumar 2022-03-03 19:08 ` Abhinav Kumar 2022-02-10 10:34 ` [REPOST PATCH v4 03/13] drm/msm/disp/dpu1: Add support for DSC Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-16 18:57 ` Abhinav Kumar 2022-02-16 18:57 ` Abhinav Kumar 2022-02-16 19:46 ` Dmitry Baryshkov 2022-02-17 4:20 ` Vinod Koul 2022-02-17 4:20 ` Vinod Koul 2022-02-10 10:34 ` [REPOST PATCH v4 04/13] drm/msm/disp/dpu1: Add support for DSC in pingpong block Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-16 19:49 ` Abhinav Kumar 2022-02-16 19:49 ` Abhinav Kumar 2022-02-17 4:21 ` Vinod Koul 2022-02-17 4:21 ` Vinod Koul 2022-02-10 10:34 ` [REPOST PATCH v4 05/13] drm/msm/disp/dpu1: Add DSC for SDM845 to hw_catalog Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-16 19:42 ` [Freedreno] " Abhinav Kumar 2022-02-16 19:42 ` Abhinav Kumar 2022-02-10 10:34 ` [REPOST PATCH v4 06/13] drm/msm/disp/dpu1: Add DSC support in hw_ctl Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-16 19:52 ` [Freedreno] " Abhinav Kumar 2022-02-16 19:52 ` Abhinav Kumar 2022-02-17 22:20 ` Marijn Suijten 2022-02-17 22:20 ` Marijn Suijten 2022-03-24 16:24 ` Vinod Koul 2022-03-24 16:24 ` Vinod Koul 2022-02-10 10:34 ` [REPOST PATCH v4 07/13] drm/msm/disp/dpu1: Add support for DSC in encoder Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 11:13 ` Dmitry Baryshkov 2022-02-10 11:13 ` Dmitry Baryshkov 2022-02-16 19:54 ` [Freedreno] " Abhinav Kumar 2022-02-16 19:54 ` Abhinav Kumar 2022-02-17 6:08 ` Vinod Koul 2022-02-17 6:08 ` Vinod Koul 2022-02-17 22:32 ` Marijn Suijten 2022-02-17 22:32 ` Marijn Suijten 2022-03-23 14:40 ` Vinod Koul 2022-03-23 14:40 ` Vinod Koul 2022-03-24 15:41 ` Vinod Koul 2022-03-24 15:41 ` Vinod Koul 2022-02-21 1:41 ` Dmitry Baryshkov 2022-02-21 1:41 ` Dmitry Baryshkov 2022-02-10 10:34 ` [REPOST PATCH v4 08/13] drm/msm/disp/dpu1: Don't use DSC with mode_3d Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 10:55 ` Dmitry Baryshkov [this message] 2022-02-10 10:55 ` Dmitry Baryshkov 2022-02-17 3:11 ` Abhinav Kumar 2022-02-17 3:11 ` Abhinav Kumar 2022-02-17 6:10 ` Vinod Koul 2022-02-17 6:10 ` Vinod Koul 2022-02-17 6:33 ` Abhinav Kumar 2022-02-17 6:33 ` Abhinav Kumar 2022-02-17 7:12 ` Dmitry Baryshkov 2022-02-17 7:12 ` Dmitry Baryshkov 2022-02-18 20:46 ` Abhinav Kumar 2022-02-18 20:46 ` Abhinav Kumar 2022-02-18 21:21 ` Dmitry Baryshkov 2022-02-18 21:21 ` Dmitry Baryshkov 2022-02-18 21:29 ` [Freedreno] " Abhinav Kumar 2022-02-18 21:29 ` Abhinav Kumar 2022-02-18 21:36 ` Dmitry Baryshkov 2022-02-18 21:36 ` Dmitry Baryshkov 2022-02-10 10:34 ` [REPOST PATCH v4 09/13] drm/msm: Add missing structure documentation Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 10:39 ` Dmitry Baryshkov 2022-02-10 10:39 ` Dmitry Baryshkov 2022-02-17 3:12 ` Abhinav Kumar 2022-02-17 3:12 ` Abhinav Kumar 2022-02-17 22:34 ` Marijn Suijten 2022-02-17 22:34 ` Marijn Suijten 2022-02-10 10:34 ` [REPOST PATCH v4 10/13] drm/msm/disp/dpu1: Add support for DSC in topology Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-10 10:47 ` Dmitry Baryshkov 2022-02-10 10:47 ` Dmitry Baryshkov 2022-02-17 21:44 ` Marijn Suijten 2022-02-17 21:44 ` Marijn Suijten 2022-03-23 11:38 ` [Freedreno] " Vinod Koul 2022-03-23 11:38 ` Vinod Koul 2022-02-17 22:37 ` Marijn Suijten 2022-02-17 22:37 ` Marijn Suijten 2022-03-23 11:39 ` Vinod Koul 2022-03-23 11:39 ` Vinod Koul 2022-02-10 10:34 ` [REPOST PATCH v4 11/13] drm/msm/disp/dpu1: Add DSC support in RM Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-17 3:14 ` Abhinav Kumar 2022-02-17 3:14 ` Abhinav Kumar 2022-02-17 3:21 ` Abhinav Kumar 2022-02-17 3:21 ` Abhinav Kumar 2022-02-10 10:34 ` [REPOST PATCH v4 12/13] drm/msm/dsi: add mode valid callback for dsi_mgr Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-17 3:17 ` Abhinav Kumar 2022-02-17 3:17 ` Abhinav Kumar 2022-02-10 10:34 ` [REPOST PATCH v4 13/13] drm/msm/dsi: Add support for DSC configuration Vinod Koul 2022-02-10 10:34 ` Vinod Koul 2022-02-17 3:44 ` [Freedreno] " Abhinav Kumar 2022-02-17 3:44 ` Abhinav Kumar 2022-02-17 6:19 ` Vinod Koul 2022-02-17 6:19 ` Vinod Koul 2022-02-17 9:27 ` Marijn Suijten 2022-02-17 9:27 ` Marijn Suijten 2022-02-17 10:51 ` [Freedreno] " Vinod Koul 2022-02-17 10:51 ` Vinod Koul 2022-02-17 14:38 ` Marijn Suijten 2022-02-17 14:38 ` Marijn Suijten 2022-02-21 2:11 ` Dmitry Baryshkov 2022-02-21 2:11 ` Dmitry Baryshkov 2022-03-24 15:45 ` Vinod Koul 2022-03-24 15:45 ` Vinod Koul
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=3035968b-8323-5380-afe3-4ddcc1ca65c4@linaro.org \ --to=dmitry.baryshkov@linaro.org \ --cc=abhinavk@codeaurora.org \ --cc=airlied@linux.ie \ --cc=bjorn.andersson@linaro.org \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=jonathan@marek.ca \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robdclark@gmail.com \ --cc=vkoul@kernel.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.