Skip to content

Commit

Permalink
drm/i915/sprite: Always enable the scaler on IronLake
Browse files Browse the repository at this point in the history
As I do not see the output update without the scaler enabled on my
i3-330m, always enable it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Apr 16, 2012
1 parent f681fa2 commit 8aaa81a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/i915/intel_sprite.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_plane *intel_plane = to_intel_plane(plane);
int pipe = intel_plane->pipe, pixel_size;
u32 dvscntr, dvsscale = 0;
u32 dvscntr, dvsscale;

dvscntr = I915_READ(DVSCNTR(pipe));

Expand Down Expand Up @@ -275,7 +275,8 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,

intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size);

if (crtc_w != src_w || crtc_h != src_h)
dvsscale = 0;
if (IS_GEN5(dev) || crtc_w != src_w || crtc_h != src_h)
dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h;

I915_WRITE(DVSSTRIDE(pipe), fb->pitches[0]);
Expand Down

0 comments on commit 8aaa81a

Please sign in to comment.