Commit c0168a3e authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/gt: Check we are the Ironlake IPS provider before deregistering 



Check that we own the global pointer before deregistering.

Reported-by: default avatarVenkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Venkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Reviewed-by: default avatarVenkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191210153620.3929372-1-chris@chris-wilson.co.uk
parent 00aff3f6

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

+3 −1
Original line number Diff line number Diff line
@@ -1715,6 +1715,7 @@ void intel_rps_driver_register(struct intel_rps *rps) 
	 * set up, to avoid intel-ips sneaking in and reading bogus values.

	 */

	if (IS_GEN(gt->i915, 5)) {

		GEM_BUG_ON(ips_mchdev);

		rcu_assign_pointer(ips_mchdev, gt->i915);

		ips_ping_for_i915_load();

	}
@@ -1722,6 +1723,7 @@ void intel_rps_driver_register(struct intel_rps *rps) 


void intel_rps_driver_unregister(struct intel_rps *rps)

{

	if (ips_mchdev == rps_to_i915(rps))

		rcu_assign_pointer(ips_mchdev, NULL);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE