diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 1fa5612a4572..55bdf70b548b 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
@@ -133,7 +133,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_framebuffer *fb, | |||
133 | 133 | ||
134 | I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w); | 134 | I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w); |
135 | I915_WRITE(SPCNTR(pipe, plane), sprctl); | 135 | I915_WRITE(SPCNTR(pipe, plane), sprctl); |
136 | I915_MODIFY_DISPBASE(SPSURF(pipe, plane), obj->gtt_offset + | 136 | I915_MODIFY_DISPBASE(SPSURF(pipe, plane), i915_gem_obj_ggtt_offset(obj) + |
137 | sprsurf_offset); | 137 | sprsurf_offset); |
138 | POSTING_READ(SPSURF(pipe, plane)); | 138 | POSTING_READ(SPSURF(pipe, plane)); |
139 | } | 139 | } |
@@ -308,7 +308,8 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, | |||
308 | if (intel_plane->can_scale) | 308 | if (intel_plane->can_scale) |
309 | I915_WRITE(SPRSCALE(pipe), sprscale); | 309 | I915_WRITE(SPRSCALE(pipe), sprscale); |
310 | I915_WRITE(SPRCTL(pipe), sprctl); | 310 | I915_WRITE(SPRCTL(pipe), sprctl); |
311 | I915_MODIFY_DISPBASE(SPRSURF(pipe), obj->gtt_offset + sprsurf_offset); | 311 | I915_MODIFY_DISPBASE(SPRSURF(pipe), |
312 | i915_gem_obj_ggtt_offset(obj) + sprsurf_offset); | ||
312 | POSTING_READ(SPRSURF(pipe)); | 313 | POSTING_READ(SPRSURF(pipe)); |
313 | 314 | ||
314 | /* potentially re-enable LP watermarks */ | 315 | /* potentially re-enable LP watermarks */ |
@@ -478,7 +479,8 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, | |||
478 | I915_WRITE(DVSSIZE(pipe), (crtc_h << 16) | crtc_w); | 479 | I915_WRITE(DVSSIZE(pipe), (crtc_h << 16) | crtc_w); |
479 | I915_WRITE(DVSSCALE(pipe), dvsscale); | 480 | I915_WRITE(DVSSCALE(pipe), dvsscale); |
480 | I915_WRITE(DVSCNTR(pipe), dvscntr); | 481 | I915_WRITE(DVSCNTR(pipe), dvscntr); |
481 | I915_MODIFY_DISPBASE(DVSSURF(pipe), obj->gtt_offset + dvssurf_offset); | 482 | I915_MODIFY_DISPBASE(DVSSURF(pipe), |
483 | i915_gem_obj_ggtt_offset(obj) + dvssurf_offset); | ||
482 | POSTING_READ(DVSSURF(pipe)); | 484 | POSTING_READ(DVSSURF(pipe)); |
483 | } | 485 | } |
484 | 486 | ||