From: Dave Airlie Date: Wed, 4 May 2016 23:56:30 +0000 (+1000) Subject: Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=21daaeee9f55ee407422ad225790dee57f0d5171;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel into drm-next Ofc I promise just a few leftovers for drm-misc and somehow it's the biggest pull. But really mostly trivial stuff: - MAINTAINERS updates from Emil - rename async to nonblock in atomic_commit to avoid the confusion between nonblocking ioctl and async flip (= not vblank synced), from Maarten. Needs to be regened with newer drivers, but probably only after -rc1 to catch them all. - actually lockless gem_object_free, plus acked driver conversion patches. All the trickier prep stuff already is in drm-next. - Noralf's nice work for generic defio support in our fbdev emulation. Keeps the udl hack, and qxl is tested by Gerd. * tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel: (47 commits) drm: Fixup locking WARN_ON mistake around gem_object_free_unlocked drm/etnaviv: Use lockless gem BO free callback drm/imx: Use lockless gem BO free callback drm/radeon: Use lockless gem BO free callback drm/amdgpu: Use lockless gem BO free callback drm/gem: support BO freeing without dev->struct_mutex MAINTAINERS: Add myself for the new VC4 (RPi GPU) graphics driver. MAINTAINERS: Add a bunch of legacy (UMS) DRM drivers MAINTAINERS: Add a few DRM drivers by Dave Airlie MAINTAINERS: List the correct git repo for the Renesas DRM drivers MAINTAINERS: Update the files list for the Renesas DRM drivers MAINTAINERS: Update the files list for the Armada DRM driver MAINTAINERS: Update the files list for the Rockchip DRM driver MAINTAINERS: Update the files list for the Exynos DRM driver MAINTAINERS: Add maintainer entry for the VMWGFX DRM driver MAINTAINERS: Add maintainer entry for the MSM DRM driver MAINTAINERS: Add maintainer entry for the Nouveau DRM driver MAINTAINERS: Update the files list for the Etnaviv DRM driver MAINTAINERS: Remove unneded wildcard for the i915 DRM driver drm/atomic: Add WARN_ON when state->acquire_ctx is not set. ... --- 21daaeee9f55ee407422ad225790dee57f0d5171 diff --cc MAINTAINERS index f262128644e6,1bbf5ece1dd4..8c10b4cc4da7 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -3853,16 -3854,31 +3868,41 @@@ T: git git://github.com/patjak/drm-gma5 S: Maintained F: drivers/gpu/drm/gma500/ +DRM DRIVERS FOR HISILICON +M: Xinliang Liu +R: Xinwei Kong +R: Chen Feng +L: dri-devel@lists.freedesktop.org +T: git git://github.com/xin3liang/linux.git +S: Maintained +F: drivers/gpu/drm/hisilicon/ +F: Documentation/devicetree/bindings/display/hisilicon/ + + DRM DRIVER FOR INTEL I810 VIDEO CARDS + S: Orphan / Obsolete + F: drivers/gpu/drm/i810/ + F: include/uapi/drm/i810_drm.h + + DRM DRIVER FOR MSM ADRENO GPU + M: Rob Clark + L: linux-arm-msm@vger.kernel.org + L: dri-devel@lists.freedesktop.org + L: freedreno@lists.freedesktop.org + T: git git://people.freedesktop.org/~robclark/linux + S: Maintained + F: drivers/gpu/drm/msm/ + F: include/uapi/drm/msm_drm.h + F: Documentation/devicetree/bindings/display/msm/ + + DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS + M: Ben Skeggs + L: dri-devel@lists.freedesktop.org + L: nouveau@lists.freedesktop.org + T: git git://github.com/skeggsb/linux + S: Supported + F: drivers/gpu/drm/nouveau/ + F: include/uapi/drm/nouveau_drm.h + DRM DRIVERS FOR NVIDIA TEGRA M: Thierry Reding M: Terje Bergström diff --cc drivers/gpu/drm/i915/intel_display.c index ff60241b1f76,5d29b838d8d7..73299f9e77a8 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@@ -13462,9 -13414,12 +13462,9 @@@ static int intel_atomic_prepare_commit( return ret; ret = drm_atomic_helper_prepare_planes(dev, state); - if (!ret && !nonblock && !i915_reset_in_progress(&dev_priv->gpu_error)) { - u32 reset_counter; - - reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter); - mutex_unlock(&dev->struct_mutex); + mutex_unlock(&dev->struct_mutex); - if (!ret && !async) { ++ if (!ret && !nonblock) { for_each_plane_in_state(state, plane, plane_state, i) { struct intel_plane_state *intel_plane_state = to_intel_plane_state(plane_state);