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

Merge tag 'drm-intel-fixes-2022-11-24' of... 

Merge tag 'drm-intel-fixes-2022-11-24' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix GVT KVM reference count handling (Sean Christopherson)
- Never purge busy TTM objects (Matthew Auld)
- Fix warn in intel_display_power_*_domain() functions (Imre Deak)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Y38u44hb1LZfZC+M@tursulin-desk
parents 9e2c5c65 14af5d38

drivers/gpu/drm/i915/display/intel_display_power.c

+4 −4
Original line number Diff line number Diff line
@@ -2434,7 +2434,7 @@ intel_display_power_ddi_io_domain(struct drm_i915_private *i915, enum port port) 
{

	const struct intel_ddi_port_domains *domains = intel_port_domains_for_port(i915, port);



	if (drm_WARN_ON(&i915->drm, !domains) || domains->ddi_io == POWER_DOMAIN_INVALID)

	if (drm_WARN_ON(&i915->drm, !domains || domains->ddi_io == POWER_DOMAIN_INVALID))

		return POWER_DOMAIN_PORT_DDI_IO_A;



	return domains->ddi_io + (int)(port - domains->port_start);
@@ -2445,7 +2445,7 @@ intel_display_power_ddi_lanes_domain(struct drm_i915_private *i915, enum port po 
{

	const struct intel_ddi_port_domains *domains = intel_port_domains_for_port(i915, port);



	if (drm_WARN_ON(&i915->drm, !domains) || domains->ddi_lanes == POWER_DOMAIN_INVALID)

	if (drm_WARN_ON(&i915->drm, !domains || domains->ddi_lanes == POWER_DOMAIN_INVALID))

		return POWER_DOMAIN_PORT_DDI_LANES_A;



	return domains->ddi_lanes + (int)(port - domains->port_start);
@@ -2471,7 +2471,7 @@ intel_display_power_legacy_aux_domain(struct drm_i915_private *i915, enum aux_ch 
{

	const struct intel_ddi_port_domains *domains = intel_port_domains_for_aux_ch(i915, aux_ch);



	if (drm_WARN_ON(&i915->drm, !domains) || domains->aux_legacy_usbc == POWER_DOMAIN_INVALID)

	if (drm_WARN_ON(&i915->drm, !domains || domains->aux_legacy_usbc == POWER_DOMAIN_INVALID))

		return POWER_DOMAIN_AUX_A;



	return domains->aux_legacy_usbc + (int)(aux_ch - domains->aux_ch_start);
@@ -2482,7 +2482,7 @@ intel_display_power_tbt_aux_domain(struct drm_i915_private *i915, enum aux_ch au 
{

	const struct intel_ddi_port_domains *domains = intel_port_domains_for_aux_ch(i915, aux_ch);



	if (drm_WARN_ON(&i915->drm, !domains) || domains->aux_tbt == POWER_DOMAIN_INVALID)

	if (drm_WARN_ON(&i915->drm, !domains || domains->aux_tbt == POWER_DOMAIN_INVALID))

		return POWER_DOMAIN_AUX_TBT1;



	return domains->aux_tbt + (int)(aux_ch - domains->aux_ch_start);

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

+4 −0
Original line number Diff line number Diff line
@@ -612,6 +612,10 @@ static int i915_ttm_truncate(struct drm_i915_gem_object *obj) 


	WARN_ON_ONCE(obj->mm.madv == I915_MADV_WILLNEED);



	err = ttm_bo_wait(bo, true, false);

	if (err)

		return err;



	err = i915_ttm_move_notify(bo);

	if (err)

		return err;

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

+3 −5
Original line number Diff line number Diff line
@@ -664,8 +664,6 @@ static int intel_vgpu_open_device(struct vfio_device *vfio_dev) 
		return -ESRCH;

	}



	kvm_get_kvm(vgpu->vfio_device.kvm);



	if (__kvmgt_vgpu_exist(vgpu))

		return -EEXIST;
@@ -676,6 +674,7 @@ static int intel_vgpu_open_device(struct vfio_device *vfio_dev) 


	vgpu->track_node.track_write = kvmgt_page_track_write;

	vgpu->track_node.track_flush_slot = kvmgt_page_track_flush_slot;

	kvm_get_kvm(vgpu->vfio_device.kvm);

	kvm_page_track_register_notifier(vgpu->vfio_device.kvm,

					 &vgpu->track_node);
@@ -715,15 +714,14 @@ static void intel_vgpu_close_device(struct vfio_device *vfio_dev) 


	kvm_page_track_unregister_notifier(vgpu->vfio_device.kvm,

					   &vgpu->track_node);

	kvm_put_kvm(vgpu->vfio_device.kvm);



	kvmgt_protect_table_destroy(vgpu);

	gvt_cache_destroy(vgpu);



	intel_vgpu_release_msi_eventfd_ctx(vgpu);



	vgpu->attached = false;



	if (vgpu->vfio_device.kvm)

		kvm_put_kvm(vgpu->vfio_device.kvm);

}



static u64 intel_vgpu_get_bar_addr(struct intel_vgpu *vgpu, int bar)