diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-07-05 04:57:15 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-05 13:03:56 -0400 |
| commit | ec4c4aa14720b284af8eadd2d65d5131519fc29f (patch) | |
| tree | c072d4904cdbbf400e61772c2b46df80f85f6ca3 /drivers/gpu | |
| parent | 67ca28f30af8e7555f40b916c28148b432168eec (diff) | |
drm/i915: Calculate the sprite WM based on the source width instead of the destination width
Using the destination width in the sprite WM calculations isn't correct.
We should be using the source width.
Note: This doesn't affect hsw since it does not support sprite
scaling.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Add review note from Paulo to the commit message.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 3e3a6d01cff6..5a36afb6ea03 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
| @@ -108,7 +108,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_framebuffer *fb, | |||
| 108 | 108 | ||
| 109 | sprctl |= SP_ENABLE; | 109 | sprctl |= SP_ENABLE; |
| 110 | 110 | ||
| 111 | intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, | 111 | intel_update_sprite_watermarks(dev, pipe, src_w, pixel_size, true, |
| 112 | src_w != crtc_w || src_h != crtc_h); | 112 | src_w != crtc_w || src_h != crtc_h); |
| 113 | 113 | ||
| 114 | /* Sizes are 0 based */ | 114 | /* Sizes are 0 based */ |
| @@ -263,7 +263,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, | |||
| 263 | if (IS_HASWELL(dev)) | 263 | if (IS_HASWELL(dev)) |
| 264 | sprctl |= SPRITE_PIPE_CSC_ENABLE; | 264 | sprctl |= SPRITE_PIPE_CSC_ENABLE; |
| 265 | 265 | ||
| 266 | intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, | 266 | intel_update_sprite_watermarks(dev, pipe, src_w, pixel_size, true, |
| 267 | src_w != crtc_w || src_h != crtc_h); | 267 | src_w != crtc_w || src_h != crtc_h); |
| 268 | 268 | ||
| 269 | /* Sizes are 0 based */ | 269 | /* Sizes are 0 based */ |
| @@ -452,7 +452,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, | |||
| 452 | dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */ | 452 | dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */ |
| 453 | dvscntr |= DVS_ENABLE; | 453 | dvscntr |= DVS_ENABLE; |
| 454 | 454 | ||
| 455 | intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, | 455 | intel_update_sprite_watermarks(dev, pipe, src_w, pixel_size, true, |
| 456 | src_w != crtc_w || src_h != crtc_h); | 456 | src_w != crtc_w || src_h != crtc_h); |
| 457 | 457 | ||
| 458 | /* Sizes are 0 based */ | 458 | /* Sizes are 0 based */ |