On Wed, 25 Jun 2014, Ville Syrjälä <[email protected]> wrote:
> On Wed, Jun 25, 2014 at 08:24:29AM -0700, Jesse Barnes wrote:
>> 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]>
>
> 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
Pushed to -fixes with an amended commit message, thanks for the patch
and review.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/intel_display.c | 18 +++++++++++++++++-
>> 1 file changed, 17 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c
>> b/drivers/gpu/drm/i915/intel_display.c
>> index 065984d..9f80de5 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -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)) {
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> [email protected]
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
