summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_pm.c
diff options
context:
space:
mode:
authorVille Syrjälä2013-07-05 10:57:14 +0200
committerDaniel Vetter2013-08-05 19:03:56 +0200
commit67ca28f30af8e7555f40b916c28148b432168eec (patch)
treef4b17274f0b0caeb0af4b478569e3a8183d9be75 /drivers/gpu/drm/i915/intel_pm.c
parentdrm/i915: Add scaled paramater to update_sprite_watermarks() (diff)
downloadkernel-qcow2-linux-67ca28f30af8e7555f40b916c28148b432168eec.tar.gz
kernel-qcow2-linux-67ca28f30af8e7555f40b916c28148b432168eec.tar.xz
kernel-qcow2-linux-67ca28f30af8e7555f40b916c28148b432168eec.zip
drm/i915: Pass the actual sprite width to watermarks functions
Don't subtract one from the sprite width before watermark calculations. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index f9813b3ead34..9ef476b2eeeb 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -2641,7 +2641,7 @@ static void haswell_update_sprite_wm(struct drm_device *dev, int pipe,
if (intel_plane->pipe == pipe) {
intel_plane->wm.enabled = enabled;
intel_plane->wm.scaled = scaled;
- intel_plane->wm.horiz_pixels = sprite_width + 1;
+ intel_plane->wm.horiz_pixels = sprite_width;
intel_plane->wm.bytes_per_pixel = pixel_size;
break;
}