| From dec37ba36f6a4b611381a5b575a19565b48dfd1f Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Fri, 19 Apr 2013 11:24:34 +0200 |
| Subject: drm/i915: Disable high-bpc on pre-1.4 EDID screens |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Prevents black screens when using 30bpp framebuffers on my |
| HDMI screens here. The DP input on the same screen though reports a |
| 1.4 EDID with the correct 8bpc limit set. |
| |
| v2: Actually check for the right thing! |
| |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 996a2239f93b03c5972923f04b097f65565c5bed) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index df0d00df3532..f8d54036bcf3 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -7710,6 +7710,13 @@ pipe_config_set_bpp(struct drm_crtc *crtc, |
| bpp, connector->display_info.bpc*3); |
| pipe_config->pipe_bpp = connector->display_info.bpc*3; |
| } |
| + |
| + /* Clamp bpp to 8 on screens without EDID 1.4 */ |
| + if (connector->display_info.bpc == 0 && bpp > 24) { |
| + DRM_DEBUG_KMS("clamping display bpp (was %d) to default limit of 24\n", |
| + bpp); |
| + pipe_config->pipe_bpp = 24; |
| + } |
| } |
| |
| return bpp; |
| -- |
| 1.8.5.rc3 |
| |
