On Mon, Jan 23, 2017 at 09:38:48AM +1000, Dave Airlie wrote: > Hi Linus, > > Okay holidays and LCA kinda caught up with me, I thought I'd get some > of this dequeued last week, but Hobart was > sunny and warm and not all gloomy and rainy as usual. > > This is a bit large, but not too much considering it's two weeks stuff > from AMD and Intel. > > core: one locking fix that helps with dynamic suspend/resume races > i915: mostly GVT updates, GVT was a recent introduction so fixes for > it shouldn't cause any notable side effects. > amdgpu: a bunch of fixes for GPUs with a different memory controller > design that need different firmware. > exynos: decon regression fixes > msm: two regression fixes > etnaviv: a workaround for an mmu bug that needs a lot more work. > virtio: sparse fix, and a maintainers update > > I've looked through most of this and I think it should be fine, but > let me know if it's scarily too much. > > Dave. > > The following changes since commit 6edd870bca30b3aa69370a99bcefc1e5f2b8b190: > > Merge branch 'drm-fixes-4.10' of > git://people.freedesktop.org/~agd5f/linux into drm-fixes (2017-01-09 > 09:47:19 +1000) > > are available in the git repository at: > > git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.10-rc6 You pushed the tag, but didn't update your drm-fixes branch. Confuses my pull request scripts a bit :-) -Daniel > > for you to fetch changes up to 932790109f62aa52bdb4bb62aa66653c0b51bc75: > > Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into > drm-fixes (2017-01-23 09:25:53 +1000) > > ---------------------------------------------------------------- > drm fixes across the board > > ---------------------------------------------------------------- > Alex Deucher (8): > drm/radeon/si: load special ucode for certain MC configs > drm/amdgpu/si: load special ucode for certain MC configs > drm/amdgpu: drop oland quirks > drm/amdgpu: drop the mclk quirk for hainan > drm/radeon: drop oland quirks > drm/radeon: drop the mclk quirk for hainan > drm/radeon: add support for new hainan variants > drm/amdgpu: add support for new hainan variants > > Andrzej Hajda (5): > drm/exynos/decon5433: update shadow registers iff there are active windows > drm/exynos/decon5433: set STANDALONE_UPDATE_F also if planes are disabled > drm/exynos/decon5433: do not disable video after reset > drm/exynos/decon5433: fix CMU programming > drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement > > Changbin Du (13): > drm/i915/gvt: fix error handing of tlb_control emulation > drm/i915/gvt: fix return value in mul_force_wake_write > drm/i915/gvt: always use readq and writeq > drm/i915/gvt: fix use after free for workload > drm/i915/gvt: dec vgpu->running_workload_num after the workload > is really done > drm/i915/gvt: introudce intel_vgpu_reset_resource() to reset > vgpu resource state > drm/i915/gvt: introuduce intel_vgpu_reset_gtt() to reset gtt > drm/i915/gvt: move cfg space inititation function to cfg_space.c > drm/i915/gvt: introduce intel_vgpu_reset_cfg_space to reset > configuration space > drm/i915/gvt: move mmio init/clean function to mmio.c > drm/i915/gvt: introduce intel_vgpu_reset_mmio() to reset mmio space > drm/i915/gvt: fix vGPU instance reuse issues by vGPU reset function > drm/i915/gvt: rewrite gt reset handler using new function > intel_gvt_reset_vgpu_locked > > Chris Wilson (2): > drm/i915: Clear ret before unbinding in i915_gem_evict_something() > drm/i915: Fix phys pwrite for struct_mutex-less operation > > Daniel Vetter (1): > drm/probe-helpers: Drop locking from poll_enable > > Dave Airlie (8): > Merge tag 'drm-misc-fixes-2017-01-09' of > git://anongit.freedesktop.org/git/drm-misc into drm-fixes > Merge tag 'drm-intel-fixes-2017-01-19' of > git://anongit.freedesktop.org/git/drm-intel into drm-fixes > Merge tag 'drm-misc-fixes-2017-01-13' of > git://anongit.freedesktop.org/git/drm-misc into drm-fixes > Merge branch 'msm-fixes-4.10-rc4' of > git://people.freedesktop.org/~robclark/linux into drm-fixes > Merge branch 'drm-fixes-4.10' of > git://people.freedesktop.org/~agd5f/linux into drm-fixes > Merge branch 'exynos-drm-fixes' of > git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes > Merge branch 'drm-etnaviv-fixes' of > https://git.pengutronix.de/git/lst/linux into drm-fixes > Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into drm-fixes > > Flora Cui (1): > drm/amdgpu: fix vm_fault_stop on gfx6 > > Francisco Jerez (1): > drm/i915: Remove WaDisableLSQCROPERFforOCL KBL workaround. > > Gerd Hoffmann (3): > drm/virtio: fix framebuffer sparse warning > drm: update MAINTAINERS for qemu drivers (bochs, cirrus, qxl, virtio-gpu) > drm: flip cirrus driver status to "obsolete". > > Jani Nikula (2): > Merge tag 'gvt-fixes-2017-01-10' of > https://github.com/01org/gvt-linux into drm-intel-fixes > Merge tag 'gvt-fixes-2017-01-16' of > https://github.com/01org/gvt-linux into drm-intel-fixes > > Jike Song (5): > drm/i915/gvt: init/destroy vgpu_idr properly > drm/i915/gvt: destroy the allocated idr on vgpu creating failures > drm/i915/gvt: cleanup opregion memory allocation code > drm/i915/gvt/kvmgt: return meaningful error for vgpu creating failure > drm/i915/gvt: cleanup GFP flags > > Lucas Stach (1): > drm/etnaviv: trick drm_mm into giving out a low IOVA > > Marek Szyprowski (1): > drm/bridge: analogix dp: Fix runtime PM state on driver bind > > Michel Dänzer (1): > Revert "drm/amdgpu: Only update the CUR_SIZE register when necessary" > > Nicolas Iooss (1): > drm/i915/gvt: verify functions types in new_mmio_info() > > Pei Zhang (1): > drm/i915/gvt: print correct value for untracked mmio > > Peter Ujfalusi (1): > drm: Schedule the output_poll_work with 1s delay if we have delayed event > > Rex Zhu (5): > drm/amd/powerplay: fix vce cg logic error on CZ/St. > drm/amd/powerplay: refine vce dpm update code on Cz. > drm/amdgpu: fix bug set incorrect value to vce register > drm/amdgpu: fix program vce instance logic error. > drm/amdgpu: change clock gating mode for uvd_v4. > > Rob Clark (2): > drm/msm/mdp5: rip out plane->pending tracking > drm/msm: fix potential null ptr issue in non-iommu case > > Takashi Iwai (1): > drm: Fix broken VT switch with video=1366x768 option > > Ville Syrjälä (1): > drm/i915: Ignore bogus plane coordinates on SKL when the plane > is not visible > > Zhenyu Wang (2): > drm/i915/gvt: adjust high memory size for default vGPU type > drm/i915/gvt: remove duplicated definition > > MAINTAINERS | 16 +- > drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 24 ++- > drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 +-- > drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 34 +++-- > drivers/gpu/drm/amd/amdgpu/si_dpm.c | 20 +-- > drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 42 ++---- > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 27 ++-- > .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 4 +- > drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 24 ++- > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 + > drivers/gpu/drm/cirrus/Kconfig | 9 ++ > drivers/gpu/drm/drm_modes.c | 7 + > drivers/gpu/drm/drm_probe_helper.c | 63 ++++---- > drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 7 +- > drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 15 +- > drivers/gpu/drm/i915/gvt/aperture_gm.c | 36 +++-- > drivers/gpu/drm/i915/gvt/cfg_space.c | 74 ++++++++++ > drivers/gpu/drm/i915/gvt/gtt.c | 81 ++++++----- > drivers/gpu/drm/i915/gvt/gtt.h | 1 + > drivers/gpu/drm/i915/gvt/gvt.c | 8 +- > drivers/gpu/drm/i915/gvt/gvt.h | 8 +- > drivers/gpu/drm/i915/gvt/handlers.c | 103 +++++-------- > drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +- > drivers/gpu/drm/i915/gvt/mmio.c | 84 +++++++++-- > drivers/gpu/drm/i915/gvt/mmio.h | 4 + > drivers/gpu/drm/i915/gvt/opregion.c | 8 +- > drivers/gpu/drm/i915/gvt/reg.h | 3 +- > drivers/gpu/drm/i915/gvt/scheduler.c | 14 +- > drivers/gpu/drm/i915/gvt/vgpu.c | 162 ++++++++++----------- > drivers/gpu/drm/i915/i915_gem.c | 34 +---- > drivers/gpu/drm/i915/i915_gem_evict.c | 1 + > drivers/gpu/drm/i915/intel_display.c | 3 + > drivers/gpu/drm/i915/intel_hotplug.c | 4 +- > drivers/gpu/drm/i915/intel_lrc.c | 10 -- > drivers/gpu/drm/i915/intel_ringbuffer.c | 8 - > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +- > drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 6 - > drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 - > drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 22 --- > drivers/gpu/drm/msm/msm_gem.c | 2 + > drivers/gpu/drm/radeon/si.c | 25 +++- > drivers/gpu/drm/radeon/si_dpm.c | 12 -- > drivers/gpu/drm/virtio/virtgpu_fb.c | 2 +- > include/drm/drm_crtc_helper.h | 1 - > 46 files changed, 584 insertions(+), 520 deletions(-) > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel