* [PATCH] drm/i915: Don't try to write to SPR_SCALE when disabling the plane
@ 2012-10-23 17:24 Damien Lespiau
2012-10-23 17:38 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Damien Lespiau @ 2012-10-23 17:24 UTC (permalink / raw)
To: intel-gfx
From: Damien Lespiau <damien.lespiau@intel.com>
A left over from:
drm/i915: Don't try to use SPR_SCALE when we don't have a sprite scaler
We also need to avoid to reset this register in _disable()
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
drivers/gpu/drm/i915/intel_sprite.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index ccfaa6f..fa68e2a 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -153,7 +153,8 @@ ivb_disable_plane(struct drm_plane *plane)
I915_WRITE(SPRCTL(pipe), I915_READ(SPRCTL(pipe)) & ~SPRITE_ENABLE);
/* Can't leave the scaler enabled... */
- I915_WRITE(SPRSCALE(pipe), 0);
+ if (intel_plane->can_scale)
+ I915_WRITE(SPRSCALE(pipe), 0);
/* Activate double buffered register update */
I915_MODIFY_DISPBASE(SPRSURF(pipe), 0);
POSTING_READ(SPRSURF(pipe));
--
1.7.11.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915: Don't try to write to SPR_SCALE when disabling the plane
2012-10-23 17:24 [PATCH] drm/i915: Don't try to write to SPR_SCALE when disabling the plane Damien Lespiau
@ 2012-10-23 17:38 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2012-10-23 17:38 UTC (permalink / raw)
To: Damien Lespiau; +Cc: intel-gfx
On Tue, Oct 23, 2012 at 06:24:25PM +0100, Damien Lespiau wrote:
> From: Damien Lespiau <damien.lespiau@intel.com>
>
> A left over from:
> drm/i915: Don't try to use SPR_SCALE when we don't have a sprite scaler
>
> We also need to avoid to reset this register in _disable()
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Squashed into the previous patch, thanks.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-23 17:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-23 17:24 [PATCH] drm/i915: Don't try to write to SPR_SCALE when disabling the plane Damien Lespiau
2012-10-23 17:38 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.