Commit 888d0d42 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter

drm/i915: add dev_to_i915 helper

This will be needed by later patches, so factor it out.

No functional change.

v2:
- s/dev_to_i915_priv/dev_to_i915/ (Jani)
- don't use the helper in i915_pm_suspend (Chris)
- simplify the helper (Chris)
v3:
- remove redundant upcasting in the helper (Daniel)
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent eaa27f34
...@@ -940,8 +940,7 @@ static int i915_pm_suspend(struct device *dev) ...@@ -940,8 +940,7 @@ static int i915_pm_suspend(struct device *dev)
static int i915_pm_suspend_late(struct device *dev) static int i915_pm_suspend_late(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = dev_to_i915(dev)->dev;
struct drm_device *drm_dev = pci_get_drvdata(pdev);
/* /*
* We have a suspedn ordering issue with the snd-hda driver also * We have a suspedn ordering issue with the snd-hda driver also
...@@ -960,8 +959,7 @@ static int i915_pm_suspend_late(struct device *dev) ...@@ -960,8 +959,7 @@ static int i915_pm_suspend_late(struct device *dev)
static int i915_pm_resume_early(struct device *dev) static int i915_pm_resume_early(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = dev_to_i915(dev)->dev;
struct drm_device *drm_dev = pci_get_drvdata(pdev);
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
...@@ -971,8 +969,7 @@ static int i915_pm_resume_early(struct device *dev) ...@@ -971,8 +969,7 @@ static int i915_pm_resume_early(struct device *dev)
static int i915_pm_resume(struct device *dev) static int i915_pm_resume(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = dev_to_i915(dev)->dev;
struct drm_device *drm_dev = pci_get_drvdata(pdev);
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
......
...@@ -1781,6 +1781,11 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) ...@@ -1781,6 +1781,11 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
return dev->dev_private; return dev->dev_private;
} }
static inline struct drm_i915_private *dev_to_i915(struct device *dev)
{
return to_i915(dev_get_drvdata(dev));
}
/* Iterate over initialised rings */ /* Iterate over initialised rings */
#define for_each_ring(ring__, dev_priv__, i__) \ #define for_each_ring(ring__, dev_priv__, i__) \
for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \ for ((i__) = 0; (i__) < I915_NUM_RINGS; (i__)++) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment