From b50e6137337392ba724436eb2aea057d58d8d304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 24 Jan 2013 15:29:47 +0200 Subject: [PATCH] --- yaml --- r: 358041 b: refs/heads/master c: 4b0599854b5669fbbb6c8b9a9463b550718bda11 h: refs/heads/master i: 358039: 4427399287a237ad220a0875102929743441ba05 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_reg.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d146783d38d4..9dd7cbb68fac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e8e7eb70388c90a2d0ea2ccf951b11c3ec24b3e +refs/heads/master: 4b0599854b5669fbbb6c8b9a9463b550718bda11 diff --git a/trunk/drivers/gpu/drm/i915/i915_reg.h b/trunk/drivers/gpu/drm/i915/i915_reg.h index 2982a3baf0e6..693baf90db91 100644 --- a/trunk/drivers/gpu/drm/i915/i915_reg.h +++ b/trunk/drivers/gpu/drm/i915/i915_reg.h @@ -1166,8 +1166,8 @@ * Palette regs */ -#define _PALETTE_A 0x0a000 -#define _PALETTE_B 0x0a800 +#define _PALETTE_A (dev_priv->info->display_mmio_offset + 0xa000) +#define _PALETTE_B (dev_priv->info->display_mmio_offset + 0xa800) #define PALETTE(pipe) _PIPE(pipe, _PALETTE_A, _PALETTE_B) /* MCH MMIO space */