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

Commit 6fca55b1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Rip out SUPPORTS_EDP 



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.

Cc: Ben Widawsky <benjamin.widawsky@intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 311a2094

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/intel_bios.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

	}