UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Sagar 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: Chris 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: Imre Deak <imre.deak@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171010213010.7415-6-chris@chris-wilson.co.uk
This commit is contained in:
Sagar Arun Kamble 2017-10-10 22:30:04 +01:00 committed by Chris Wilson
parent d46b00dc38
commit ad1443f0f3
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/i915_drv.c
View File

@ -2544,12 +2544,12 @@ static int intel_runtime_suspend(struct device *kdev)
intel_uncore_suspend(dev_priv); intel_uncore_suspend(dev_priv);
enable_rpm_wakeref_asserts(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)) if (intel_uncore_arm_unclaimed_mmio_detection(dev_priv))
DRM_ERROR("Unclaimed access detected prior to suspending\n"); 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 * 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"); 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); disable_rpm_wakeref_asserts(dev_priv);
intel_opregion_notify_adapter(dev_priv, PCI_D0); 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)) if (intel_uncore_unclaimed_mmio(dev_priv))
DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n"); DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");

2
drivers/gpu/drm/i915/i915_drv.h
View File

@ -2533,7 +2533,7 @@ struct drm_i915_private {
bool distrust_bios_wm; bool distrust_bios_wm;
} wm; } wm;
struct i915_runtime_pm pm; struct i915_runtime_pm runtime_pm;
struct { struct {
bool initialized; bool initialized;

4
drivers/gpu/drm/i915/i915_gpu_error.c
View File

@ -1674,8 +1674,8 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv,
struct i915_gpu_state *error) struct i915_gpu_state *error)
{ {
error->awake = dev_priv->gt.awake; error->awake = dev_priv->gt.awake;
error->wakelock = atomic_read(&dev_priv->pm.wakeref_count); error->wakelock = atomic_read(&dev_priv->runtime_pm.wakeref_count);
error->suspended = dev_priv->pm.suspended; error->suspended = dev_priv->runtime_pm.suspended;
error->iommu = -1; error->iommu = -1;
#ifdef CONFIG_INTEL_IOMMU #ifdef CONFIG_INTEL_IOMMU

8
drivers/gpu/drm/i915/i915_irq.c
View File

@ -4173,7 +4173,7 @@ int intel_irq_install(struct drm_i915_private *dev_priv)
* interrupts as enabled _before_ actually enabling them to avoid * interrupts as enabled _before_ actually enabling them to avoid
* special cases in our ordering checks. * 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); 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); drm_irq_uninstall(&dev_priv->drm);
intel_hpd_cancel_work(dev_priv); 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) void intel_runtime_pm_disable_interrupts(struct drm_i915_private *dev_priv)
{ {
dev_priv->drm.driver->irq_uninstall(&dev_priv->drm); 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); 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) 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_preinstall(&dev_priv->drm);
dev_priv->drm.driver->irq_postinstall(&dev_priv->drm); dev_priv->drm.driver->irq_postinstall(&dev_priv->drm);
} }

10
drivers/gpu/drm/i915/intel_drv.h
View File

@ -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 * We only use drm_irq_uninstall() at unload and VT switch, so
* this is the only thing we need to check. * 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); 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 static inline void
assert_rpm_device_not_suspended(struct drm_i915_private *dev_priv) 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"); "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_wakelock_held(struct drm_i915_private *dev_priv)
{ {
assert_rpm_device_not_suspended(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"); "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 static inline void
disable_rpm_wakeref_asserts(struct drm_i915_private *dev_priv) 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 static inline void
enable_rpm_wakeref_asserts(struct drm_i915_private *dev_priv) 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); void intel_runtime_pm_get(struct drm_i915_private *dev_priv);

4
drivers/gpu/drm/i915/intel_pm.c
View File

@ -9350,8 +9350,8 @@ void intel_pm_setup(struct drm_i915_private *dev_priv)
__intel_autoenable_gt_powersave); __intel_autoenable_gt_powersave);
atomic_set(&dev_priv->rps.num_waiters, 0); atomic_set(&dev_priv->rps.num_waiters, 0);
dev_priv->pm.suspended = false; dev_priv->runtime_pm.suspended = false;
atomic_set(&dev_priv->pm.wakeref_count, 0); atomic_set(&dev_priv->runtime_pm.wakeref_count, 0);
} }
static u64 vlv_residency_raw(struct drm_i915_private *dev_priv, static u64 vlv_residency_raw(struct drm_i915_private *dev_priv,

10
drivers/gpu/drm/i915/intel_runtime_pm.c
View File

@ -187,7 +187,7 @@ bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
struct i915_power_well *power_well; struct i915_power_well *power_well;
bool is_enabled; bool is_enabled;
if (dev_priv->pm.suspended) if (dev_priv->runtime_pm.suspended)
return false; return false;
is_enabled = true; is_enabled = true;
@ -3128,7 +3128,7 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
ret = pm_runtime_get_sync(kdev); ret = pm_runtime_get_sync(kdev);
WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret); WARN_ONCE(ret < 0, "pm_runtime_get_sync() failed: %d\n", ret);
atomic_inc(&dev_priv->pm.wakeref_count); atomic_inc(&dev_priv->runtime_pm.wakeref_count);
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
} }
@ -3162,7 +3162,7 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
return false; return false;
} }
atomic_inc(&dev_priv->pm.wakeref_count); atomic_inc(&dev_priv->runtime_pm.wakeref_count);
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
return true; return true;
@ -3193,7 +3193,7 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
pm_runtime_get_noresume(kdev); pm_runtime_get_noresume(kdev);
atomic_inc(&dev_priv->pm.wakeref_count); atomic_inc(&dev_priv->runtime_pm.wakeref_count);
} }
/** /**
@ -3210,7 +3210,7 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
struct device *kdev = &pdev->dev; struct device *kdev = &pdev->dev;
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
atomic_dec(&dev_priv->pm.wakeref_count); atomic_dec(&dev_priv->runtime_pm.wakeref_count);
pm_runtime_mark_last_busy(kdev); pm_runtime_mark_last_busy(kdev);
pm_runtime_put_autosuspend(kdev); pm_runtime_put_autosuspend(kdev);