Merge branch '3.15/upstream-updates' into 3.15/master

Conflicts:
	Makefile
Merge tag 'v3.15.10' into 3.15/master

This is the 3.15.10 stable release

Conflicts:
	Makefile
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>

Backported from commit 4b0e333ee1100e621c5530d368a3029d41131214
Conflicts linux-3.15.y:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_drv.h

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82273
Reported-and-tested-by: Jan Alexander Steffens <jan.steffens@gmail.com>
Cc: Jan Alexander Steffens <jan.steffens@gmail.com>
Merge branch '3.15/misc' into 3.15/master
Zen 3.15.x merged