summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2013-01-11 07:47:25 +1000
committerDave Airlie <airlied@gmail.com>2013-01-11 07:52:48 +1000
commit82ba789f48de669fd0bbc84c326f07571d078572 (patch)
tree8c99366d7e66497b2ee4cfa35b8eb91d253fc541 /include/drm
parentecf02a607bd801e742d7bb35c6e40f7ca15edf03 (diff)
parent93927ca52a55c23e0a6a305e7e9082e8411ac9fa (diff)
downloadlinux-82ba789f48de669fd0bbc84c326f07571d078572.tar.bz2
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
Daniel writes: "Pretty much all just major fixes: - 2 pieces of duct-tape for the ilk bug. - Sprite regression fixes from Chris. - OOPS fix for a div-by-zero from Chris, regression due to the modeset rework in 3.7, now brought to light by a benign change in 3.8. - Fix interrupted bo pinning, used to work around CS coherency issues on i830/i845 (kernel also has a w/a newly in 3.8, but pinning is more efficient if possible)."
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_mm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h
index 0f4a366f6fa6..3527fb3f75bb 100644
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
@@ -70,7 +70,7 @@ struct drm_mm {
unsigned long scan_color;
unsigned long scan_size;
unsigned long scan_hit_start;
- unsigned scan_hit_size;
+ unsigned long scan_hit_end;
unsigned scanned_blocks;
unsigned long scan_start;
unsigned long scan_end;