| Message ID | 1396653132-908-1-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Apr 04, 2014 at 04:12:07PM -0700, Jesse Barnes wrote: > Some platforms may not have it, and enumerating it is both confusing and > time consuming due to the hotplug and DDC probing. > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > --- > drivers/gpu/drm/i915/intel_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 3697433..6a6406f 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10678,7 +10678,7 @@ static void intel_setup_outputs(struct drm_device *dev) > > intel_lvds_init(dev); > > - if (!IS_ULT(dev)) > + if (!IS_ULT(dev) && dev_priv->vbt.int_crt_support) > intel_crt_init(dev); > > if (HAS_DDI(dev)) { For the love of god, can we please rename "bits X" in the struct bdb_general_features? That caused me endless pain. It should be "byte 0" Also, I guess there is a problem when the VBT is missing, and we have a dont have a CRT on non-ULT (since the default seems to be true). This however is no worse than the current situation AFAICT. Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
On Thu, May 29, 2014 at 02:47:56PM -0700, Ben Widawsky wrote: > On Fri, Apr 04, 2014 at 04:12:07PM -0700, Jesse Barnes wrote: > > Some platforms may not have it, and enumerating it is both confusing and > > time consuming due to the hotplug and DDC probing. > > > > Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > --- > > drivers/gpu/drm/i915/intel_display.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > > index 3697433..6a6406f 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -10678,7 +10678,7 @@ static void intel_setup_outputs(struct drm_device *dev) > > > > intel_lvds_init(dev); > > > > - if (!IS_ULT(dev)) > > + if (!IS_ULT(dev) && dev_priv->vbt.int_crt_support) > > intel_crt_init(dev); > > > > if (HAS_DDI(dev)) { > > For the love of god, can we please rename "bits X" in the > struct bdb_general_features? That caused me endless pain. It should be > "byte 0" > > Also, I guess there is a problem when the VBT is missing, and we have a > dont have a CRT on non-ULT (since the default seems to be true). This > however is no worse than the current situation AFAICT. > > Reviewed-by: Ben Widawsky <ben@bwidawsk.net> Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3697433..6a6406f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10678,7 +10678,7 @@ static void intel_setup_outputs(struct drm_device *dev) intel_lvds_init(dev); - if (!IS_ULT(dev)) + if (!IS_ULT(dev) && dev_priv->vbt.int_crt_support) intel_crt_init(dev); if (HAS_DDI(dev)) {
Some platforms may not have it, and enumerating it is both confusing and time consuming due to the hotplug and DDC probing. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)