aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_hdmi.c
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-06-24 15:19:25 -0400
committerKeith Packard <keithp@keithp.com>2011-07-07 16:20:46 -0400
commit020f6704b5fbf687534ce53aeedc0364a995ae8a (patch)
treef2a0b90c6b803083833ddf87a86a3d397a9b9291 /drivers/gpu/drm/i915/intel_hdmi.c
parent858fa03527ded333dc5701f546bd5d1b5d7515ad (diff)
drm/i915: use pipe bpp when setting HDMI bpc
The Intel HDMI encoder can support 8bpc or 12bpc. Set the appropriate value based on the pipe bpp when configuring the output. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 1b72aa42c2f9..1ed8e6903915 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -131,6 +131,11 @@ static void intel_hdmi_mode_set(struct drm_encoder *encoder,
131 if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) 131 if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
132 sdvox |= SDVO_HSYNC_ACTIVE_HIGH; 132 sdvox |= SDVO_HSYNC_ACTIVE_HIGH;
133 133
134 if (intel_crtc->bpp > 24)
135 sdvox |= COLOR_FORMAT_12bpc;
136 else
137 sdvox |= COLOR_FORMAT_8bpc;
138
134 /* Required on CPT */ 139 /* Required on CPT */
135 if (intel_hdmi->has_hdmi_sink && HAS_PCH_CPT(dev)) 140 if (intel_hdmi->has_hdmi_sink && HAS_PCH_CPT(dev))
136 sdvox |= HDMI_MODE_SELECT; 141 sdvox |= HDMI_MODE_SELECT;