dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

drm/i915: fix per-pipe reads after "cleanup" 

In a few places I replaced reads of per-pipe registers with the actual
register offsets themselves (converting I915_READ(reg) to _PIPE(reg)).
Alexey caught this on his 9xx machine because the cursor control write
was affected.  A quick audit showed a few more places where I'd borked
a read, so here's a patch to fix things up.

Reported-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[ickle: compilation fix]
Tested-by: Alexey Fisher <bug-track@fisher-privat.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Jesse Barnes 2011-02-17 10:40:53 -08:00 committed by Chris Wilson
parent fc9a2228ac
commit 548f245ba6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5220,7 +5220,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
bool visible = base != 0; bool visible = base != 0;
if (intel_crtc->cursor_visible != visible) { if (intel_crtc->cursor_visible != visible) {
uint32_t cntl = CURCNTR(pipe); uint32_t cntl = I915_READ(CURCNTR(pipe));
if (base) { if (base) {
cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT); cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE; cntl |= CURSOR_MODE_64_ARGB_AX | MCURSOR_GAMMA_ENABLE;
@ -5590,7 +5590,7 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe; int pipe = intel_crtc->pipe;
u32 dpll = DPLL(pipe); u32 dpll = I915_READ(DPLL(pipe));
u32 fp; u32 fp;
intel_clock_t clock; intel_clock_t clock;
@ -5675,13 +5675,14 @@ static int intel_crtc_clock_get(struct drm_device *dev, struct drm_crtc *crtc)
struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
struct drm_crtc *crtc) struct drm_crtc *crtc)
{ {
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
int pipe = intel_crtc->pipe; int pipe = intel_crtc->pipe;
struct drm_display_mode *mode; struct drm_display_mode *mode;
int htot = HTOTAL(pipe); int htot = I915_READ(HTOTAL(pipe));
int hsync = HSYNC(pipe); int hsync = I915_READ(HSYNC(pipe));
int vtot = VTOTAL(pipe); int vtot = I915_READ(VTOTAL(pipe));
int vsync = VSYNC(pipe); int vsync = I915_READ(VSYNC(pipe));
mode = kzalloc(sizeof(*mode), GFP_KERNEL); mode = kzalloc(sizeof(*mode), GFP_KERNEL);
if (!mode) if (!mode)