diff options
| author | Chris Wilson | 2014-05-30 15:35:26 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-06-05 08:52:45 +0200 |
| commit | 4b0e333ee1100e621c5530d368a3029d41131214 (patch) | |
| tree | 60dd289e0e97f538f37b57c67f97217d7db6f8a5 /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/i915: tell the user if both KMS and UMS are disabled (diff) | |
| download | kernel-qcow2-linux-4b0e333ee1100e621c5530d368a3029d41131214.tar.gz kernel-qcow2-linux-4b0e333ee1100e621c5530d368a3029d41131214.tar.xz kernel-qcow2-linux-4b0e333ee1100e621c5530d368a3029d41131214.zip | |
drm/i915: Always apply cursor width changes
It is possible for userspace to create a big object large enough for a
256x256, and then switch over to using it as a 64x64 cursor. This
requires the cursor update routines to check for a change in width on
every update, rather than just when the cursor is originally enabled.
This also fixes an issue with 845g/865g which cannot change the base
address of the cursor whilst it is active.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
[Antti:rebased, adjusted macro names and moved some lines, no functional
changes]
Reviewed-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Tested-by: Antti Koskipaa <antti.koskipaa@linux.intel.com>
Cc: stable@vger.kernel.org
Testcase: igt/kms_cursor_crc/cursor-size-change
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 98ab492ee60a..601caa88c092 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2353,7 +2353,7 @@ static int i915_display_info(struct seq_file *m, void *unused) active = cursor_position(dev, crtc->pipe, &x, &y); seq_printf(m, "\tcursor visible? %s, position (%d, %d), addr 0x%08x, active? %s\n", - yesno(crtc->cursor_visible), + yesno(crtc->cursor_base), x, y, crtc->cursor_addr, yesno(active)); } |