diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-11 12:05:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-11 12:05:28 -0500 |
| commit | 52b820d917c7c8c1b2ddec2f0ac165b67267feec (patch) | |
| tree | ca245bb22a960e0e4ce3b0f8beca26616631bffc /include | |
| parent | 47ecfcb7d01418fcbfbc75183ba5e28e98b667b2 (diff) | |
| parent | 82ba789f48de669fd0bbc84c326f07571d078572 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull intel DRM fixes from Dave Airlie:
"Just intel fixes, including getting the Ironlake systems back to the
state they were in for 3.6."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: Revert shrinker changes from "Track unbound pages"
drm/i915: Use pixel size for computing linear offsets into a sprite
drm/i915: Add DEBUG messages to all intel_create_user_framebuffer error paths
drm/i915: The sprite scaler on Ironlake also support YUV planes
drm: Only evict the blocks required to create the requested hole
drm/i915: Treat crtc->mode.clock == 0 as disabled
Revert "drm/i915: no lvds quirk for Zotac ZDBOX SD ID12/ID13"
drm/i915; Only increment the user-pin-count after successfully pinning the bo
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_mm.h | 2 |
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 { | |||
| 70 | unsigned long scan_color; | 70 | unsigned long scan_color; |
| 71 | unsigned long scan_size; | 71 | unsigned long scan_size; |
| 72 | unsigned long scan_hit_start; | 72 | unsigned long scan_hit_start; |
| 73 | unsigned scan_hit_size; | 73 | unsigned long scan_hit_end; |
| 74 | unsigned scanned_blocks; | 74 | unsigned scanned_blocks; |
| 75 | unsigned long scan_start; | 75 | unsigned long scan_start; |
| 76 | unsigned long scan_end; | 76 | unsigned long scan_end; |