Commit 1483f0a4 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-10-14' of... 

Merge tag 'drm-intel-fixes-2021-10-14' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.15-rc6:
- Fix ACPI object leak
- Fix context leak in user proto-context creation
- Fix missing i915_sw_fence_fini call

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87zgrbvgls.fsf@intel.com
parents 0dee6f70 82a59c7f

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

+5 −2
Original line number Diff line number Diff line
@@ -186,13 +186,16 @@ void intel_dsm_get_bios_data_funcs_supported(struct drm_i915_private *i915) 
{

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	acpi_handle dhandle;

	union acpi_object *obj;



	dhandle = ACPI_HANDLE(&pdev->dev);

	if (!dhandle)

		return;



	acpi_evaluate_dsm(dhandle, &intel_dsm_guid2, INTEL_DSM_REVISION_ID,

	obj = acpi_evaluate_dsm(dhandle, &intel_dsm_guid2, INTEL_DSM_REVISION_ID,

				INTEL_DSM_FN_GET_BIOS_DATA_FUNCS_SUPPORTED, NULL);

	if (obj)

		ACPI_FREE(obj);

}



/*

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

+4 −1
Original line number Diff line number Diff line
@@ -937,6 +937,10 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, 
	unsigned int n;



	e = alloc_engines(num_engines);

	if (!e)

		return ERR_PTR(-ENOMEM);

	e->num_engines = num_engines;



	for (n = 0; n < num_engines; n++) {

		struct intel_context *ce;

		int ret;
@@ -970,7 +974,6 @@ static struct i915_gem_engines *user_engines(struct i915_gem_context *ctx, 
			goto free_engines;

		}

	}

	e->num_engines = num_engines;



	return e;

drivers/gpu/drm/i915/gt/intel_context.c

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ void intel_context_fini(struct intel_context *ce) 


	mutex_destroy(&ce->pin_mutex);

	i915_active_fini(&ce->active);

	i915_sw_fence_fini(&ce->guc_blocked);

}



void i915_context_module_exit(void)