On Wed, 21 Mar 2012 12:48:24 -0700 Jesse Barnes <jbarnes at virtuousgeek.org> wrote: > They were all over the place, order them by position and add a few. > > Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org> > --- > drivers/gpu/drm/i915/i915_reg.h | 20 ++++++++++++++------ > 1 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 52a06be..af5cd25 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -3063,18 +3063,26 @@ > #define DE_PIPEB_VBLANK_IVB (1<<5) > #define DE_PIPEA_VBLANK_IVB (1<<0) > > +#define MASTER_IER_VLV 0x4400c /* Gunit master IER */ > +#define MASTER_INTERRUPT_ENABLE (1<<31) > + Seems VLV_MASTER_IER would follow the convention. > #define DEISR 0x44000 > #define DEIMR 0x44004 > #define DEIIR 0x44008 > #define DEIER 0x4400c > > /* GT interrupt */ > -#define GT_PIPE_NOTIFY (1 << 4) > -#define GT_SYNC_STATUS (1 << 2) > -#define GT_USER_INTERRUPT (1 << 0) > -#define GT_BSD_USER_INTERRUPT (1 << 5) > -#define GT_GEN6_BSD_USER_INTERRUPT (1 << 12) > -#define GT_BLT_USER_INTERRUPT (1 << 22) > +#define GT_BLT_FLUSHDW_NOTIFY_INTERRUPT (1 << 26) > +#define GT_BLT_CS_ERROR_INTERRUPT (1 << 25) > +#define GT_BLT_USER_INTERRUPT (1 << 22) > +#define GT_BSD_CS_ERROR_INTERRUPT (1 << 15) > +#define GT_GEN6_BSD_USER_INTERRUPT (1 << 12) > +#define GT_BSD_USER_INTERRUPT (1 << 5) > +#define GT_L3_PARITY_ERROR_INTERRUPT (1 << 5) /* IVB+ */ > +#define GT_PIPE_NOTIFY (1 << 4) > +#define GT_RENDER_CS_ERROR_INTERRUPT (1 << 3) > +#define GT_SYNC_STATUS (1 << 2) > +#define GT_USER_INTERRUPT (1 << 0) What about GT_GEN7_L3_PARITY_ERROR_INTERRUPT? Similarly if GT_BLT_FLUSHDW_NOTIFY_INTERRUPT and GT_BLT_CS_ERROR_INTERRUPT only apply after a certain generation maybe add that info... I know this applies directly to your overall pitch to restructure things, but for now at least try to keep it consistent, and helpfully named (imho). > > #define GTISR 0x44010 > #define GTIMR 0x44014
