Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b71084 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Cleanup gt powerstate from gem 



Since the gt powerstate is allocated by i915_gem_init, clean it from
i915_gem_fini for symmetry and to correct the imbalance on error.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180812223642.24865-1-chris@chris-wilson.co.uk
parent f4e60c5c

drivers/gpu/drm/i915/i915_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -5634,6 +5634,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 
void i915_gem_fini(struct drm_i915_private *dev_priv)

{

	i915_gem_suspend_late(dev_priv);

	intel_disable_gt_powersave(dev_priv);



	/* Flush any outstanding unpin_work. */

	i915_gem_drain_workqueue(dev_priv);
@@ -5645,6 +5646,8 @@ void i915_gem_fini(struct drm_i915_private *dev_priv) 
	i915_gem_contexts_fini(dev_priv);

	mutex_unlock(&dev_priv->drm.struct_mutex);



	intel_cleanup_gt_powersave(dev_priv);



	intel_uc_fini_misc(dev_priv);

	i915_gem_cleanup_userptr(dev_priv);

drivers/gpu/drm/i915/intel_display.c

+0 −4
Original line number Diff line number Diff line
@@ -15991,8 +15991,6 @@ void intel_modeset_cleanup(struct drm_device *dev) 
	flush_work(&dev_priv->atomic_helper.free_work);

	WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list));



	intel_disable_gt_powersave(dev_priv);



	/*

	 * Interrupts and polling as the first thing to avoid creating havoc.

	 * Too much stuff here (turning of connectors, ...) would
@@ -16020,8 +16018,6 @@ void intel_modeset_cleanup(struct drm_device *dev) 


	intel_cleanup_overlay(dev_priv);



	intel_cleanup_gt_powersave(dev_priv);



	intel_teardown_gmbus(dev_priv);



	destroy_workqueue(dev_priv->modeset_wq);