From: Vinod Koul <vkoul@kernel.org>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Rob Clark <robdclark@gmail.com>,
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>,
Jeffrey Hugo <jeffrey.l.hugo@gmail.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
freedreno@lists.freedesktop.org
Subject: Re: [PATCH 04/11] drm/msm/disp/dpu1: Add DSC support in RM
Date: Wed, 6 Oct 2021 15:56:37 +0530 [thread overview]
Message-ID: <YV153cn39rZeqcJT@matsya> (raw)
In-Reply-To: <c8e9b236-4438-c2b3-a9a3-80f1c1c517a9@linaro.org>
On 29-07-21, 23:23, Dmitry Baryshkov wrote:
> On 15/07/2021 09:51, Vinod Koul wrote:
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> > index fd2d104f0a91..4da6d72b7996 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
> > @@ -11,6 +11,7 @@
> > #include "dpu_hw_intf.h"
> > #include "dpu_hw_dspp.h"
> > #include "dpu_hw_merge3d.h"
> > +#include "dpu_hw_dsc.h"
> > #include "dpu_encoder.h"
> > #include "dpu_trace.h"
> > @@ -75,6 +76,14 @@ int dpu_rm_destroy(struct dpu_rm *rm)
> > dpu_hw_intf_destroy(hw);
> > }
> > }
> > + for (i = 0; i < ARRAY_SIZE(rm->dsc_blks); i++) {
> > + struct dpu_hw_dsc *hw;
> > +
> > + if (rm->intf_blks[i]) {
>
> rm->dsc_blks[i]
Thanks for spotting, fixed!
>
> > + hw = to_dpu_hw_dsc(rm->dsc_blks[i]);
> > + dpu_hw_dsc_destroy(hw);
> > + }
> > + }
> > return 0;
> > }
> > @@ -221,6 +230,19 @@ int dpu_rm_init(struct dpu_rm *rm,
> > rm->dspp_blks[dspp->id - DSPP_0] = &hw->base;
> > }
> > + for (i = 0; i < cat->dsc_count; i++) {
> > + struct dpu_hw_dsc *hw;
> > + const struct dpu_dsc_cfg *dsc = &cat->dsc[i];
> > +
> > + hw = dpu_hw_dsc_init(dsc->id, mmio, cat);
> > + if (IS_ERR_OR_NULL(hw)) {
> > + rc = PTR_ERR(hw);
> > + DPU_ERROR("failed dsc object creation: err %d\n", rc);
> > + goto fail;
> > + }
> > + rm->dsc_blks[dsc->id - DSC_0] = &hw->base;
> > + }
> > +
> > return 0;
> > fail:
> > @@ -476,6 +498,9 @@ static int _dpu_rm_reserve_intf(
> > }
> > global_state->intf_to_enc_id[idx] = enc_id;
> > +
> > + global_state->dsc_to_enc_id[0] = enc_id;
> > + global_state->dsc_to_enc_id[1] = enc_id;
>
> This is not correct. At least this should be guarded with an if, checking
> that DSC is requested. Also we'd need to check that DSC 0 and 1 are not
> allocated.
Correct, so I have done few changes here and for DSC block reservation..
- Calling dpu_rm_get_assigned_resources() for DSC only when DSC is
required from dpu encoder
- moved the above code to dsc helper: _dpu_rm_reserve_dsc() as suggested
by Abhinav as well
- Check if DSC is supported and then check if DSC 0|1 are not allocated
and then assign as above
--
~Vinod
next prev parent reply other threads:[~2021-10-06 10:26 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 6:51 [PATCH 00/11] drm/msm: Add Display Stream Compression Support Vinod Koul
2021-07-15 6:51 ` [PATCH 01/11] drm/msm/dsi: add support for dsc data Vinod Koul
2021-08-02 22:55 ` [Freedreno] " abhinavk
2021-10-06 5:24 ` Vinod Koul
2021-07-15 6:51 ` [PATCH 02/11] drm/msm/disp/dpu1: Add support for DSC Vinod Koul
2021-07-19 8:28 ` kernel test robot
2021-08-02 23:03 ` [Freedreno] " abhinavk
2021-10-06 5:36 ` Vinod Koul
2021-07-15 6:51 ` [PATCH 03/11] drm/msm/disp/dpu1: Add support for DSC in pingpong block Vinod Koul
2021-08-02 23:07 ` [Freedreno] " abhinavk
2021-07-15 6:51 ` [PATCH 04/11] drm/msm/disp/dpu1: Add DSC support in RM Vinod Koul
2021-07-29 20:23 ` Dmitry Baryshkov
2021-10-06 10:26 ` Vinod Koul [this message]
2021-08-02 23:24 ` [Freedreno] " abhinavk
2021-10-06 10:27 ` Vinod Koul
2021-07-15 6:51 ` [PATCH 05/11] drm/msm/disp/dpu1: Add DSC for SDM845 to hw_catalog Vinod Koul
2021-07-29 20:25 ` Dmitry Baryshkov
2021-10-06 10:50 ` Vinod Koul
2021-08-02 23:29 ` [Freedreno] " abhinavk
2021-10-06 10:52 ` Vinod Koul
2021-07-15 6:51 ` [PATCH 06/11] drm/msm/disp/dpu1: Add DSC support in hw_ctl Vinod Koul
2021-07-29 22:15 ` Dmitry Baryshkov
2021-10-06 12:21 ` Vinod Koul
2021-08-03 0:00 ` [Freedreno] " abhinavk
2021-10-06 12:21 ` Vinod Koul
2021-07-15 6:51 ` [PATCH 07/11] drm/msm/disp/dpu1: Don't use DSC with mode_3d Vinod Koul
2021-08-03 0:24 ` [Freedreno] " abhinavk
2021-10-06 12:22 ` Vinod Koul
2021-07-15 6:52 ` [PATCH 08/11] drm/msm/disp/dpu1: Add support for DSC in encoder Vinod Koul
2021-07-19 8:54 ` kernel test robot
2021-07-29 20:54 ` Dmitry Baryshkov
2021-10-06 12:43 ` Vinod Koul
2021-08-03 0:57 ` [Freedreno] " abhinavk
2021-10-06 12:47 ` Vinod Koul
2021-07-15 6:52 ` [PATCH 09/11] drm/msm/disp/dpu1: Add support for DSC in topology Vinod Koul
2021-08-03 1:05 ` [Freedreno] " abhinavk
2021-07-15 6:52 ` [PATCH 10/11] drm/msm/dsi: Add support for DSC configuration Vinod Koul
2021-07-19 9:26 ` kernel test robot
2021-07-29 22:10 ` Dmitry Baryshkov
2021-08-03 1:16 ` [Freedreno] " abhinavk
2021-07-15 6:52 ` [PATCH 11/11] drm/msm/dsi: Pass DSC params to drm_panel Vinod Koul
2021-08-03 1:22 ` [Freedreno] " abhinavk
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=YV153cn39rZeqcJT@matsya \
--to=vkoul@kernel.org \
--cc=abhinavk@codeaurora.org \
--cc=airlied@linux.ie \
--cc=bjorn.andersson@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=jeffrey.l.hugo@gmail.com \
--cc=jonathan@marek.ca \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robdclark@gmail.com \
--cc=sumit.semwal@linaro.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).