From patchwork Thu Apr 18 08:46:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2457971 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 831C53FD8C for ; Thu, 18 Apr 2013 08:46:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A2744E62DE for ; Thu, 18 Apr 2013 01:46:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com [74.125.83.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 9868EE630A for ; Thu, 18 Apr 2013 01:43:24 -0700 (PDT) Received: by mail-ee0-f45.google.com with SMTP id c50so1120746eek.4 for ; Thu, 18 Apr 2013 01:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Gi/BOxOw6xnYd2vqm1tTd/6k7Ivz/4jya+qjZGlfqX4=; b=fKkmsbjlKLOTb8ijvNjBbNOi/R9hwMYNyw8oLNdYImZmY6K76/qIpbiGb5yqEZTUju 6vjZuRdiDxUBW/KSjc5NiW3x5QleDX1+UA6w5foIVz17j7/NcpobxXAGHcfG/0N/1X++ qnX5F89l+tdxtIzglJpw7B7ojZ2ylzxH9DXwk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=Gi/BOxOw6xnYd2vqm1tTd/6k7Ivz/4jya+qjZGlfqX4=; b=ephjVqXdrKz31Gart66/CRVKzwL+qpdpQDLOFULQm80DXbDsf2nshjrV4NSDmhKuyu wUJwwhem1q7FFBAHw8ZJG2MP5/pfHFsBIlzJfbFQu4dlgxUikF4DW/ow6qpVGLG4s7XV H8hVKTSjRcLSJH3wVz75Hk3eh4/THp43zCuyh9HpnNpPolFbLI+ldwnXGjcGvYB33cyr 3ktduXdUoM6SNlCFOm7M1Se+VYznZ61I1y2Ry1ZzS4ycxdeZyWrQQXe2o9eASGXqkJyP zMeHM4z+Z+E9qmj9kDnx62EyfagKZ72x/qGOR5x9vAvj9nrFNNU1HYZsqAUNF8Tsigtg n7ng== X-Received: by 10.15.83.73 with SMTP id b49mr27817433eez.25.1366274603563; Thu, 18 Apr 2013 01:43:23 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id u44sm14093490eel.7.2013.04.18.01.43.21 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 01:43:22 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 18 Apr 2013 10:46:11 +0200 Message-Id: <1366274775-10733-4-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366274775-10733-1-git-send-email-daniel.vetter@ffwll.ch> References: <20130418081740.GE6169@phenom.ffwll.local> <1366274775-10733-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlLbgWShhNUlu9ccXTdQYh1iVfHWLeYHPnaE2YdoZMestNOgd5U328nmCb1S53tqkRRT/3P Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 4/8] Fixup bpc vs. bpp confusion X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org -> Separate patch --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 86c4b6d..95b7f09 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4199,7 +4199,7 @@ 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 > 30) { pipe_config->pipe_bpp = 10*3; /* 12bpc is gen5+ */ } else if (INTEL_INFO(dev)->gen <= 4 && pipe_config->pipe_bpp > 8) { /* only a 8bpc pipe, with 6bpc dither through the panel fitter