From patchwork Tue Jul 3 09:28:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1150221 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 157DB3FE4F for ; Tue, 3 Jul 2012 10:45:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DBA07A021F for ; Tue, 3 Jul 2012 03:45:09 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 736329F613 for ; Tue, 3 Jul 2012 03:34:41 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hm11so2984141wib.12 for ; Tue, 03 Jul 2012 03:34:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=fvd8o5mEZTO7VgXE0Xk3eeLbT5aVkLvX0xhhkFWkkDo=; b=EH2N1PCbuq/aaBf7M51hUhleM7geHCrZl8WpyBJRDO0TGV4S9LrIFqh6Q5JtKMhYXT IiN2NGz++vBNqoHED58MCkWH0XMal7vNn+RB0jxcKXn3fsW2n283e1tfePD/G48L2GOE qfa48JkEpoQ+FgyE5RxhndsTfdChY4u85V0Pw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=fvd8o5mEZTO7VgXE0Xk3eeLbT5aVkLvX0xhhkFWkkDo=; b=LFXvwwu6SYUoTweUVPQgDeX9NLB2BxZEqnDfReRWZjFjJvUnGPB6DYPo66/8PThlW7 nm2v1cD4MYHhL8CyoqYdDningxHmQ41IwBgxk22irAes7RMi6mUMQ8NKlHvVzgk+YWXZ WVh8rJ50XQLUOtrH3apuIvFEKHkXHYKZLHwp9i6IyPkDEuSrhzHnSnnisaKZJmk6eRlk HCN6aDuRkTzuB4pLcRvpUofyoTnIRk1/4Ke95pqcJmbjS3Vf3+CWoR166MZBYllLKYmA SLz/ECYqt22ulm78aLAGRNUCgSFzAVixgJC8+PcX3O/n3VQ2t+KyooaiM32HC0MmgFW4 BkPQ== Received: by 10.216.143.105 with SMTP id k83mr3434178wej.99.1341311681547; Tue, 03 Jul 2012 03:34:41 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id e9sm14845138wiw.10.2012.07.03.03.34.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 03:34:40 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 3 Jul 2012 11:28:05 +0200 Message-Id: <1341307715-3886-14-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> References: <1341307715-3886-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQmQBhmhkgz0vI6ZII7FDoPZWDbAoNRdytqsp321ymww1YsOshAmQVEiGS9dQxbne795JCUu Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 13/43] drm/i915: create VLV_DSIPLAY_BASE #define 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 Will be used more in the next patch. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 79be879..57381eb 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1169,7 +1169,7 @@ static bool IS_DISPLAYREG(u32 reg) * This should make it easier to transition modules over to the * new register block scheme, since we can do it incrementally. */ - if (reg >= 0x180000) + if (reg >= VLV_DISPLAY_BASE) return false; if (reg >= RENDER_RING_BASE && diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index ac65e96..524c70e 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -528,6 +528,8 @@ #define GFX_PSMI_GRANULARITY (1<<10) #define GFX_PPGTT_ENABLE (1<<9) +#define VLV_DISPLAY_BASE 0x180000 + #define SCPD0 0x0209c /* 915+ only */ #define IER 0x020a0 #define IIR 0x020a4