diff mbox

Revert "drm/i915: Ignore panel type from OpRegion on SKL"

Message ID 20170308143334.21216-1-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjälä March 8, 2017, 2:33 p.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

This reverts commit bb10d4ec3be4b069bfb61c60ca4f708f58f440f1.

Since commit c8ebfad7a063 ("drm/i915: Ignore OpRegion panel type except
on select machines") we ignore the OpRegion panel type except for
specific machines (handled via a DMI match), so having SKL explicitly
excluded from using the OpRegion panel type is redundant. So let's
remove the SKL check.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_opregion.c | 11 -----------
 1 file changed, 11 deletions(-)

Comments

Jani Nikula March 8, 2017, 2:53 p.m. UTC | #1
On Wed, 08 Mar 2017, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> This reverts commit bb10d4ec3be4b069bfb61c60ca4f708f58f440f1.
>
> Since commit c8ebfad7a063 ("drm/i915: Ignore OpRegion panel type except
> on select machines") we ignore the OpRegion panel type except for
> specific machines (handled via a DMI match), so having SKL explicitly
> excluded from using the OpRegion panel type is redundant. So let's
> remove the SKL check.
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_opregion.c | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> index 4a862a358c70..2e870da8927a 100644
> --- a/drivers/gpu/drm/i915/intel_opregion.c
> +++ b/drivers/gpu/drm/i915/intel_opregion.c
> @@ -1061,16 +1061,5 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
>  		return -ENODEV;
>  	}
>  
> -	/*
> -	 * FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us
> -	 * low vswing for eDP, whereas the VBT panel type (2) gives us normal
> -	 * vswing instead. Low vswing results in some display flickers, so
> -	 * let's simply ignore the OpRegion panel type on SKL for now.
> -	 */
> -	if (IS_SKYLAKE(dev_priv)) {
> -		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
> -		return -ENODEV;
> -	}
> -
>  	return ret - 1;
>  }
Ville Syrjälä March 14, 2017, 10:25 a.m. UTC | #2
On Wed, Mar 08, 2017 at 04:53:58PM +0200, Jani Nikula wrote:
> On Wed, 08 Mar 2017, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > This reverts commit bb10d4ec3be4b069bfb61c60ca4f708f58f440f1.
> >
> > Since commit c8ebfad7a063 ("drm/i915: Ignore OpRegion panel type except
> > on select machines") we ignore the OpRegion panel type except for
> > specific machines (handled via a DMI match), so having SKL explicitly
> > excluded from using the OpRegion panel type is redundant. So let's
> > remove the SKL check.
> >
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Thanks. Pushed to dinq.

> 
> > ---
> >  drivers/gpu/drm/i915/intel_opregion.c | 11 -----------
> >  1 file changed, 11 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
> > index 4a862a358c70..2e870da8927a 100644
> > --- a/drivers/gpu/drm/i915/intel_opregion.c
> > +++ b/drivers/gpu/drm/i915/intel_opregion.c
> > @@ -1061,16 +1061,5 @@ intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
> >  		return -ENODEV;
> >  	}
> >  
> > -	/*
> > -	 * FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us
> > -	 * low vswing for eDP, whereas the VBT panel type (2) gives us normal
> > -	 * vswing instead. Low vswing results in some display flickers, so
> > -	 * let's simply ignore the OpRegion panel type on SKL for now.
> > -	 */
> > -	if (IS_SKYLAKE(dev_priv)) {
> > -		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
> > -		return -ENODEV;
> > -	}
> > -
> >  	return ret - 1;
> >  }
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 4a862a358c70..2e870da8927a 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -1061,16 +1061,5 @@  intel_opregion_get_panel_type(struct drm_i915_private *dev_priv)
 		return -ENODEV;
 	}
 
-	/*
-	 * FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us
-	 * low vswing for eDP, whereas the VBT panel type (2) gives us normal
-	 * vswing instead. Low vswing results in some display flickers, so
-	 * let's simply ignore the OpRegion panel type on SKL for now.
-	 */
-	if (IS_SKYLAKE(dev_priv)) {
-		DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
-		return -ENODEV;
-	}
-
 	return ret - 1;
 }