[<prev] [next>] [day] [month] [year] [list]
Message-ID: <CAPM=9tzdFEvXuYt6jYxEbUFCCthypZz+UoN9A0sxh5EmHHCQ-g@mail.gmail.com>
Date: Thu, 23 Nov 2017 14:18:59 +1000
From: Dave Airlie <airlied@...il.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: dri-devel <dri-devel@...ts.freedesktop.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [git pull] drm for v4.15 (fixes/cleanups/one small feature)
Hi Linus,
This is just some bits and pieces for the second half of the merge window,
1. Remove the MSM dt-bindings file Rob managed to push in the previous pull.
2. Add a property/edid quirk to denote HMD devices, I had these
hanging around for a few weeks and Keith had done some work on them,
they are fairly self contained and small, and only affect people using
HTC Vive VR headsets so far.
3. amdgpu, tegra, tilcdc, fsl fixes
4. some imx-drm cleanups I missed, these seemed pretty small, and no
reason to hold off.
I have one TTM regression fix (fixes bochs-vga in qemu) sitting
locally awaiting review I'll probably send that in a separate pull
request tomorrow.
Dave.
The following changes since commit f150891fd9878ef0d9197c4e8451ce67c3bdd014:
Merge tag 'exynos-drm-next-for-v4.15' of
git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into
drm-next (2017-11-14 14:12:43 +1000)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux tags/drm-for-v4.15-part2
for you to fetch changes up to 98ecf1a308977505381b5c360b039a84cf67513c:
dt-bindings: remove file that was added accidentally (2017-11-23
14:10:39 +1000)
----------------------------------------------------------------
fixes/cleanups for rc1, non-desktop flags for VR
----------------------------------------------------------------
Alex Deucher (2):
Revert "drm/radeon: dont switch vt on suspend"
drm/amdgpu: don't skip attributes when powerplay is enabled
Christian König (2):
drm/amdgpu: make AMDGPU_VA_RESERVED_SIZE 64bit
drm/amdgpu: set f_mapping on exported DMA-bufs
Cihangir Akturk (1):
drm/imx: switch to drm_*_get(), drm_*_put() helpers
Colin Ian King (1):
drm/amd/powerplay: fix copy-n-paste error on vddci_buf index
Dave Airlie (9):
Merge branch 'drm-next-4.15' of
git://people.freedesktop.org/~agd5f/linux into drm-next
Merge tag 'drm-fsl-dcu-fixes-for-v4.15' of
http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next
Merge tag 'drm/tegra/for-4.15-rc1-fixes' of
git://anongit.freedesktop.org/tegra/linux into drm-next
Merge tag 'imx-drm-next-2017-10-18' of
git://git.pengutronix.de/git/pza/linux into drm-next
Merge branch 'drm-next-4.15' of
git://people.freedesktop.org/~agd5f/linux into drm-next
Merge tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux
into drm-next
drm: add connector info/property for non-desktop displays [v2]
drm/fb: add support for not enabling fbcon on non-desktop displays [v2]
drm/edid: quirk HTC vive headset as non-desktop. [v2]
Emily Deng (1):
drm/amdgpu: Fix null pointer issue in amdgpu_cs_wait_any_fence
Eric Huang (1):
drm/amd/powerplay: fix unfreeze level smc message for smu7
Fabio Estevam (1):
gpu: ipu-v3: ipu-dc: Remove unused 'di' variable
Jyri Sarha (1):
drm/tilcdc: Remove obsolete "ti,tilcdc,slave" dts binding support
Ken Wang (2):
drm/amdgpu: Remove check which is not valid for certain VBIOS
drm/amdgpu: Add common golden settings for GFX9
Laurent Pinchart (1):
drm/fsl-dcu: Don't set connector DPMS property
Lucas Stach (1):
drm/imx: parallel-display: use correct connector enum
Marco Franchi (1):
dt-bindings: fsl-imx-drm: Remove incorrect "@di0" usage
Monk Liu (2):
drm/amdgpu:fix memleak in takedown
drm/amdgpu:fix memleak
Nicolai Hähnle (1):
drm/amdgpu/gfx9: implement wave VGPR reading
Rex Zhu (2):
drm/amd/pp: fix dpm randomly failed on Vega10
drm/amd/pp: fix typecast error in powerplay.
Rob Clark (1):
dt-bindings: remove file that was added accidentally
Roger He (2):
drm/amd/amdgpu: if visible VRAM allocation fail, fall back to
invisible try again
drm/amd/amdgpu: fix over-bound accessing in amdgpu_cs_wait_any_fence
Stefan Agner (2):
drm/fsl-dcu: avoid disabling pixel clock twice on suspend
drm/fsl-dcu: enable IRQ before drm_atomic_helper_resume()
Thierry Reding (1):
drm/tegra: sor: Reimplement pad clock
Tom St Denis (1):
drm/amd/amdgpu: Fix wave mask in amdgpu_debugfs_wave_read() (v2)
Wang Hongcheng (1):
drm/amdgpu: fix rmmod KCQ disable failed error
Xiangliang.Yu (1):
drm/amdgpu: fix kernel hang when starting VNC server
ozeng (1):
drm/amdgpu: Properly allocate VM invalidate eng v2
.../bindings/display/imx/fsl-imx-drm.txt | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 6 -
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 43 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 15 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 -
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 +
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 3 -
drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 -
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 5 -
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 8 +
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 9 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 27 +
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 15 +-
drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 2 +-
.../amd/powerplay/hwmgr/process_pptables_v1_0.c | 4 +-
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 +-
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 29 +-
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 +
drivers/gpu/drm/drm_connector.c | 17 +
drivers/gpu/drm/drm_edid.c | 11 +-
drivers/gpu/drm/drm_fb_helper.c | 6 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 -
drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +-
drivers/gpu/drm/imx/parallel-display.c | 2 +-
drivers/gpu/drm/radeon/radeon_fb.c | 1 -
drivers/gpu/drm/tegra/sor.c | 157 ++--
drivers/gpu/drm/tilcdc/Kconfig | 11 -
drivers/gpu/drm/tilcdc/Makefile | 3 -
drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 269 -------
drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts | 72 --
drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h | 25 -
drivers/gpu/ipu-v3/ipu-dc.c | 3 -
include/drm/drm_connector.h | 5 +
include/drm/drm_mode_config.h | 7 +
include/dt-bindings/msm/msm-bus-ids.h | 887 ---------------------
39 files changed, 281 insertions(+), 1404 deletions(-)
delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts
delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h
delete mode 100644 include/dt-bindings/msm/msm-bus-ids.h
Powered by blists - more mailing lists