drm/i915: only apply crt_present check on VLV
Subsystems (2)
PATCH 1/1 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.
--- drivers/gpu/drm/i915/intel_display.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +17 -1
@@ -11807,6 +11807,22 @@ const char *intel_output_name(int 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) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -11815,7 +11831,7 @@ static void intel_setup_outputs(struct drm_device *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);if (HAS_DDI (dev)) {
Signature · 1 line
1.9.1
Quoted 4 lines · Jesse Barnes
Apparently we can't trust this field on other platforms and need to find some other way.
Signed-off-by Jesse Barnes <[email protected]>
Since it's a regression it might be a good idea to note the offender:
commit 27da3bdfcf7f5233cdfe4563f53edf1ecab7cea0
Author: Jesse Barnes <[email protected]> Date: Fri Apr 4 16:12:07 2014 -0700
drm/i915: use VBT to determine whether to enumerate the VGA port
Quoted 47 lines
--- drivers/gpu/drm/i915/intel_display.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +17
-1@@ -11807,6 +11807,22 @@ const char *intel_output_name(int 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) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -11815,7 +11831,7 @@ static void intel_setup_outputs(struct drm_device *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);if (HAS_DDI (dev)) {Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 2 lines
Ville Syrjälä Intel OTC
Quoted 8 lines · Ville Syrjälä
Quoted 4 lines · Jesse Barnes
Apparently we can't trust this field on other platforms and need to find some other way.
Signed-off-by Jesse Barnes <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Quoted 8 lines
Since it's a regression it might be a good idea to note the offender:
commit
27da3bdfcf7f5233cdfe4563f53edf1ecab7cea0Author: Jesse Barnes <[email protected]> Date: Fri Apr 4 16:12:07 2014 -0700drm/i915: use VBT to determine whether to enumerate the VGA port
Pushed to -fixes with an amended commit message, thanks for the patch and review.
BR,
Jani.
Quoted 56 lines
Quoted 48 lines
--- drivers/gpu/drm/i915/intel_display.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +17
-1@@ -11807,6 +11807,22 @@ const char *intel_output_name(int 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) {struct drm_i915_private *dev_priv = dev->dev_private;@@ -11815,7 +11831,7 @@ static void intel_setup_outputs(struct drm_device *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);if (HAS_DDI (dev)) {Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx