From: deepak.s@intel.com Subject: [PATCH 1/3] drm/i915: Verify address field of PCBR register. Date: Sun, 8 Dec 2013 13:52:35 +0530 Message-ID: <1386490955-20608-1-git-send-email-deepak.s@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C4B2FA7EA for ; Sun, 8 Dec 2013 00:21:47 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: Deepak S List-Id: intel-gfx@lists.freedesktop.org From: Deepak S On VLV the PCBR register has other bits besides the pcbr address field. Verify only address field setup by BIOS to make sure we don't misinterpret the PCBR setup. Signed-off-by: Deepak S --- drivers/gpu/drm/i915/intel_pm.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index e6d98fe..2e1340f 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4036,7 +4036,12 @@ static void valleyview_setup_pctx(struct drm_device *dev) int pctx_size = 24*1024; pcbr = I915_READ(VLV_PCBR); - if (pcbr) { + + /* PCBR Format: Bits 31:12 - Base address of Process Context + * Bits 11:1 - Reserved + * Bit 0 - PCBR Lock + * Check only address field if already setup by BIOS */ + if (pcbr >> 12) { /* BIOS set it up already, grab the pre-alloc'd space */ int pcbr_offset; -- 1.8.4.2