From patchwork Wed Jul 11 14:27:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1183491 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id EAE5DDF25A for ; Wed, 11 Jul 2012 15:45:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B8BB2A0E8C for ; Wed, 11 Jul 2012 08:45:40 -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 F1C739EEA3 for ; Wed, 11 Jul 2012 08:35:22 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hm11so928073wib.12 for ; Wed, 11 Jul 2012 08:35:22 -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=SjAYXyWCg3zu7vrsLr2w82KOcMm8N/NBVlgacuJbbHM=; b=WPUWqKDxrRBwCqG9mKRLKFr4WibLmXlyPvN8tktp0nMfDYdKwDtchE6zX772lCLClb JyDgH/cYqilZBk6VU1pKrxvQsUdFqFMBzMAI/VvoElLN06Sa1j/vj9Jh3mF13oJqxfmA UeMPUXgYOfA34r/X2Ft3Ezp7bKpONBsLFDV/E= 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=SjAYXyWCg3zu7vrsLr2w82KOcMm8N/NBVlgacuJbbHM=; b=ivN8uwxbQP5dEiiBeavHw5FZiIBPEbr9/vNqwDLLQqc96Z2vAd05x2kAVg/dCMDe0Z sMdyR9f+tRcMzsrR43w45scnF0FHyAavdjdJsTFozIKArAgPBhr00vX6O+L5xVVahRMM BTX/Ja6Mmy7i+CAvGgwIqVY/3WEUivCGd4erPKp1hDpZ4FtmMNYIjDsVOX6UZMChio4N oj1n889itRpfaw2Ih7HYasqI5VVJoVeqbrcUZJdl9TosDKfz7nLkYZcNNVk5+DBOqIy8 wszIV27cNFkKqD+fevM2j+f0wPTghf+OXJowPFB5pYDqZKNA8+qkUU8YDWoHDb32RMMx GEyg== Received: by 10.180.78.99 with SMTP id a3mr48036041wix.15.1342020922774; Wed, 11 Jul 2012 08:35:22 -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 bc2sm5777080wib.0.2012.07.11.08.35.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 08:35:22 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 11 Jul 2012 16:27:55 +0200 Message-Id: <1342016944-23395-13-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> References: <1342016944-23395-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnJA56FuxunQxSMsOwrR4Ca7YlZQX6E7zGMppxASmT1u5AptNNrA52Ocl0QmsWxVLtlgAUw Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 12/81] 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 e754cdf..116670e 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1032,7 +1032,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 cc82871..e982900 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