Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aaa81a1 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915/sprite: Always enable the scaler on IronLake 



As I do not see the output update without the scaler enabled on my
i3-330m, always enable it.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f681fa23

drivers/gpu/drm/i915/intel_sprite.c

+3 −2
Original line number Diff line number Diff line
@@ -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));
@@ -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]);