[git pull] drm fixes for 4.15 final
From: Dave Airlie
Date: Fri Jan 19 2018 - 01:45:19 EST
Hi Linus,
This is a set of drm regression fixes that I'd like to get into 4.15
final, but I understand if it's too much too late, and am happy to
drop these into -next and make people chase the stable monkey.
The i915 change fixes a display corruption problem introduced in 4.15,
the nouveau changes are for regressions in 4.15, one of the vmwgfx
fixes goes back a little further, the other is a 4.15 regression fix,
the 3 sun4i changes fix blank HDMI output on those devices.
Again happy if you don't take these, just let me know, I suspect 4.15
will have a lot of stable backports for security things over time!
Thanks,
Dave.
The following changes since commit a8750ddca918032d6349adbf9a4b6555e7db20da:
Linux 4.15-rc8 (2018-01-14 15:32:30 -0800)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.15-rc9
for you to fetch changes up to 04cef3eadcf0bf9783a985286cc5f48c5d33fd7a:
Merge tag 'drm-intel-fixes-2018-01-18' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes (2018-01-19
12:40:07 +1000)
----------------------------------------------------------------
nouveau, i915, vmwgfx and sun4i regression fixes
----------------------------------------------------------------
Ben Skeggs (1):
drm/nouveau/mmu/mcp77: fix regressions in stolen memory handling
Dave Airlie (4):
Merge branch 'vmwgfx-fixes-4.15' of
git://people.freedesktop.org/~thomash/linux into drm-fixes
Merge tag 'drm-misc-fixes-2018-01-17' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
Merge tag 'drm-intel-fixes-2018-01-18' of
git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Jon Hunter (1):
drm/nouveau/bar/gk20a: Avoid bar teardown during init
Jonathan Liu (3):
drm/sun4i: hdmi: Check for unset best_parent in sun4i_tmds_determine_rate
drm/sun4i: hdmi: Fix incorrect assignment in sun4i_tmds_determine_rate
drm/sun4i: hdmi: Add missing rate halving check in
sun4i_tmds_determine_rate
Rob Clark (1):
drm/vmwgfx: fix memory corruption with legacy/sou connectors
Thierry Reding (1):
drm/nouveau/drm/nouveau: Pass the proper arguments to
nvif_object_map_handle()
Ville SyrjÃlà (3):
drm/i915: Add .get_hw_state() method for planes
drm/i915: Redo plane sanitation during readout
drm/i915: Fix deadlock in i830_disable_pipe()
Woody Suwalski (1):
drm/vmwgfx: Fix a boot time warning
drivers/gpu/drm/i915/intel_display.c | 303 +++++++++++----------
drivers/gpu/drm/i915/intel_drv.h | 2 +
drivers/gpu/drm/i915/intel_sprite.c | 83 ++++++
drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 1 +
drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +-
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 4 +-
drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 3 +-
drivers/gpu/drm/nouveau/nvkm/subdev/bar/gk20a.c | 1 -
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 2 +
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c | 41 +++
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 10 +
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c | 45 +++
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 16 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 9 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 +-
17 files changed, 367 insertions(+), 167 deletions(-)
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/mcp77.c
create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmmcp77.c