From b68b741198814cc2384f346e597dd0cb2f44a807 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Wed, 17 Apr 2013 20:01:39 +0200 Subject: [PATCH] --- yaml --- r: 371493 b: refs/heads/master c: bd080ee57c2173cefdcadc39c7863a76c249d049 h: refs/heads/master i: 371491: b72b887695ee4b8671758cde6c83caa3d7c7caeb v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 88144ae3d940..c8351b56784a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b117c8f2815bc4dd36b0b2c4b6490ad7d10b758 +refs/heads/master: bd080ee57c2173cefdcadc39c7863a76c249d049 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index c5bf283c27b3..6e423e04c35e 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -4003,9 +4003,9 @@ static bool intel_crtc_compute_config(struct drm_crtc *crtc, adjusted_mode->hsync_start == adjusted_mode->hdisplay) return false; - if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) && pipe_config->pipe_bpp > 10) { + if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) && pipe_config->pipe_bpp > 10*3) { pipe_config->pipe_bpp = 10*3; /* 12bpc is gen5+ */ - } else if (INTEL_INFO(dev)->gen <= 4 && pipe_config->pipe_bpp > 8) { + } else if (INTEL_INFO(dev)->gen <= 4 && pipe_config->pipe_bpp > 8*3) { /* only a 8bpc pipe, with 6bpc dither through the panel fitter * for lvds. */ pipe_config->pipe_bpp = 8*3;