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

Commit d688e095 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: kill struct i915_package_c8 



The only remaining field of the struct was the lock, which was
useless.

v2: - Rebase.

Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5d584b2e

drivers/gpu/drm/i915/i915_debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -2012,11 +2012,9 @@ static int i915_pc8_status(struct seq_file *m, void *unused) 
		return 0;

	}



	mutex_lock(&dev_priv->pc8.lock);

	seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));

	seq_printf(m, "IRQs disabled: %s\n",

		   yesno(dev_priv->pm.irqs_disabled));

	mutex_unlock(&dev_priv->pc8.lock);



	return 0;

}

drivers/gpu/drm/i915/i915_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -1389,10 +1389,6 @@ struct ilk_wm_values { 
 *

 * For more, read "Display Sequences for Package C8" on our documentation.

 */

struct i915_package_c8 {

	struct mutex lock;

};



struct i915_runtime_pm {

	bool suspended;

	bool irqs_disabled;
@@ -1633,8 +1629,6 @@ typedef struct drm_i915_private { 
		struct ilk_wm_values hw;

	} wm;



	struct i915_package_c8 pc8;



	struct i915_runtime_pm pm;



	/* Old dri1 support infrastructure, beware the dragons ya fools entering

drivers/gpu/drm/i915/intel_pm.c

+0 −1
Original line number Diff line number Diff line
@@ -6157,7 +6157,6 @@ void intel_pm_setup(struct drm_device *dev) 


	mutex_init(&dev_priv->rps.hw_lock);



	mutex_init(&dev_priv->pc8.lock);

	INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,

			  intel_gen6_powersave_work);