From patchwork Tue Jan 5 14:48:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 71039 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o05Eo9qN019753 for ; Tue, 5 Jan 2010 14:50:09 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBEA79ED18; Tue, 5 Jan 2010 06:50:09 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B22E9ECE0 for ; Tue, 5 Jan 2010 06:50:05 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 05 Jan 2010 06:49:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,505,1257148800"; d="scan'208";a="528607230" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.13.10]) by fmsmga002.fm.intel.com with ESMTP; 05 Jan 2010 06:49:27 -0800 From: yakui.zhao@intel.com To: eric@anholt.net Date: Tue, 5 Jan 2010 22:48:05 +0800 Message-Id: <1262702885-7398-3-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1262702885-7398-2-git-send-email-yakui.zhao@intel.com> References: <1262702885-7398-1-git-send-email-yakui.zhao@intel.com> <1262702885-7398-2-git-send-email-yakui.zhao@intel.com> Cc: intel-gfx@lists.freedesktop.org, stable@kernel.org Subject: [Intel-gfx] [PATCH 3/3] drm/i915: Select the correct BPC for LVDS on Ironlake X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.9 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0b68327..12a87eb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2985,6 +2985,18 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, /* determine panel color depth */ temp = I915_READ(pipeconf_reg); + temp &= ~PIPE_BPC_MASK; + if (is_lvds) { + int lvds_reg = I915_READ(PCH_LVDS); + /* the BPC will be 6 if it is 18-bit LVDS panel */ + if ((lvds_reg & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP) + temp |= PIPE_8BPC; + else + temp |= PIPE_6BPC; + } else + temp |= PIPE_8BPC; + I915_WRITE(pipeconf_reg, temp); + I915_READ(pipeconf_reg); switch (temp & PIPE_BPC_MASK) { case PIPE_8BPC: