Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Continuation of future readiness series
Date: Fri, 8 Aug 2014 16:15:21 +0200	[thread overview]
Message-ID: <20140808141521.GV8727@phenom.ffwll.local> (raw)
In-Reply-To: <20140808115510.GE4193@intel.com>

On Fri, Aug 08, 2014 at 02:55:10PM +0300, Ville Syrjälä wrote:
> On Fri, Aug 08, 2014 at 05:09:14PM +0530, sonika.jindal@intel.com wrote:
> > From: Sonika Jindal <sonika.jindal@intel.com>
> > 
> > Removing the check for HAS_PCH_SPLIT, it looks redundant here. Anyways all the
> > platforms are checked separately.
> > 
> > Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c |   40 ++++++++++++++++------------------
> >  1 file changed, 19 insertions(+), 21 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 89e0ac5..5a3e239 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -12421,27 +12421,25 @@ static void intel_init_display(struct drm_device *dev)
> >  		dev_priv->display.get_display_clock_speed =
> >  			i830_get_display_clock_speed;
> >  
> > -	if (HAS_PCH_SPLIT(dev)) {
> > -		if (IS_GEN5(dev)) {
> > -			dev_priv->display.fdi_link_train = ironlake_fdi_link_train;
> > -			dev_priv->display.write_eld = ironlake_write_eld;
> > -		} else if (IS_GEN6(dev)) {
> > -			dev_priv->display.fdi_link_train = gen6_fdi_link_train;
> > -			dev_priv->display.write_eld = ironlake_write_eld;
> > -			dev_priv->display.modeset_global_resources =
> > -				snb_modeset_global_resources;
> > -		} else if (IS_IVYBRIDGE(dev)) {
> > -			/* FIXME: detect B0+ stepping and use auto training */
> > -			dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train;
> > -			dev_priv->display.write_eld = ironlake_write_eld;
> > -			dev_priv->display.modeset_global_resources =
> > -				ivb_modeset_global_resources;
> > -		} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
> > -			dev_priv->display.fdi_link_train = hsw_fdi_link_train;
> > -			dev_priv->display.write_eld = haswell_write_eld;
> > -			dev_priv->display.modeset_global_resources =
> > -				haswell_modeset_global_resources;
> > -		}
> > +	if (IS_GEN5(dev)) {
> > +		dev_priv->display.fdi_link_train = ironlake_fdi_link_train;
> > +		dev_priv->display.write_eld = ironlake_write_eld;
> > +	} else if (IS_GEN6(dev)) {
> > +		dev_priv->display.fdi_link_train = gen6_fdi_link_train;
> > +		dev_priv->display.write_eld = ironlake_write_eld;
> > +		dev_priv->display.modeset_global_resources =
> > +			snb_modeset_global_resources;
> > +	} else if (IS_IVYBRIDGE(dev)) {
> > +		/* FIXME: detect B0+ stepping and use auto training */
> > +		dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train;
> > +		dev_priv->display.write_eld = ironlake_write_eld;
> > +		dev_priv->display.modeset_global_resources =
> > +			ivb_modeset_global_resources;
> > +	} else if (IS_HASWELL(dev) || IS_GEN8(dev)) {
> > +		dev_priv->display.fdi_link_train = hsw_fdi_link_train;
> > +		dev_priv->display.write_eld = haswell_write_eld;
> > +		dev_priv->display.modeset_global_resources =
> > +			haswell_modeset_global_resources;
> 
> Maybe shuffle these around a bit while you're at it so that the checks
> would be roughly in gen order.

Agreed, that might be useful while we touch the code. There's no
preference over newer-first or older-first ordering, so you can pick what
you like. G4X = gen4.5, so oldest platform that supports DP.
-Daniel

> 
> >  	} else if (IS_G4X(dev)) {
> >  		dev_priv->display.write_eld = g4x_write_eld;
> >  	} else if (IS_VALLEYVIEW(dev)) {
> > -- 
> > 1.7.10.4
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

  reply	other threads:[~2014-08-08 14:15 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-08 11:39 [PATCH] drm/i915: Continuation of future readiness series sonika.jindal
2014-08-08 11:55 ` Ville Syrjälä
2014-08-08 14:15   ` Daniel Vetter [this message]
2014-08-11  3:36     ` [PATCH v2] " sonika.jindal
2014-08-11  9:27       ` Daniel Vetter

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=20140808141521.GV8727@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox