]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge v5.6 into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2020 05:15:47 +0000 (15:15 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2020 05:15:47 +0000 (15:15 +1000)
msm needed rc6, so I just went and merged release
(msm has been in drm-next outside of this tree)

Signed-off-by: Dave Airlie <airlied@redhat.com>
1  2 
Documentation/devicetree/bindings/vendor-prefixes.yaml
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/bochs/bochs_hw.c
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
drivers/gpu/drm/drm_dp_mst_topology.c
drivers/gpu/drm/exynos/exynos7_drm_decon.c
drivers/gpu/drm/i915/gvt/vgpu.c
drivers/gpu/drm/radeon/radeon_ttm.c
include/drm/drm_dp_mst_helper.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index 78f14f04d2eaaa3ded1df5aec4f26a7e0ef9a1ae,345c2aa3b491e143fb00bb74dd9c86d29b95a4d3..1d5ff88078bd1201feebb6d56dc856027df3193b
@@@ -272,12 -271,18 +272,19 @@@ void intel_gvt_release_vgpu(struct inte
  void intel_gvt_destroy_vgpu(struct intel_vgpu *vgpu)
  {
        struct intel_gvt *gvt = vgpu->gvt;
 +      struct drm_i915_private *i915 = gvt->gt->i915;
  
-       mutex_lock(&vgpu->vgpu_lock);
 -      WARN(vgpu->active, "vGPU is still active!\n");
 +      drm_WARN(&i915->drm, vgpu->active, "vGPU is still active!\n");
  
+       /*
+        * remove idr first so later clean can judge if need to stop
+        * service if no active vgpu.
+        */
+       mutex_lock(&gvt->lock);
+       idr_remove(&gvt->vgpu_idr, vgpu->id);
+       mutex_unlock(&gvt->lock);
+       mutex_lock(&vgpu->vgpu_lock);
        intel_gvt_debugfs_remove_vgpu(vgpu);
        intel_vgpu_clean_sched_policy(vgpu);
        intel_vgpu_clean_submission(vgpu);
Simple merge
Simple merge