2013/9/21 Daniel Vetter <[email protected]>: > It only controls the setting of the vbt.edp_support variable, which in > turn only controls one debug output plus can also force-disable the > lvds output. > > Since the value only restricted this logic to mobile ilk there's the > slight risk that this will break lvds on desktop ilk or on snb/ivb > platforms. But with the vbt it's better when we know what's going on > here, so let's rip it out and see what happens.
I think this is a little bit too risky, but the patch does what it says in the box and also mentions the risk... I was going to give a Reviewed-by tag and leave the merge-or-not-merge question to the maintainer, but I noticed the patch is already even merged (by accident?). Are we aware of any real-world machines with eDP + LVDS? > > Cc: Ben Widawsky <[email protected]> > Cc: Paulo Zanoni <[email protected]> > Signed-off-by: Daniel Vetter <[email protected]> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 - > drivers/gpu/drm/i915/intel_bios.c | 6 ++---- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index b1485a0..07de53c 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1672,7 +1672,6 @@ struct drm_i915_file_private { > #define SUPPORTS_DIGITAL_OUTPUTS(dev) (!IS_GEN2(dev) && !IS_PINEVIEW(dev)) > #define SUPPORTS_INTEGRATED_HDMI(dev) (IS_G4X(dev) || IS_GEN5(dev)) > #define SUPPORTS_INTEGRATED_DP(dev) (IS_G4X(dev) || IS_GEN5(dev)) > -#define SUPPORTS_EDP(dev) (IS_IRONLAKE_M(dev)) > #define SUPPORTS_TV(dev) (INTEL_INFO(dev)->supports_tv) > #define I915_HAS_HOTPLUG(dev) (INTEL_INFO(dev)->has_hotplug) > > diff --git a/drivers/gpu/drm/i915/intel_bios.c > b/drivers/gpu/drm/i915/intel_bios.c > index 0492b6f..e29bcae 100644 > --- a/drivers/gpu/drm/i915/intel_bios.c > +++ b/drivers/gpu/drm/i915/intel_bios.c > @@ -477,15 +477,13 @@ static void > parse_driver_features(struct drm_i915_private *dev_priv, > struct bdb_header *bdb) > { > - struct drm_device *dev = dev_priv->dev; > struct bdb_driver_features *driver; > > driver = find_section(bdb, BDB_DRIVER_FEATURES); > if (!driver) > return; > > - if (SUPPORTS_EDP(dev) && > - driver->lvds_config == BDB_DRIVER_FEATURE_EDP) > + if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP) > dev_priv->vbt.edp_support = 1; > > if (driver->dual_frequency) > @@ -501,7 +499,7 @@ parse_edp(struct drm_i915_private *dev_priv, struct > bdb_header *bdb) > > edp = find_section(bdb, BDB_EDP); > if (!edp) { > - if (SUPPORTS_EDP(dev_priv->dev) && dev_priv->vbt.edp_support) > + if (dev_priv->vbt.edp_support) > DRM_DEBUG_KMS("No eDP BDB found but eDP panel > supported.\n"); > return; > } > -- > 1.8.4.rc3 > > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
