summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJesse Barnes <jesse.barnes@intel.com>2008-02-07 11:15:20 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:35:13 -0800
commit123f794fa7d592644881a20801638d88521d0b06 (patch)
tree9782b0bde7ffc24a3719b208dbb703e480360c5e /drivers/char
parent0afc2edfada50980bec999f94dcea26ebad3dda6 (diff)
i915: Fix GR register array size off-by-one bug
Make sure we have enough room for all the GR registers or we'll end up clobbering the AR index register (which should actually be harmless unless the BIOS is making an assumption about it). Noticed-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Jesse Barnes <jesse.barnes@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/drm/i915_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index 37bbf6729b4..f8308bfb261 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -187,7 +187,7 @@ typedef struct drm_i915_private {
u32 saveSWF2[3];
u8 saveMSR;
u8 saveSR[8];
- u8 saveGR[24];
+ u8 saveGR[25];
u8 saveAR_INDEX;
u8 saveAR[20];
u8 saveDACMASK;