diff mbox

[2/2] drm/i915: Allow PCH platforms fall back to BIOS LVDS mode

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

Commit Message

Ville Syrjälä Oct. 9, 2017, 4:19 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

With intel_encoder_current_mode() using the normal state readout code it
actually works on PCH platforms as well. So let's nuke the PCH check from
intel_lvds_init(). I suppose there aren't any machines that actually
need this, but at least we get to eliminate a few lines of code, and one
FIXME.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_lvds.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Chris Wilson Oct. 11, 2017, 6:06 p.m. UTC | #1 
Quoting Ville Syrjala (2017-10-09 17:19:51)
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> With intel_encoder_current_mode() using the normal state readout code it
> actually works on PCH platforms as well. So let's nuke the PCH check from
> intel_lvds_init(). I suppose there aren't any machines that actually
> need this, but at least we get to eliminate a few lines of code, and one
> FIXME.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

I have to admit the FIXME comment confused me utterly. Having read the
function, this should now work given the conversion of
intel_encoder_current_mode() to use the common encoder->get_hw_state()
routine.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Ville Syrjälä Oct. 11, 2017, 6:47 p.m. UTC | #2 
On Wed, Oct 11, 2017 at 07:06:45PM +0100, Chris Wilson wrote:
> Quoting Ville Syrjala (2017-10-09 17:19:51)
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > With intel_encoder_current_mode() using the normal state readout code it
> > actually works on PCH platforms as well. So let's nuke the PCH check from
> > intel_lvds_init(). I suppose there aren't any machines that actually
> > need this, but at least we get to eliminate a few lines of code, and one
> > FIXME.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> I have to admit the FIXME comment confused me utterly.

It does seem to be something not quite English.

> Having read the
> function, this should now work given the conversion of
> intel_encoder_current_mode() to use the common encoder->get_hw_state()
> routine.
> 
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Thanks. Pushed this one as well.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index c5072b951b9c..38572d65e46e 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1111,11 +1111,6 @@  void intel_lvds_init(struct drm_i915_private *dev_priv)
 	 * on.  If so, assume that whatever is currently programmed is the
 	 * correct mode.
 	 */
-
-	/* Ironlake: FIXME if still fail, not try pipe mode now */
-	if (HAS_PCH_SPLIT(dev_priv))
-		goto failed;
-
 	fixed_mode = intel_encoder_current_mode(intel_encoder);
 	if (fixed_mode) {
 		DRM_DEBUG_KMS("using current (BIOS) mode: ");