summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_sprite.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-04-14 21:56:08 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-16 18:44:47 +0200
commitf681fa235f931bcf41f6c8fa22aadde9d8833eec (patch)
tree796c54ad5dc9ae3e29805586494d20e077a68798 /drivers/gpu/drm/i915/intel_sprite.c
parentfc6826d1dcd65f3d1e9a5377678882e4e08f02be (diff)
drm/i915: Export the generic, not arch specific, intel_update_watermarks()
Rather than export every single architecture specific update_wm, just export the wrapper around the display vtable. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index da525b69f7b..10dd1b6ec5f 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -112,13 +112,13 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
*/
if (crtc_w != src_w || crtc_h != src_h) {
dev_priv->sprite_scaling_enabled = true;
- sandybridge_update_wm(dev);
+ intel_update_watermarks(dev);
intel_wait_for_vblank(dev, pipe);
sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h;
} else {
dev_priv->sprite_scaling_enabled = false;
/* potentially re-enable LP watermarks */
- sandybridge_update_wm(dev);
+ intel_update_watermarks(dev);
}
I915_WRITE(SPRSTRIDE(pipe), fb->pitches[0]);