From: CK Hu <ck.hu@mediatek.com>
To: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>,
LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Evan Benn <evanbenn@chromium.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
Date: Tue, 11 Feb 2020 09:19:34 +0800 [thread overview]
Message-ID: <1581383974.3194.1.camel@mtksdaap41> (raw)
In-Reply-To: <CAMavQKLqr=a=WZKFfC2sEBcskjX+k-82a3V3XVk7LQLzpAMaBg@mail.gmail.com>
On Mon, 2020-02-10 at 09:10 -0500, Sean Paul wrote:
> On Sun, Feb 9, 2020 at 9:53 PM CK Hu <ck.hu@mediatek.com> wrote:
> >
> > Hi, Evan:
> >
> > On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote:
> > > Hi, Evan:
> > >
> > > On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote:
> > > > The cursor and primary planes were hard coded.
> > > > Now search for them for passing to drm_crtc_init_with_planes
> > > >
> > >
> > > Reviewed-by: CK Hu <ck.hu@mediatek.com>
> >
> > Applied to mediatek-drm-fixes-5.6 [1], thanks.
> >
>
> Hi CK,
> Thanks for picking this up. Before you send the pull, could you please
> reverse the order of these 2 patches? Evan's should come before mine
> to prevent a regression.
>
> Sean
>
Hi, Sean:
Thanks for your notice. I've reversed the order.
Regards,
CK
> > [1]
> > https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6
> >
> > Regards,
> > CK
> >
> > >
> > > > Signed-off-by: Evan Benn <evanbenn@chromium.org>
> > > > ---
> > > >
> > > > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++------
> > > > 1 file changed, 12 insertions(+), 6 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > > > index 7b392d6c71cc..935652990afa 100644
> > > > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > > > @@ -658,10 +658,18 @@ static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {
> > > >
> > > > static int mtk_drm_crtc_init(struct drm_device *drm,
> > > > struct mtk_drm_crtc *mtk_crtc,
> > > > - struct drm_plane *primary,
> > > > - struct drm_plane *cursor, unsigned int pipe)
> > > > + unsigned int pipe)
> > > > {
> > > > - int ret;
> > > > + struct drm_plane *primary = NULL;
> > > > + struct drm_plane *cursor = NULL;
> > > > + int i, ret;
> > > > +
> > > > + for (i = 0; i < mtk_crtc->layer_nr; i++) {
> > > > + if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY)
> > > > + primary = &mtk_crtc->planes[i];
> > > > + else if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_CURSOR)
> > > > + cursor = &mtk_crtc->planes[i];
> > > > + }
> > > >
> > > > ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor,
> > > > &mtk_crtc_funcs, NULL);
> > > > @@ -830,9 +838,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
> > > > return ret;
> > > > }
> > > >
> > > > - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
> > > > - mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] :
> > > > - NULL, pipe);
> > > > + ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, pipe);
> > > > if (ret < 0)
> > > > return ret;
> > > >
> > >
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2020-02-11 1:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-30 19:24 [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays Sean Paul
2020-01-31 3:27 ` CK Hu
2020-02-06 6:59 ` evanbenn
2020-02-06 7:04 ` Evan Benn
2020-02-06 7:16 ` CK Hu
2020-02-06 14:01 ` Sean Paul
2020-02-07 4:23 ` [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it Evan Benn
2020-02-07 4:52 ` Evan Benn
2020-02-07 8:34 ` CK Hu
2020-02-10 2:53 ` CK Hu
2020-02-10 14:10 ` Sean Paul
2020-02-11 1:19 ` CK Hu [this message]
2020-02-07 17:28 ` Sean Paul
2020-02-10 2:51 ` [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays CK Hu
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=1581383974.3194.1.camel@mtksdaap41 \
--to=ck.hu@mediatek.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=evanbenn@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=sean@poorly.run \
/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).