From: Sonika Jindal <sonika.jindal@intel.com>
Date: Tue, 22 Jul 2014 05:43:46 +0000 (+0530)
Subject: drm/i915: Replace HAS_PCH_SPLIT which incorrectly lets some platforms in
X-Git-Tag: v3.17-rc1~82^2~20^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b98856a86b0a44ef9d0ab61f6855baf6d941fe6f;p=karo-tx-linux.git

drm/i915: Replace HAS_PCH_SPLIT which incorrectly lets some platforms in

v2: Adding IS_G4X instead of gen < 5 as suggested by Daniel

Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index c6601c10c80c..d189e95fe635 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -1562,7 +1562,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
 	if (IS_VALLEYVIEW(dev)) {
 		intel_hdmi->write_infoframe = vlv_write_infoframe;
 		intel_hdmi->set_infoframes = vlv_set_infoframes;
-	} else if (!HAS_PCH_SPLIT(dev)) {
+	} else if (IS_G4X(dev)) {
 		intel_hdmi->write_infoframe = g4x_write_infoframe;
 		intel_hdmi->set_infoframes = g4x_set_infoframes;
 	} else if (HAS_DDI(dev)) {