[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Thu, 12 Dec 2019 12:49:57 +0800
From: CK Hu <ck.hu@...iatek.com>
To: Pi-Hsun Shih <pihsun@...omium.org>
CC: Daniel Vetter <daniel@...ll.ch>, David Airlie <airlied@...ux.ie>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@...ts.infradead.org>,
open list <linux-kernel@...r.kernel.org>,
"open list:DRM DRIVERS FOR MEDIATEK"
<dri-devel@...ts.freedesktop.org>,
Yongqiang Niu <yongqiang.niu@...iatek.com>,
Matthias Brugger <matthias.bgg@...il.com>,
Philipp Zabel <p.zabel@...gutronix.de>,
Sean Paul <seanpaul@...omium.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH] drm/mediatek: Fix can't get component for external
display plane.
Hi, Pi-Hsun:
On Mon, 2019-12-02 at 13:24 +0800, CK Hu wrote:
> Hi, Pi-Hsun:
>
>
> On Wed, 2019-11-27 at 18:04 +0800, Pi-Hsun Shih wrote:
> > From: Yongqiang Niu <yongqiang.niu@...iatek.com>
> >
> > The original logic is ok for primary display, but will not find out
> > component for external display.
> >
> > For example, plane->index is 6 for external display, but there are only
> > 2 layer nr in external display, and this condition will never happen:
> > if (plane->index < (count + mtk_ddp_comp_layer_nr(comp)))
> >
> > Fix this by using the offset of the plane to mtk_crtc->planes as index,
> > instead of plane->index.
>
> Reviewed-by: CK Hu <ck.hu@...iatek.com>
>
Applied to mediatek-drm-fixes-5.5 [1], thanks.
[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.5
Regards,
CK
> Regards,
> CK
>
> >
> > Fixes: d6b53f68356f ("drm/mediatek: Add helper to get component for a plane")
> > Signed-off-by: Yongqiang Niu <yongqiang.niu@...iatek.com>
> > Signed-off-by: Pi-Hsun Shih <pihsun@...omium.org>
> > ---
> > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > index f80a8ba75977..b34e7d70702a 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > @@ -215,11 +215,12 @@ struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc,
> > struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> > struct mtk_ddp_comp *comp;
> > int i, count = 0;
> > + unsigned int local_index = plane - mtk_crtc->planes;
> >
> > for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
> > comp = mtk_crtc->ddp_comp[i];
> > - if (plane->index < (count + mtk_ddp_comp_layer_nr(comp))) {
> > - *local_layer = plane->index - count;
> > + if (local_index < (count + mtk_ddp_comp_layer_nr(comp))) {
> > + *local_layer = local_index - count;
> > return comp;
> > }
> > count += mtk_ddp_comp_layer_nr(comp);
> >
> > base-commit: 1875ff320f14afe21731a6e4c7b46dd33e45dfaa
>
Powered by blists - more mailing lists