UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Move the cursor_base setup to i{845, 9xx}_update_cursor() 

To make the code a bit more undestandable move the
intel_crtc->cursor_base assignment into the low level update cursor
routines. That's were we compare the current value with the new one
so immediately seeing that it gets assigned only afterwards helps
one to understand that it gets assigned only after the comparison.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2014-09-12 20:53:32 +03:00 committed by Daniel Vetter
parent f77c44b902
commit 99d1f3878b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/i915/intel_display.c
View File

@ -8258,8 +8258,10 @@ static void i845_update_cursor(struct drm_crtc *crtc, u32 base)
intel_crtc->cursor_cntl = 0; intel_crtc->cursor_cntl = 0;
} }
if (intel_crtc->cursor_base != base) if (intel_crtc->cursor_base != base) {
I915_WRITE(_CURABASE, base); I915_WRITE(_CURABASE, base);
intel_crtc->cursor_base = base;
}
if (intel_crtc->cursor_size != size) { if (intel_crtc->cursor_size != size) {
I915_WRITE(CURSIZE, size); I915_WRITE(CURSIZE, size);
@ -8312,6 +8314,8 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
/* and commit changes on next vblank */ /* and commit changes on next vblank */
I915_WRITE(CURBASE(pipe), base); I915_WRITE(CURBASE(pipe), base);
POSTING_READ(CURBASE(pipe)); POSTING_READ(CURBASE(pipe));
intel_crtc->cursor_base = base;
} }
/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */ /* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */
@ -8362,7 +8366,6 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
i845_update_cursor(crtc, base); i845_update_cursor(crtc, base);
else else
i9xx_update_cursor(crtc, base); i9xx_update_cursor(crtc, base);
intel_crtc->cursor_base = base;
} }
static bool cursor_size_ok(struct drm_device *dev, static bool cursor_size_ok(struct drm_device *dev,