From 89e216c001a1abc856c1041d4c5b363086bf8088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 24 Jan 2013 15:29:51 +0200 Subject: [PATCH] --- yaml --- r: 358043 b: refs/heads/master c: 07ec7ec55baec26a3b77d310b0399d2e20f0f67b h: refs/heads/master i: 358041: b50e6137337392ba724436eb2aea057d58d8d304 358039: 4427399287a237ad220a0875102929743441ba05 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3694dcb0645b..1bfadd5a1b6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d88b2270862087544dd5234d95976db51d8ee5bf +refs/heads/master: 07ec7ec55baec26a3b77d310b0399d2e20f0f67b diff --git a/trunk/drivers/gpu/drm/i915/i915_reg.h b/trunk/drivers/gpu/drm/i915/i915_reg.h index 86c4ffa3c050..06a37a09245e 100644 --- a/trunk/drivers/gpu/drm/i915/i915_reg.h +++ b/trunk/drivers/gpu/drm/i915/i915_reg.h @@ -554,7 +554,7 @@ #define IIR 0x020a4 #define IMR 0x020a8 #define ISR 0x020ac -#define VLV_GUNIT_CLOCK_GATE 0x182060 +#define VLV_GUNIT_CLOCK_GATE (VLV_DISPLAY_BASE + 0x2060) #define GCFG_DIS (1<<8) #define VLV_IIR_RW 0x182084 #define VLV_IER 0x1820a0