Commit f091bf39 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2020-02-27' of... 

Merge tag 'drm-intel-fixes-2020-02-27' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.6-rc4:
- downgrade gen7 back to aliasing-ppgtt to avoid GPU hangs
- shrinker fix
- pmu leak and double free fixes
- gvt user after free and virtual display reset fixes
- randconfig build fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/874kvcsh00.fsf@intel.com
parents e180af19 8e9a400c

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ extra-$(CONFIG_DRM_I915_WERROR) += \ 
		$(shell cd $(srctree)/$(src) && find * -name '*.h')))



quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@)

      cmd_hdrtest = $(CC) $(c_flags) -S -o /dev/null -x c /dev/null -include $<; touch $@

      cmd_hdrtest = $(CC) $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; touch $@



$(obj)/%.hdrtest: $(src)/%.h FORCE

	$(call if_changed_dep,hdrtest)

drivers/gpu/drm/i915/gem/i915_gem_shrinker.c

+1 −3
Original line number Diff line number Diff line
@@ -256,8 +256,7 @@ unsigned long i915_gem_shrink_all(struct drm_i915_private *i915) 
	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {

		freed = i915_gem_shrink(i915, -1UL, NULL,

					I915_SHRINK_BOUND |

					I915_SHRINK_UNBOUND |

					I915_SHRINK_ACTIVE);

					I915_SHRINK_UNBOUND);

	}



	return freed;
@@ -336,7 +335,6 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr) 
	freed_pages = 0;

	with_intel_runtime_pm(&i915->runtime_pm, wakeref)

		freed_pages += i915_gem_shrink(i915, -1UL, NULL,

					       I915_SHRINK_ACTIVE |

					       I915_SHRINK_BOUND |

					       I915_SHRINK_UNBOUND |

					       I915_SHRINK_WRITEBACK);

drivers/gpu/drm/i915/gvt/dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -151,12 +151,12 @@ static void dmabuf_gem_object_free(struct kref *kref) 
			dmabuf_obj = container_of(pos,

					struct intel_vgpu_dmabuf_obj, list);

			if (dmabuf_obj == obj) {

				list_del(pos);

				intel_gvt_hypervisor_put_vfio_device(vgpu);

				idr_remove(&vgpu->object_idr,

					   dmabuf_obj->dmabuf_id);

				kfree(dmabuf_obj->info);

				kfree(dmabuf_obj);

				list_del(pos);

				break;

			}

		}

drivers/gpu/drm/i915/gvt/vgpu.c

+1 −1
Original line number Diff line number Diff line
@@ -560,9 +560,9 @@ void intel_gvt_reset_vgpu_locked(struct intel_vgpu *vgpu, bool dmlr, 


		intel_vgpu_reset_mmio(vgpu, dmlr);

		populate_pvinfo_page(vgpu);

		intel_vgpu_reset_display(vgpu);



		if (dmlr) {

			intel_vgpu_reset_display(vgpu);

			intel_vgpu_reset_cfg_space(vgpu);

			/* only reset the failsafe mode when dmlr reset */

			vgpu->failsafe = false;

drivers/gpu/drm/i915/i915_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static const struct intel_device_info snb_m_gt2_info = { 
	.has_rc6 = 1, \

	.has_rc6p = 1, \

	.has_rps = true, \

	.ppgtt_type = INTEL_PPGTT_FULL, \

	.ppgtt_type = INTEL_PPGTT_ALIASING, \

	.ppgtt_size = 31, \

	IVB_PIPE_OFFSETS, \

	IVB_CURSOR_OFFSETS, \
@@ -494,7 +494,7 @@ static const struct intel_device_info vlv_info = { 
	.has_rps = true,

	.display.has_gmch = 1,

	.display.has_hotplug = 1,

	.ppgtt_type = INTEL_PPGTT_FULL,

	.ppgtt_type = INTEL_PPGTT_ALIASING,

	.ppgtt_size = 31,

	.has_snoop = true,

	.has_coherent_ggtt = false,

CRA Git | Maintained and supported by SUSTech CRA and CCSE