diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-01-24 08:29:46 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-24 17:13:13 -0500 |
commit | 4e8e7eb70388c90a2d0ea2ccf951b11c3ec24b3e (patch) | |
tree | e30e456d03ce4b8ad85e3ed4980b425efd7d3e62 /drivers/gpu/drm/i915/i915_reg.h | |
parent | 67d62c57465e5da7647cb13ef567b80f6deb9a3c (diff) |
drm/i915: Pipe timing registers need an offset on VLV
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 4807db614c48..2982a3baf0e6 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -1532,26 +1532,26 @@ | |||
1532 | */ | 1532 | */ |
1533 | 1533 | ||
1534 | /* Pipe A timing regs */ | 1534 | /* Pipe A timing regs */ |
1535 | #define _HTOTAL_A 0x60000 | 1535 | #define _HTOTAL_A (dev_priv->info->display_mmio_offset + 0x60000) |
1536 | #define _HBLANK_A 0x60004 | 1536 | #define _HBLANK_A (dev_priv->info->display_mmio_offset + 0x60004) |
1537 | #define _HSYNC_A 0x60008 | 1537 | #define _HSYNC_A (dev_priv->info->display_mmio_offset + 0x60008) |
1538 | #define _VTOTAL_A 0x6000c | 1538 | #define _VTOTAL_A (dev_priv->info->display_mmio_offset + 0x6000c) |
1539 | #define _VBLANK_A 0x60010 | 1539 | #define _VBLANK_A (dev_priv->info->display_mmio_offset + 0x60010) |
1540 | #define _VSYNC_A 0x60014 | 1540 | #define _VSYNC_A (dev_priv->info->display_mmio_offset + 0x60014) |
1541 | #define _PIPEASRC 0x6001c | 1541 | #define _PIPEASRC (dev_priv->info->display_mmio_offset + 0x6001c) |
1542 | #define _BCLRPAT_A 0x60020 | 1542 | #define _BCLRPAT_A (dev_priv->info->display_mmio_offset + 0x60020) |
1543 | #define _VSYNCSHIFT_A 0x60028 | 1543 | #define _VSYNCSHIFT_A (dev_priv->info->display_mmio_offset + 0x60028) |
1544 | 1544 | ||
1545 | /* Pipe B timing regs */ | 1545 | /* Pipe B timing regs */ |
1546 | #define _HTOTAL_B 0x61000 | 1546 | #define _HTOTAL_B (dev_priv->info->display_mmio_offset + 0x61000) |
1547 | #define _HBLANK_B 0x61004 | 1547 | #define _HBLANK_B (dev_priv->info->display_mmio_offset + 0x61004) |
1548 | #define _HSYNC_B 0x61008 | 1548 | #define _HSYNC_B (dev_priv->info->display_mmio_offset + 0x61008) |
1549 | #define _VTOTAL_B 0x6100c | 1549 | #define _VTOTAL_B (dev_priv->info->display_mmio_offset + 0x6100c) |
1550 | #define _VBLANK_B 0x61010 | 1550 | #define _VBLANK_B (dev_priv->info->display_mmio_offset + 0x61010) |
1551 | #define _VSYNC_B 0x61014 | 1551 | #define _VSYNC_B (dev_priv->info->display_mmio_offset + 0x61014) |
1552 | #define _PIPEBSRC 0x6101c | 1552 | #define _PIPEBSRC (dev_priv->info->display_mmio_offset + 0x6101c) |
1553 | #define _BCLRPAT_B 0x61020 | 1553 | #define _BCLRPAT_B (dev_priv->info->display_mmio_offset + 0x61020) |
1554 | #define _VSYNCSHIFT_B 0x61028 | 1554 | #define _VSYNCSHIFT_B (dev_priv->info->display_mmio_offset + 0x61028) |
1555 | 1555 | ||
1556 | 1556 | ||
1557 | #define HTOTAL(trans) _TRANSCODER(trans, _HTOTAL_A, _HTOTAL_B) | 1557 | #define HTOTAL(trans) _TRANSCODER(trans, _HTOTAL_A, _HTOTAL_B) |