[linux-yocto] [PATCH 2/2] Fix merge errors for i915 to compile

[Jukka Laitinen]

Remove code, which was originally removed in
  cbadb9d9de33 "Revert "drm/i915: Check live status before reading edid"
but crept back later in commit
  1c8841ccca2e "Merge branch 'standard/base' into standard/intel/base"

Signed-off-by: Jukka Laitinen <jukka.laitinen at intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h  | 3 ---
 drivers/gpu/drm/i915/intel_hdmi.c | 7 +++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_drv.h
b/drivers/gpu/drm/i915/intel_drv.h
index 6f69e14..ca6d51d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1315,9 +1315,6 @@ void intel_edp_drrs_disable(struct intel_dp
*intel_dp);
 void intel_edp_drrs_invalidate(struct drm_device *dev,
 		unsigned frontbuffer_bits);
 void intel_edp_drrs_flush(struct drm_device *dev, unsigned
frontbuffer_bits);
-bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
-					 struct intel_digital_port *port);
-
 void
 intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,
 				       uint8_t dp_train_pat);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 9c545c0..4a9400c 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1363,10 +1363,9 @@ intel_hdmi_set_edid(struct drm_connector *connector)
  	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 -	if (force)
-		edid = drm_get_edid(connector,
-				    intel_gmbus_get_adapter(dev_priv,
-				    intel_hdmi->ddc_bus));
+	edid = drm_get_edid(connector,
+			    intel_gmbus_get_adapter(dev_priv,
+						    intel_hdmi->ddc_bus));
  	intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
 -- 2.7.4