aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-01-28 16:45:52 -0800
committerEric Anholt <eric@anholt.net>2010-02-26 13:23:20 -0800
commitc619eed4b2ee1b2bde3e02464eb81632a08bb976 (patch)
treeb017349c3626233d872b185efb38135f91b1abd5 /drivers/gpu/drm/i915/intel_hdmi.c
parentfaa7bde6cb1227d13d011042f17bda0869c3bd1e (diff)
downloadkernel_samsung_smdk4412-c619eed4b2ee1b2bde3e02464eb81632a08bb976.zip
kernel_samsung_smdk4412-c619eed4b2ee1b2bde3e02464eb81632a08bb976.tar.gz
kernel_samsung_smdk4412-c619eed4b2ee1b2bde3e02464eb81632a08bb976.tar.bz2
drm/i915: More s/IS_IRONLAKE/HAS_PCH_SPLIT for Sandybridge.
I think this is pretty much correct. Not really tested. Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 0e268de..a30f8bf 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -82,7 +82,7 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
/* HW workaround, need to toggle enable bit off and on for 12bpc, but
* we do this anyway which shows more stable in testing.
*/
- if (IS_IRONLAKE(dev)) {
+ if (HAS_PCH_SPLIT(dev)) {
I915_WRITE(hdmi_priv->sdvox_reg, temp & ~SDVO_ENABLE);
POSTING_READ(hdmi_priv->sdvox_reg);
}
@@ -99,7 +99,7 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
/* HW workaround, need to write this twice for issue that may result
* in first write getting masked.
*/
- if (IS_IRONLAKE(dev)) {
+ if (HAS_PCH_SPLIT(dev)) {
I915_WRITE(hdmi_priv->sdvox_reg, temp);
POSTING_READ(hdmi_priv->sdvox_reg);
}