diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-01-24 08:29:35 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-24 16:44:17 -0500 |
commit | 895abf0c3c6923c4203630d2288bb1fbe39c39db (patch) | |
tree | 097a0a817d110898d548d53a76d06989ce086bed /drivers/gpu/drm/i915/i915_reg.h | |
parent | aab17139a0eec686bad80579f7a5d6969c998392 (diff) |
drm/i915: Primary plane 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 01324472f4c8..37589cda2060 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -2982,7 +2982,7 @@ | |||
2982 | #define CURPOS_IVB(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS_IVB) | 2982 | #define CURPOS_IVB(pipe) _PIPE(pipe, _CURAPOS, _CURBPOS_IVB) |
2983 | 2983 | ||
2984 | /* Display A control */ | 2984 | /* Display A control */ |
2985 | #define _DSPACNTR 0x70180 | 2985 | #define _DSPACNTR (dev_priv->info->display_mmio_offset + 0x70180) |
2986 | #define DISPLAY_PLANE_ENABLE (1<<31) | 2986 | #define DISPLAY_PLANE_ENABLE (1<<31) |
2987 | #define DISPLAY_PLANE_DISABLE 0 | 2987 | #define DISPLAY_PLANE_DISABLE 0 |
2988 | #define DISPPLANE_GAMMA_ENABLE (1<<30) | 2988 | #define DISPPLANE_GAMMA_ENABLE (1<<30) |
@@ -3015,14 +3015,14 @@ | |||
3015 | #define DISPPLANE_STEREO_POLARITY_SECOND (1<<18) | 3015 | #define DISPPLANE_STEREO_POLARITY_SECOND (1<<18) |
3016 | #define DISPPLANE_TRICKLE_FEED_DISABLE (1<<14) /* Ironlake */ | 3016 | #define DISPPLANE_TRICKLE_FEED_DISABLE (1<<14) /* Ironlake */ |
3017 | #define DISPPLANE_TILED (1<<10) | 3017 | #define DISPPLANE_TILED (1<<10) |
3018 | #define _DSPAADDR 0x70184 | 3018 | #define _DSPAADDR (dev_priv->info->display_mmio_offset + 0x70184) |
3019 | #define _DSPASTRIDE 0x70188 | 3019 | #define _DSPASTRIDE (dev_priv->info->display_mmio_offset + 0x70188) |
3020 | #define _DSPAPOS 0x7018C /* reserved */ | 3020 | #define _DSPAPOS (dev_priv->info->display_mmio_offset + 0x7018C) /* reserved */ |
3021 | #define _DSPASIZE 0x70190 | 3021 | #define _DSPASIZE (dev_priv->info->display_mmio_offset + 0x70190) |
3022 | #define _DSPASURF 0x7019C /* 965+ only */ | 3022 | #define _DSPASURF (dev_priv->info->display_mmio_offset + 0x7019C) /* 965+ only */ |
3023 | #define _DSPATILEOFF 0x701A4 /* 965+ only */ | 3023 | #define _DSPATILEOFF (dev_priv->info->display_mmio_offset + 0x701A4) /* 965+ only */ |
3024 | #define _DSPAOFFSET 0x701A4 /* HSW */ | 3024 | #define _DSPAOFFSET (dev_priv->info->display_mmio_offset + 0x701A4) /* HSW */ |
3025 | #define _DSPASURFLIVE 0x701AC | 3025 | #define _DSPASURFLIVE (dev_priv->info->display_mmio_offset + 0x701AC) |
3026 | 3026 | ||
3027 | #define DSPCNTR(plane) _PIPE(plane, _DSPACNTR, _DSPBCNTR) | 3027 | #define DSPCNTR(plane) _PIPE(plane, _DSPACNTR, _DSPBCNTR) |
3028 | #define DSPADDR(plane) _PIPE(plane, _DSPAADDR, _DSPBADDR) | 3028 | #define DSPADDR(plane) _PIPE(plane, _DSPAADDR, _DSPBADDR) |
@@ -3068,19 +3068,19 @@ | |||
3068 | 3068 | ||
3069 | 3069 | ||
3070 | /* Display B control */ | 3070 | /* Display B control */ |
3071 | #define _DSPBCNTR 0x71180 | 3071 | #define _DSPBCNTR (dev_priv->info->display_mmio_offset + 0x71180) |
3072 | #define DISPPLANE_ALPHA_TRANS_ENABLE (1<<15) | 3072 | #define DISPPLANE_ALPHA_TRANS_ENABLE (1<<15) |
3073 | #define DISPPLANE_ALPHA_TRANS_DISABLE 0 | 3073 | #define DISPPLANE_ALPHA_TRANS_DISABLE 0 |
3074 | #define DISPPLANE_SPRITE_ABOVE_DISPLAY 0 | 3074 | #define DISPPLANE_SPRITE_ABOVE_DISPLAY 0 |
3075 | #define DISPPLANE_SPRITE_ABOVE_OVERLAY (1) | 3075 | #define DISPPLANE_SPRITE_ABOVE_OVERLAY (1) |
3076 | #define _DSPBADDR 0x71184 | 3076 | #define _DSPBADDR (dev_priv->info->display_mmio_offset + 0x71184) |
3077 | #define _DSPBSTRIDE 0x71188 | 3077 | #define _DSPBSTRIDE (dev_priv->info->display_mmio_offset + 0x71188) |
3078 | #define _DSPBPOS 0x7118C | 3078 | #define _DSPBPOS (dev_priv->info->display_mmio_offset + 0x7118C) |
3079 | #define _DSPBSIZE 0x71190 | 3079 | #define _DSPBSIZE (dev_priv->info->display_mmio_offset + 0x71190) |
3080 | #define _DSPBSURF 0x7119C | 3080 | #define _DSPBSURF (dev_priv->info->display_mmio_offset + 0x7119C) |
3081 | #define _DSPBTILEOFF 0x711A4 | 3081 | #define _DSPBTILEOFF (dev_priv->info->display_mmio_offset + 0x711A4) |
3082 | #define _DSPBOFFSET 0x711A4 | 3082 | #define _DSPBOFFSET (dev_priv->info->display_mmio_offset + 0x711A4) |
3083 | #define _DSPBSURFLIVE 0x711AC | 3083 | #define _DSPBSURFLIVE (dev_priv->info->display_mmio_offset + 0x711AC) |
3084 | 3084 | ||
3085 | /* Sprite A control */ | 3085 | /* Sprite A control */ |
3086 | #define _DVSACNTR 0x72180 | 3086 | #define _DVSACNTR 0x72180 |