diff mbox

drm/i915: Continuation of future readiness series

Message ID 1407497954-25230-1-git-send-email-sonika.jindal@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

sonika.jindal@intel.com Aug. 8, 2014, 11:39 a.m. UTC 
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(-)

Comments

Ville Syrjälä Aug. 8, 2014, 11:55 a.m. UTC | #1 
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.

>  	} 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
Daniel Vetter Aug. 8, 2014, 2:15 p.m. UTC | #2 
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
diff mbox

Patch

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;
 	} else if (IS_G4X(dev)) {
 		dev_priv->display.write_eld = g4x_write_eld;
 	} else if (IS_VALLEYVIEW(dev)) {