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

Commit ad1443f0 authored by Sagar Arun Kamble's avatar Sagar Arun Kamble Committed by Chris Wilson
Browse files

drm/i915: Name i915_runtime_pm structure in dev_priv as "runtime_pm" 



We were using dev_priv->pm for runtime power management related state.
This patch renames it to "runtime_pm" which looks more apt.

v2: s/rpm/runtime_pm (Chris)

Signed-off-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com> #1
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/1507360055-19948-7-git-send-email-sagar.a.kamble@intel.com


Acked-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171010213010.7415-6-chris@chris-wilson.co.uk
parent d46b00dc

drivers/gpu/drm/i915/i915_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -2544,12 +2544,12 @@ static int intel_runtime_suspend(struct device *kdev) 
	intel_uncore_suspend(dev_priv);



	enable_rpm_wakeref_asserts(dev_priv);

	WARN_ON_ONCE(atomic_read(&dev_priv->pm.wakeref_count));

	WARN_ON_ONCE(atomic_read(&dev_priv->runtime_pm.wakeref_count));



	if (intel_uncore_arm_unclaimed_mmio_detection(dev_priv))

		DRM_ERROR("Unclaimed access detected prior to suspending\n");



	dev_priv->pm.suspended = true;

	dev_priv->runtime_pm.suspended = true;



	/*

	 * FIXME: We really should find a document that references the arguments
@@ -2595,11 +2595,11 @@ static int intel_runtime_resume(struct device *kdev) 


	DRM_DEBUG_KMS("Resuming device\n");



	WARN_ON_ONCE(atomic_read(&dev_priv->pm.wakeref_count));

	WARN_ON_ONCE(atomic_read(&dev_priv->runtime_pm.wakeref_count));

	disable_rpm_wakeref_asserts(dev_priv);



	intel_opregion_notify_adapter(dev_priv, PCI_D0);

	dev_priv->pm.suspended = false;

	dev_priv->runtime_pm.suspended = false;

	if (intel_uncore_unclaimed_mmio(dev_priv))

		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2533,7 +2533,7 @@ struct drm_i915_private { 
		bool distrust_bios_wm;

	} wm;



	struct i915_runtime_pm pm;

	struct i915_runtime_pm runtime_pm;



	struct {

		bool initialized;

drivers/gpu/drm/i915/i915_gpu_error.c

+2 −2
Original line number Diff line number Diff line
@@ -1674,8 +1674,8 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv, 
				   struct i915_gpu_state *error)

{

	error->awake = dev_priv->gt.awake;

	error->wakelock = atomic_read(&dev_priv->pm.wakeref_count);

	error->suspended = dev_priv->pm.suspended;

	error->wakelock = atomic_read(&dev_priv->runtime_pm.wakeref_count);

	error->suspended = dev_priv->runtime_pm.suspended;



	error->iommu = -1;

#ifdef CONFIG_INTEL_IOMMU

drivers/gpu/drm/i915/i915_irq.c

+4 −4
Original line number Diff line number Diff line
@@ -4173,7 +4173,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv) 
	 * interrupts as enabled _before_ actually enabling them to avoid

	 * special cases in our ordering checks.

	 */

	dev_priv->pm.irqs_enabled = true;

	dev_priv->runtime_pm.irqs_enabled = true;



	return drm_irq_install(&dev_priv->drm, dev_priv->drm.pdev->irq);

}
@@ -4189,7 +4189,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) 
{

	drm_irq_uninstall(&dev_priv->drm);

	intel_hpd_cancel_work(dev_priv);

	dev_priv->pm.irqs_enabled = false;

	dev_priv->runtime_pm.irqs_enabled = false;

}



/**
@@ -4202,7 +4202,7 @@ void intel_irq_uninstall(struct drm_i915_private *dev_priv) 
void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv)

{

	dev_priv->drm.driver->irq_uninstall(&dev_priv->drm);

	dev_priv->pm.irqs_enabled = false;

	dev_priv->runtime_pm.irqs_enabled = false;

	synchronize_irq(dev_priv->drm.irq);

}
@@ -4215,7 +4215,7 @@ void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv) 
 */

void intel_runtime_pm_enable_interrupts(struct drm_i915_private *dev_priv)

{

	dev_priv->pm.irqs_enabled = true;

	dev_priv->runtime_pm.irqs_enabled = true;

	dev_priv->drm.driver->irq_preinstall(&dev_priv->drm);

	dev_priv->drm.driver->irq_postinstall(&dev_priv->drm);

}

drivers/gpu/drm/i915/intel_drv.h

+5 −5
Original line number Diff line number Diff line
@@ -1254,7 +1254,7 @@ static inline bool intel_irqs_enabled(struct drm_i915_private *dev_priv) 
	 * We only use drm_irq_uninstall() at unload and VT switch, so

	 * this is the only thing we need to check.

	 */

	return dev_priv->pm.irqs_enabled;

	return dev_priv->runtime_pm.irqs_enabled;

}



int intel_get_crtc_scanline(struct intel_crtc *crtc);
@@ -1790,7 +1790,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, 
static inline void

assert_rpm_device_not_suspended(struct drm_i915_private *dev_priv)

{

	WARN_ONCE(dev_priv->pm.suspended,

	WARN_ONCE(dev_priv->runtime_pm.suspended,

		  "Device suspended during HW access\n");

}
@@ -1798,7 +1798,7 @@ static inline void 
assert_rpm_wakelock_held(struct drm_i915_private *dev_priv)

{

	assert_rpm_device_not_suspended(dev_priv);

	WARN_ONCE(!atomic_read(&dev_priv->pm.wakeref_count),

	WARN_ONCE(!atomic_read(&dev_priv->runtime_pm.wakeref_count),

		  "RPM wakelock ref not held during HW access");

}
@@ -1823,7 +1823,7 @@ assert_rpm_wakelock_held(struct drm_i915_private *dev_priv) 
static inline void

disable_rpm_wakeref_asserts(struct drm_i915_private *dev_priv)

{

	atomic_inc(&dev_priv->pm.wakeref_count);

	atomic_inc(&dev_priv->runtime_pm.wakeref_count);

}



/**
@@ -1840,7 +1840,7 @@ disable_rpm_wakeref_asserts(struct drm_i915_private *dev_priv) 
static inline void

enable_rpm_wakeref_asserts(struct drm_i915_private *dev_priv)

{

	atomic_dec(&dev_priv->pm.wakeref_count);

	atomic_dec(&dev_priv->runtime_pm.wakeref_count);

}



void intel_runtime_pm_get(struct drm_i915_private *dev_priv);