summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes2008-02-07 20:15:20 +0100
committerLinus Torvalds2008-02-07 20:35:13 +0100
commit123f794fa7d592644881a20801638d88521d0b06 (patch)
tree9782b0bde7ffc24a3719b208dbb703e480360c5e
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
downloadkernel-qcow2-linux-123f794fa7d592644881a20801638d88521d0b06.tar.gz
kernel-qcow2-linux-123f794fa7d592644881a20801638d88521d0b06.tar.xz
kernel-qcow2-linux-123f794fa7d592644881a20801638d88521d0b06.zip
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>
-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 37bbf6729b4e..f8308bfb2613 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;