mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
drm/i915: Remove runtime suspended boolean from intel_runtime_pm struct
It's not necessary to carry separate suspended status information in intel_runtime_pm struct as this information is already in underlying device structure. Remove it and use pm_runtime_suspended() to obtain suspended status information when needed. Cc: Jani Nikula <jani.nikula@intel.com> Cc: Imre Deak <imre.deak@intel.com> Signed-off-by: Jouni Högander <jouni.hogander@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230913100430.3433969-1-jouni.hogander@intel.com
This commit is contained in:
parent
93caca6a04
commit
8874288c80
5 changed files with 4 additions and 8 deletions
|
@ -216,7 +216,7 @@ bool __intel_display_power_is_enabled(struct drm_i915_private *dev_priv,
|
|||
struct i915_power_well *power_well;
|
||||
bool is_enabled;
|
||||
|
||||
if (dev_priv->runtime_pm.suspended)
|
||||
if (pm_runtime_suspended(dev_priv->drm.dev))
|
||||
return false;
|
||||
|
||||
is_enabled = true;
|
||||
|
|
|
@ -1571,8 +1571,6 @@ static int intel_runtime_suspend(struct device *kdev)
|
|||
if (root_pdev)
|
||||
pci_d3cold_disable(root_pdev);
|
||||
|
||||
rpm->suspended = true;
|
||||
|
||||
/*
|
||||
* FIXME: We really should find a document that references the arguments
|
||||
* used below!
|
||||
|
@ -1623,7 +1621,6 @@ static int intel_runtime_resume(struct device *kdev)
|
|||
disable_rpm_wakeref_asserts(rpm);
|
||||
|
||||
intel_opregion_notify_adapter(dev_priv, PCI_D0);
|
||||
rpm->suspended = false;
|
||||
|
||||
root_pdev = pcie_find_root_port(pdev);
|
||||
if (root_pdev)
|
||||
|
|
|
@ -1972,7 +1972,7 @@ static void capture_gen(struct i915_gpu_coredump *error)
|
|||
struct drm_i915_private *i915 = error->i915;
|
||||
|
||||
error->wakelock = atomic_read(&i915->runtime_pm.wakeref_count);
|
||||
error->suspended = i915->runtime_pm.suspended;
|
||||
error->suspended = pm_runtime_suspended(i915->drm.dev);
|
||||
|
||||
error->iommu = i915_vtd_active(i915);
|
||||
error->reset_count = i915_reset_count(&i915->gpu_error);
|
||||
|
|
|
@ -652,7 +652,6 @@ void intel_runtime_pm_init_early(struct intel_runtime_pm *rpm)
|
|||
|
||||
rpm->kdev = kdev;
|
||||
rpm->available = HAS_RUNTIME_PM(i915);
|
||||
rpm->suspended = false;
|
||||
atomic_set(&rpm->wakeref_count, 0);
|
||||
|
||||
init_intel_runtime_pm_wakeref(rpm);
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#ifndef __INTEL_RUNTIME_PM_H__
|
||||
#define __INTEL_RUNTIME_PM_H__
|
||||
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include "intel_wakeref.h"
|
||||
|
@ -43,7 +44,6 @@ struct intel_runtime_pm {
|
|||
atomic_t wakeref_count;
|
||||
struct device *kdev; /* points to i915->drm.dev */
|
||||
bool available;
|
||||
bool suspended;
|
||||
bool irqs_enabled;
|
||||
bool no_wakeref_tracking;
|
||||
|
||||
|
@ -110,7 +110,7 @@ intel_rpm_wakelock_count(int wakeref_count)
|
|||
static inline void
|
||||
assert_rpm_device_not_suspended(struct intel_runtime_pm *rpm)
|
||||
{
|
||||
WARN_ONCE(rpm->suspended,
|
||||
WARN_ONCE(pm_runtime_suspended(rpm->kdev),
|
||||
"Device suspended during HW access\n");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue