From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com>
To: "Vivi, Rodrigo" <rodrigo.vivi@intel.com>
Cc: "intel-gfx@lists.freedesktop.org" <intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 1/2] drm/i915: Clean up skl_plane_has_planar()
Date: Fri, 24 Aug 2018 23:38:26 +0000 [thread overview]
Message-ID: <3e6d05c85749230197f59e7fd7c5bf93e91feaf4.camel@intel.com> (raw)
In-Reply-To: <20180824231609.GH6432@intel.com>
On Fri, 2018-08-24 at 16:16 -0700, Rodrigo Vivi wrote:
> On Fri, Aug 24, 2018 at 10:27:09PM +0000, Pandiyan, Dhinakaran wrote:
> >
> >
> > On Fri, 2018-08-24 at 15:15 -0700, Rodrigo Vivi wrote:
> > > On Fri, Aug 24, 2018 at 01:38:55PM -0700, Dhinakaran Pandiyan
> > > wrote:
> > > > skl_plane_has_planar is hard to read, simplify the logic by
> > > > checking for
> > > > support in the order of platform, pipe and plane.
> > > >
> > > > No change in functionality intended.
> > > >
> > > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.c
> > > > om>
> > > > ---
> > > > drivers/gpu/drm/i915/intel_display.c | 27 +++++++++-----------
> > > > ----
> > > > ---
> > > > 1 file changed, 9 insertions(+), 18 deletions(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/intel_display.c
> > > > b/drivers/gpu/drm/i915/intel_display.c
> > > > index 30fdfd1a3037..7e18bd8b21b8 100644
> > > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > > @@ -13622,24 +13622,15 @@ static bool skl_plane_has_fbc(struct
> > > > drm_i915_private *dev_priv,
> > > > bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
> > > > enum pipe pipe, enum plane_id
> > > > plane_id)
> > > > {
> > > > - if (plane_id == PLANE_PRIMARY) {
> > > > - if (IS_SKYLAKE(dev_priv) ||
> > > > IS_BROXTON(dev_priv))
> > > > - return false;
> > > > - else if ((INTEL_GEN(dev_priv) == 9 && pipe ==
> > > > PIPE_C) &&
> > > > - !IS_GEMINILAKE(dev_priv))
> > > > - return false;
> > > > - } else if (plane_id >= PLANE_SPRITE0) {
> > > > - if (plane_id == PLANE_CURSOR)
> > > > - return false;
> > > > - if (IS_GEMINILAKE(dev_priv) ||
> > > > INTEL_GEN(dev_priv)
> > > > == 10) {
> > > > - if (plane_id != PLANE_SPRITE0)
> > > > - return false;
> > > > - } else {
> > > > - if (plane_id != PLANE_SPRITE0 || pipe
> > > > ==
> > > > PIPE_C ||
> > > > - IS_SKYLAKE(dev_priv) ||
> > > > IS_BROXTON(dev_priv))
> > > > - return false;
> >
> > ^ Here it does, or am I not seeing the paranthesis correctly.
>
> dam... it is so bad that I got confused when drawing a
> table here...
>
> nip: The name of the function seems wrong since "skl_" always
> return false....
Looks like the first versions of the patch implementing nv12 did
include SKL, not clear what happened later.
> but I don't have a better suggestion ... maybe just "intel_"
> and can be in a follow up patch...
>
> so,
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Thanks!
-DK
>
> >
> > > > - }
> > > > - }
> > > > + if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> > > > + return false;
> > >
> > > The current code is indeed ugly, but I'm afraid it doesn't always
> > > return
> > > false for these platforms.
> > >
> > > for instance plane_id = PLANE_SPRITE0
> > >
> > > > +
> > > > + if (INTEL_GEN(dev_priv) == 9 &&
> > > > !IS_GEMINILAKE(dev_priv)
> > > > && pipe == PIPE_C)
> > > > + return false;
> > > > +
> > > > + if (plane_id == PLANE_CURSOR || plane_id !=
> > > > PLANE_SPRITE0)
> > > > + return false;
> > > > +
> > > > return true;
> > > > }
> > > >
> > > > --
> > > > 2.17.1
> > > >
> > > > _______________________________________________
> > > > Intel-gfx mailing list
> > > > Intel-gfx@lists.freedesktop.org
> > > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-08-24 23:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-24 20:38 [PATCH 1/2] drm/i915: Clean up skl_plane_has_planar() Dhinakaran Pandiyan
2018-08-24 20:38 ` [PATCH 2/2] drm/i915: Do not advertize support for NV12 on ICL yet Dhinakaran Pandiyan
2018-08-27 11:56 ` Ville Syrjälä
2018-08-24 21:02 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Clean up skl_plane_has_planar() Patchwork
2018-08-24 21:56 ` ✓ Fi.CI.IGT: " Patchwork
2018-08-24 22:15 ` [PATCH 1/2] " Rodrigo Vivi
2018-08-24 22:27 ` Pandiyan, Dhinakaran
2018-08-24 23:16 ` Rodrigo Vivi
2018-08-24 23:38 ` Pandiyan, Dhinakaran [this message]
2018-08-27 11:56 ` Ville Syrjälä
2018-08-27 17:53 ` Pandiyan, Dhinakaran
2018-08-27 22:56 ` [PATCH v2] " Dhinakaran Pandiyan
2018-08-28 12:45 ` Ville Syrjälä
2018-08-28 19:45 ` Dhinakaran Pandiyan
2018-08-28 0:04 ` ✓ Fi.CI.BAT: success for series starting with [v2] drm/i915: Clean up skl_plane_has_planar() (rev2) Patchwork
2018-08-28 1:51 ` ✓ Fi.CI.IGT: " Patchwork
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=3e6d05c85749230197f59e7fd7c5bf93e91feaf4.camel@intel.com \
--to=dhinakaran.pandiyan@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/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 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.