Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b4e042 authored by Jesse Barnes's avatar Jesse Barnes Committed by Jani Nikula
Browse files

drm/i915: only apply crt_present check on VLV 



Apparently we can't trust this field on other platforms and need to find
some other way.

This fixes a regression introduced in
commit 27da3bdf
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Fri Apr 4 16:12:07 2014 -0700

    drm/i915: use VBT to determine whether to enumerate the VGA port

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 33c3b0d1

drivers/gpu/drm/i915/intel_display.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -11097,6 +11097,22 @@ const char *intel_output_name(int output) 
	return names[output];

	return names[output];

}

}





static bool intel_crt_present(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (IS_ULT(dev))

		return false;



	if (IS_CHERRYVIEW(dev))

		return false;



	if (IS_VALLEYVIEW(dev) && !dev_priv->vbt.int_crt_support)

		return false;



	return true;

}



static void intel_setup_outputs(struct drm_device *dev)

static void intel_setup_outputs(struct drm_device *dev)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11105,7 +11121,7 @@ static void intel_setup_outputs(struct drm_device *dev) 




	intel_lvds_init(dev);

	intel_lvds_init(dev);





	if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev) && dev_priv->vbt.int_crt_support)

	if (intel_crt_present(dev))

		intel_crt_init(dev);

		intel_crt_init(dev);





	if (HAS_DDI(dev)) {

	if (HAS_DDI(dev)) {