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

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

drm/i915: remove dev_priv->pc8.enabled 



It was just being used on debugfs and on a WARN inside
hsw_set_power_well. But now that we PC8 is part of runtime PM and we
get/put runtime PM when we get/put any power domain, we shouldn't need
the WARN anymore.

v2: - Rebase.
v3: - 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 6a932d88

drivers/gpu/drm/i915/i915_debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,6 @@ static int i915_pc8_status(struct seq_file *m, void *unused) 
	seq_printf(m, "GPU idle: %s\n", yesno(!dev_priv->mm.busy));

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

		   yesno(dev_priv->pc8.irqs_disabled));

	seq_printf(m, "Enabled: %s\n", yesno(dev_priv->pc8.enabled));

	mutex_unlock(&dev_priv->pc8.lock);



	return 0;

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -1391,8 +1391,6 @@ struct ilk_wm_values { 
 */

struct i915_package_c8 {

	bool irqs_disabled;

	/* Only true after the delayed work task actually enables it. */

	bool enabled;

	struct mutex lock;



	struct {

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -7033,8 +7033,6 @@ void __hsw_do_enable_pc8(struct drm_i915_private *dev_priv) 


	DRM_DEBUG_KMS("Enabling package C8+\n");



	dev_priv->pc8.enabled = true;



	if (dev_priv->pch_id == INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) {

		val = I915_READ(SOUTH_DSPCLK_GATE_D);

		val &= ~PCH_LP_PARTITION_LEVEL_DISABLE;
@@ -7070,7 +7068,6 @@ void __hsw_do_disable_pc8(struct drm_i915_private *dev_priv) 
	mutex_lock(&dev_priv->rps.hw_lock);

	gen6_update_ring_freq(dev);

	mutex_unlock(&dev_priv->rps.hw_lock);

	dev_priv->pc8.enabled = false;

}



static void haswell_modeset_global_resources(struct drm_device *dev)

drivers/gpu/drm/i915/intel_pm.c

+0 −3
Original line number Diff line number Diff line
@@ -5345,8 +5345,6 @@ static void hsw_set_power_well(struct drm_i915_private *dev_priv, 
	bool is_enabled, enable_requested;

	uint32_t tmp;



	WARN_ON(dev_priv->pc8.enabled);



	tmp = I915_READ(HSW_PWR_WELL_DRIVER);

	is_enabled = tmp & HSW_PWR_WELL_STATE_ENABLED;

	enable_requested = tmp & HSW_PWR_WELL_ENABLE_REQUEST;
@@ -6161,7 +6159,6 @@ void intel_pm_setup(struct drm_device *dev) 


	mutex_init(&dev_priv->pc8.lock);

	dev_priv->pc8.irqs_disabled = false;

	dev_priv->pc8.enabled = false;

	INIT_DELAYED_WORK(&dev_priv->rps.delayed_resume_work,

			  intel_gen6_powersave_work);

}