Skip to content

L
linux
Commit c49d13ee authored by David Weinehall's avatar David Weinehall Committed by Chris Wilson
Browse files
Options

drm/i915: consistent struct device naming 

We currently have a mix of struct device *device, struct device *kdev,
and struct device *dev (the latter forcing us to refer to
struct drm_device as something else than the normal dev).

To simplify things, always use kdev when referring to struct device.

v2: Replace the dev_to_drm_minor() macro with the inline function
    kdev_to_drm_minor().
Signed-off-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160822103245.24069-3-david.weinehall@linux.intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 351c3b53
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 126 deletions
drivers/gpu/drm/i915/i915_drv.c
View file @ c49d13ee
...@@ -77,7 +77,7 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, ...@@ -77,7 +77,7 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
const char *fmt, ...) const char *fmt, ...)
{ {
static bool shown_bug_once; static bool shown_bug_once;
struct device *dev = dev_priv->drm.dev; struct device *kdev = dev_priv->drm.dev;
bool is_error = level[1] <= KERN_ERR[1]; bool is_error = level[1] <= KERN_ERR[1];
bool is_debug = level[1] == KERN_DEBUG[1]; bool is_debug = level[1] == KERN_DEBUG[1];
struct va_format vaf; struct va_format vaf;
...@@ -91,11 +91,11 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, ...@@ -91,11 +91,11 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
dev_printk(level, dev, "[" DRM_NAME ":%ps] %pV", dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
__builtin_return_address(0), &vaf); __builtin_return_address(0), &vaf);
if (is_error && !shown_bug_once) { if (is_error && !shown_bug_once) {
dev_notice(dev, "%s", FDO_BUG_MSG); dev_notice(kdev, "%s", FDO_BUG_MSG);
shown_bug_once = true; shown_bug_once = true;
} }
...@@ -1462,9 +1462,9 @@ static int i915_drm_suspend(struct drm_device *dev) ...@@ -1462,9 +1462,9 @@ static int i915_drm_suspend(struct drm_device *dev)
return error; return error;
} }
static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
{ {
struct drm_i915_private *dev_priv = to_i915(drm_dev); struct drm_i915_private *dev_priv = to_i915(dev);
bool fw_csr; bool fw_csr;
int ret; int ret;
...@@ -1498,7 +1498,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) ...@@ -1498,7 +1498,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)
goto out; goto out;
} }
pci_disable_device(drm_dev->pdev); pci_disable_device(dev->pdev);
/* /*
* During hibernation on some platforms the BIOS may try to access * During hibernation on some platforms the BIOS may try to access
* the device even though it's already in D3 and hang the machine. So * the device even though it's already in D3 and hang the machine. So
...@@ -1512,7 +1512,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation) ...@@ -1512,7 +1512,7 @@ static int i915_drm_suspend_late(struct drm_device *drm_dev, bool hibernation)
* Acer Aspire 1830T * Acer Aspire 1830T
*/ */
if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6)) if (!(hibernation && INTEL_INFO(dev_priv)->gen < 6))
pci_set_power_state(drm_dev->pdev, PCI_D3hot); pci_set_power_state(dev->pdev, PCI_D3hot);
dev_priv->suspended_to_idle = suspend_to_idle(dev_priv); dev_priv->suspended_to_idle = suspend_to_idle(dev_priv);
...@@ -1810,25 +1810,25 @@ int i915_reset(struct drm_i915_private *dev_priv) ...@@ -1810,25 +1810,25 @@ int i915_reset(struct drm_i915_private *dev_priv)
return ret; return ret;
} }
static int i915_pm_suspend(struct device *dev) static int i915_pm_suspend(struct device *kdev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(kdev);
struct drm_device *drm_dev = pci_get_drvdata(pdev); struct drm_device *dev = pci_get_drvdata(pdev);
if (!drm_dev) { if (!dev) {
dev_err(dev, "DRM not initialized, aborting suspend.\n"); dev_err(kdev, "DRM not initialized, aborting suspend.\n");
return -ENODEV; return -ENODEV;
} }
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_drm_suspend(drm_dev); return i915_drm_suspend(dev);
} }
static int i915_pm_suspend_late(struct device *dev) static int i915_pm_suspend_late(struct device *kdev)
{ {
struct drm_device *drm_dev = &dev_to_i915(dev)->drm; struct drm_device *dev = &kdev_to_i915(kdev)->drm;
/* /*
* We have a suspend ordering issue with the snd-hda driver also * We have a suspend ordering issue with the snd-hda driver also
...@@ -1839,57 +1839,57 @@ static int i915_pm_suspend_late(struct device *dev) ...@@ -1839,57 +1839,57 @@ static int i915_pm_suspend_late(struct device *dev)
* FIXME: This should be solved with a special hdmi sink device or * FIXME: This should be solved with a special hdmi sink device or
* similar so that power domains can be employed. * similar so that power domains can be employed.
*/ */
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_drm_suspend_late(drm_dev, false); return i915_drm_suspend_late(dev, false);
} }
static int i915_pm_poweroff_late(struct device *dev) static int i915_pm_poweroff_late(struct device *kdev)
{ {
struct drm_device *drm_dev = &dev_to_i915(dev)->drm; struct drm_device *dev = &kdev_to_i915(kdev)->drm;
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_drm_suspend_late(drm_dev, true); return i915_drm_suspend_late(dev, true);
} }
static int i915_pm_resume_early(struct device *dev) static int i915_pm_resume_early(struct device *kdev)
{ {
struct drm_device *drm_dev = &dev_to_i915(dev)->drm; struct drm_device *dev = &kdev_to_i915(kdev)->drm;
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_drm_resume_early(drm_dev); return i915_drm_resume_early(dev);
} }
static int i915_pm_resume(struct device *dev) static int i915_pm_resume(struct device *kdev)
{ {
struct drm_device *drm_dev = &dev_to_i915(dev)->drm; struct drm_device *dev = &kdev_to_i915(kdev)->drm;
if (drm_dev->switch_power_state == DRM_SWITCH_POWER_OFF) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0; return 0;
return i915_drm_resume(drm_dev); return i915_drm_resume(dev);
} }
/* freeze: before creating the hibernation_image */ /* freeze: before creating the hibernation_image */
static int i915_pm_freeze(struct device *dev) static int i915_pm_freeze(struct device *kdev)
{ {
return i915_pm_suspend(dev); return i915_pm_suspend(kdev);
} }
static int i915_pm_freeze_late(struct device *dev) static int i915_pm_freeze_late(struct device *kdev)
{ {
int ret; int ret;
ret = i915_pm_suspend_late(dev); ret = i915_pm_suspend_late(kdev);
if (ret) if (ret)
return ret; return ret;
ret = i915_gem_freeze_late(dev_to_i915(dev)); ret = i915_gem_freeze_late(kdev_to_i915(kdev));
if (ret) if (ret)
return ret; return ret;
...@@ -1897,25 +1897,25 @@ static int i915_pm_freeze_late(struct device *dev) ...@@ -1897,25 +1897,25 @@ static int i915_pm_freeze_late(struct device *dev)
} }
/* thaw: called after creating the hibernation image, but before turning off. */ /* thaw: called after creating the hibernation image, but before turning off. */
static int i915_pm_thaw_early(struct device *dev) static int i915_pm_thaw_early(struct device *kdev)
{ {
return i915_pm_resume_early(dev); return i915_pm_resume_early(kdev);
} }
static int i915_pm_thaw(struct device *dev) static int i915_pm_thaw(struct device *kdev)
{ {
return i915_pm_resume(dev); return i915_pm_resume(kdev);
} }
/* restore: called after loading the hibernation image. */ /* restore: called after loading the hibernation image. */
static int i915_pm_restore_early(struct device *dev) static int i915_pm_restore_early(struct device *kdev)
{ {
return i915_pm_resume_early(dev); return i915_pm_resume_early(kdev);
} }
static int i915_pm_restore(struct device *dev) static int i915_pm_restore(struct device *kdev)
{ {
return i915_pm_resume(dev); return i915_pm_resume(kdev);
} }
/* /*
...@@ -2277,9 +2277,9 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv, ...@@ -2277,9 +2277,9 @@ static int vlv_resume_prepare(struct drm_i915_private *dev_priv,
return ret; return ret;
} }
static int intel_runtime_suspend(struct device *device) static int intel_runtime_suspend(struct device *kdev)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(kdev);
struct drm_device *dev = pci_get_drvdata(pdev); struct drm_device *dev = pci_get_drvdata(pdev);
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
int ret; int ret;
...@@ -2305,7 +2305,7 @@ static int intel_runtime_suspend(struct device *device) ...@@ -2305,7 +2305,7 @@ static int intel_runtime_suspend(struct device *device)
* Bump the expiration timestamp, otherwise the suspend won't * Bump the expiration timestamp, otherwise the suspend won't
* be rescheduled. * be rescheduled.
*/ */
pm_runtime_mark_last_busy(device); pm_runtime_mark_last_busy(kdev);
return -EAGAIN; return -EAGAIN;
} }
...@@ -2384,9 +2384,9 @@ static int intel_runtime_suspend(struct device *device) ...@@ -2384,9 +2384,9 @@ static int intel_runtime_suspend(struct device *device)
return 0; return 0;
} }
static int intel_runtime_resume(struct device *device) static int intel_runtime_resume(struct device *kdev)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(kdev);
struct drm_device *dev = pci_get_drvdata(pdev); struct drm_device *dev = pci_get_drvdata(pdev);
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
int ret = 0; int ret = 0;
......
drivers/gpu/drm/i915/i915_drv.h
View file @ c49d13ee
...@@ -2064,9 +2064,9 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev) ...@@ -2064,9 +2064,9 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
return container_of(dev, struct drm_i915_private, drm); return container_of(dev, struct drm_i915_private, drm);
} }
static inline struct drm_i915_private *dev_to_i915(struct device *dev) static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)
{ {
return to_i915(dev_get_drvdata(dev)); return to_i915(dev_get_drvdata(kdev));
} }
static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc)
......
drivers/gpu/drm/i915/i915_gem_gtt.c
View file @ c49d13ee
...@@ -326,16 +326,16 @@ static gen6_pte_t iris_pte_encode(dma_addr_t addr, ...@@ -326,16 +326,16 @@ static gen6_pte_t iris_pte_encode(dma_addr_t addr,
static int __setup_page_dma(struct drm_device *dev, static int __setup_page_dma(struct drm_device *dev,
struct i915_page_dma *p, gfp_t flags) struct i915_page_dma *p, gfp_t flags)
{ {
struct device *device = &dev->pdev->dev; struct device *kdev = &dev->pdev->dev;
p->page = alloc_page(flags); p->page = alloc_page(flags);
if (!p->page) if (!p->page)
return -ENOMEM; return -ENOMEM;
p->daddr = dma_map_page(device, p->daddr = dma_map_page(kdev,
p->page, 0, 4096, PCI_DMA_BIDIRECTIONAL); p->page, 0, 4096, PCI_DMA_BIDIRECTIONAL);
if (dma_mapping_error(device, p->daddr)) { if (dma_mapping_error(kdev, p->daddr)) {
__free_page(p->page); __free_page(p->page);
return -EINVAL; return -EINVAL;
} }
......
drivers/gpu/drm/i915/i915_sysfs.c
View file @ c49d13ee
...@@ -32,7 +32,10 @@ ...@@ -32,7 +32,10 @@
#include "intel_drv.h" #include "intel_drv.h"
#include "i915_drv.h" #include "i915_drv.h"
#define dev_to_drm_minor(d) dev_get_drvdata((d)) static inline struct drm_minor *kdev_to_drm_minor(struct device *kdev)
{
return dev_get_drvdata(kdev);
}
#ifdef CONFIG_PM #ifdef CONFIG_PM
static u32 calc_residency(struct drm_device *dev, static u32 calc_residency(struct drm_device *dev,
...@@ -84,7 +87,7 @@ show_rc6_ms(struct device *kdev, struct device_attribute *attr, char *buf) ...@@ -84,7 +87,7 @@ show_rc6_ms(struct device *kdev, struct device_attribute *attr, char *buf)
static ssize_t static ssize_t
show_rc6p_ms(struct device *kdev, struct device_attribute *attr, char *buf) show_rc6p_ms(struct device *kdev, struct device_attribute *attr, char *buf)
{ {
struct drm_minor *dminor = dev_to_drm_minor(kdev); struct drm_minor *dminor = kdev_to_drm_minor(kdev);
u32 rc6p_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6p); u32 rc6p_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6p);
return snprintf(buf, PAGE_SIZE, "%u\n", rc6p_residency); return snprintf(buf, PAGE_SIZE, "%u\n", rc6p_residency);
} }
...@@ -92,7 +95,7 @@ show_rc6p_ms(struct device *kdev, struct device_attribute *attr, char *buf) ...@@ -92,7 +95,7 @@ show_rc6p_ms(struct device *kdev, struct device_attribute *attr, char *buf)
static ssize_t static ssize_t
show_rc6pp_ms(struct device *kdev, struct device_attribute *attr, char *buf) show_rc6pp_ms(struct device *kdev, struct device_attribute *attr, char *buf)
{ {
struct drm_minor *dminor = dev_to_drm_minor(kdev); struct drm_minor *dminor = kdev_to_drm_minor(kdev);
u32 rc6pp_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6pp); u32 rc6pp_residency = calc_residency(dminor->dev, GEN6_GT_GFX_RC6pp);
return snprintf(buf, PAGE_SIZE, "%u\n", rc6pp_residency); return snprintf(buf, PAGE_SIZE, "%u\n", rc6pp_residency);
} }
...@@ -163,22 +166,22 @@ i915_l3_read(struct file *filp, struct kobject *kobj, ...@@ -163,22 +166,22 @@ i915_l3_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t offset, size_t count) loff_t offset, size_t count)
{ {
struct device *dev = kobj_to_dev(kobj); struct device *kdev = kobj_to_dev(kobj);
struct drm_minor *dminor = dev_to_drm_minor(dev); struct drm_minor *dminor = kdev_to_drm_minor(kdev);
struct drm_device *drm_dev = dminor->dev; struct drm_device *dev = dminor->dev;
struct drm_i915_private *dev_priv = to_i915(drm_dev); struct drm_i915_private *dev_priv = to_i915(dev);
int slice = (int)(uintptr_t)attr->private; int slice = (int)(uintptr_t)attr->private;
int ret; int ret;
count = round_down(count, 4); count = round_down(count, 4);
ret = l3_access_valid(drm_dev, offset); ret = l3_access_valid(dev, offset);
if (ret) if (ret)
return ret; return ret;
count = min_t(size_t, GEN7_L3LOG_SIZE - offset, count); count = min_t(size_t, GEN7_L3LOG_SIZE - offset, count);
ret = i915_mutex_lock_interruptible(drm_dev); ret = i915_mutex_lock_interruptible(dev);
if (ret) if (ret)
return ret; return ret;
...@@ -189,7 +192,7 @@ i915_l3_read(struct file *filp, struct kobject *kobj, ...@@ -189,7 +192,7 @@ i915_l3_read(struct file *filp, struct kobject *kobj,
else else
memset(buf, 0, count); memset(buf, 0, count);
mutex_unlock(&drm_dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return count; return count;
} }
...@@ -199,30 +202,30 @@ i915_l3_write(struct file *filp, struct kobject *kobj, ...@@ -199,30 +202,30 @@ i915_l3_write(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr, char *buf, struct bin_attribute *attr, char *buf,
loff_t offset, size_t count) loff_t offset, size_t count)
{ {
struct device *dev = kobj_to_dev(kobj); struct device *kdev = kobj_to_dev(kobj);
struct drm_minor *dminor = dev_to_drm_minor(dev); struct drm_minor *dminor = kdev_to_drm_minor(kdev);
struct drm_device *drm_dev = dminor->dev; struct drm_device *dev = dminor->dev;
struct drm_i915_private *dev_priv = to_i915(drm_dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct i915_gem_context *ctx; struct i915_gem_context *ctx;
u32 *temp = NULL; /* Just here to make handling failures easy */ u32 *temp = NULL; /* Just here to make handling failures easy */
int slice = (int)(uintptr_t)attr->private; int slice = (int)(uintptr_t)attr->private;
int ret; int ret;
if (!HAS_HW_CONTEXTS(drm_dev)) if (!HAS_HW_CONTEXTS(dev))
return -ENXIO; return -ENXIO;
ret = l3_access_valid(drm_dev, offset); ret = l3_access_valid(dev, offset);
if (ret) if (ret)
return ret; return ret;
ret = i915_mutex_lock_interruptible(drm_dev); ret = i915_mutex_lock_interruptible(dev);
if (ret) if (ret)
return ret; return ret;
if (!dev_priv->l3_parity.remap_info[slice]) { if (!dev_priv->l3_parity.remap_info[slice]) {
temp = kzalloc(GEN7_L3LOG_SIZE, GFP_KERNEL); temp = kzalloc(GEN7_L3LOG_SIZE, GFP_KERNEL);
if (!temp) { if (!temp) {
mutex_unlock(&drm_dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return -ENOMEM; return -ENOMEM;
} }
} }
...@@ -240,7 +243,7 @@ i915_l3_write(struct file *filp, struct kobject *kobj, ...@@ -240,7 +243,7 @@ i915_l3_write(struct file *filp, struct kobject *kobj,
list_for_each_entry(ctx, &dev_priv->context_list, link) list_for_each_entry(ctx, &dev_priv->context_list, link)
ctx->remap_slice |= (1<<slice); ctx->remap_slice |= (1<<slice);
mutex_unlock(&drm_dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return count; return count;
} }
...@@ -266,7 +269,7 @@ static struct bin_attribute dpf_attrs_1 = { ...@@ -266,7 +269,7 @@ static struct bin_attribute dpf_attrs_1 = {
static ssize_t gt_act_freq_mhz_show(struct device *kdev, static ssize_t gt_act_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
int ret; int ret;
...@@ -298,7 +301,7 @@ static ssize_t gt_act_freq_mhz_show(struct device *kdev, ...@@ -298,7 +301,7 @@ static ssize_t gt_act_freq_mhz_show(struct device *kdev,
static ssize_t gt_cur_freq_mhz_show(struct device *kdev, static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
...@@ -309,7 +312,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev, ...@@ -309,7 +312,7 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
static ssize_t gt_boost_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) static ssize_t gt_boost_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_i915_private *dev_priv = to_i915(minor->dev); struct drm_i915_private *dev_priv = to_i915(minor->dev);
return snprintf(buf, PAGE_SIZE, "%d\n", return snprintf(buf, PAGE_SIZE, "%d\n",
...@@ -321,7 +324,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev, ...@@ -321,7 +324,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
u32 val; u32 val;
...@@ -346,7 +349,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev, ...@@ -346,7 +349,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev, static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
...@@ -357,7 +360,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev, ...@@ -357,7 +360,7 @@ static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
...@@ -370,7 +373,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev, ...@@ -370,7 +373,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
u32 val; u32 val;
...@@ -418,7 +421,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev, ...@@ -418,7 +421,7 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev,
static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) static ssize_t gt_min_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
...@@ -431,7 +434,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev, ...@@ -431,7 +434,7 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
u32 val; u32 val;
...@@ -490,7 +493,7 @@ static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL); ...@@ -490,7 +493,7 @@ static DEVICE_ATTR(gt_RPn_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
/* For now we have a static number of RP states */ /* For now we have a static number of RP states */
static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf) static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
{ {
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
u32 val; u32 val;
...@@ -538,7 +541,7 @@ static ssize_t error_state_read(struct file *filp, struct kobject *kobj, ...@@ -538,7 +541,7 @@ static ssize_t error_state_read(struct file *filp, struct kobject *kobj,
{ {
struct device *kdev = kobj_to_dev(kobj); struct device *kdev = kobj_to_dev(kobj);
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
struct i915_error_state_file_priv error_priv; struct i915_error_state_file_priv error_priv;
struct drm_i915_error_state_buf error_str; struct drm_i915_error_state_buf error_str;
...@@ -573,7 +576,7 @@ static ssize_t error_state_write(struct file *file, struct kobject *kobj, ...@@ -573,7 +576,7 @@ static ssize_t error_state_write(struct file *file, struct kobject *kobj,
loff_t off, size_t count) loff_t off, size_t count)
{ {
struct device *kdev = kobj_to_dev(kobj); struct device *kdev = kobj_to_dev(kobj);
struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_minor *minor = kdev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev; struct drm_device *dev = minor->dev;
int ret; int ret;
......
drivers/gpu/drm/i915/intel_audio.c
View file @ c49d13ee
...@@ -581,26 +581,26 @@ void intel_init_audio_hooks(struct drm_i915_private *dev_priv) ...@@ -581,26 +581,26 @@ void intel_init_audio_hooks(struct drm_i915_private *dev_priv)
} }
} }
static void i915_audio_component_get_power(struct device *dev) static void i915_audio_component_get_power(struct device *kdev)
{ {
intel_display_power_get(dev_to_i915(dev), POWER_DOMAIN_AUDIO); intel_display_power_get(kdev_to_i915(kdev), POWER_DOMAIN_AUDIO);
} }
static void i915_audio_component_put_power(struct device *dev) static void i915_audio_component_put_power(struct device *kdev)
{ {
intel_display_power_put(dev_to_i915(dev), POWER_DOMAIN_AUDIO); intel_display_power_put(kdev_to_i915(kdev), POWER_DOMAIN_AUDIO);
} }
static void i915_audio_component_codec_wake_override(struct device *dev, static void i915_audio_component_codec_wake_override(struct device *kdev,
bool enable) bool enable)
{ {
struct drm_i915_private *dev_priv = dev_to_i915(dev); struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
u32 tmp; u32 tmp;
if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv)) if (!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv))
return; return;
i915_audio_component_get_power(dev); i915_audio_component_get_power(kdev);
/* /*
* Enable/disable generating the codec wake signal, overriding the * Enable/disable generating the codec wake signal, overriding the
...@@ -618,13 +618,13 @@ static void i915_audio_component_codec_wake_override(struct device *dev, ...@@ -618,13 +618,13 @@ static void i915_audio_component_codec_wake_override(struct device *dev,
usleep_range(1000, 1500); usleep_range(1000, 1500);
} }
i915_audio_component_put_power(dev); i915_audio_component_put_power(kdev);
} }
/* Get CDCLK in kHz */ /* Get CDCLK in kHz */
static int i915_audio_component_get_cdclk_freq(struct device *dev) static int i915_audio_component_get_cdclk_freq(struct device *kdev)
{ {
struct drm_i915_private *dev_priv = dev_to_i915(dev); struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
if (WARN_ON_ONCE(!HAS_DDI(dev_priv))) if (WARN_ON_ONCE(!HAS_DDI(dev_priv)))
return -ENODEV; return -ENODEV;
...@@ -632,10 +632,10 @@ static int i915_audio_component_get_cdclk_freq(struct device *dev) ...@@ -632,10 +632,10 @@ static int i915_audio_component_get_cdclk_freq(struct device *dev)
return dev_priv->cdclk_freq; return dev_priv->cdclk_freq;
} }
static int i915_audio_component_sync_audio_rate(struct device *dev, static int i915_audio_component_sync_audio_rate(struct device *kdev,
int port, int rate) int port, int rate)
{ {
struct drm_i915_private *dev_priv = dev_to_i915(dev); struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
struct intel_encoder *intel_encoder; struct intel_encoder *intel_encoder;
struct intel_crtc *crtc; struct intel_crtc *crtc;
struct drm_display_mode *mode; struct drm_display_mode *mode;
...@@ -652,7 +652,7 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, ...@@ -652,7 +652,7 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
!IS_HASWELL(dev_priv)) !IS_HASWELL(dev_priv))
return 0; return 0;
i915_audio_component_get_power(dev); i915_audio_component_get_power(kdev);
mutex_lock(&dev_priv->av_mutex); mutex_lock(&dev_priv->av_mutex);
/* 1. get the pipe */ /* 1. get the pipe */
intel_encoder = dev_priv->dig_port_map[port]; intel_encoder = dev_priv->dig_port_map[port];
...@@ -703,15 +703,15 @@ static int i915_audio_component_sync_audio_rate(struct device *dev, ...@@ -703,15 +703,15 @@ static int i915_audio_component_sync_audio_rate(struct device *dev,
unlock: unlock:
mutex_unlock(&dev_priv->av_mutex); mutex_unlock(&dev_priv->av_mutex);
i915_audio_component_put_power(dev); i915_audio_component_put_power(kdev);
return err; return err;
} }
static int i915_audio_component_get_eld(struct device *dev, int port, static int i915_audio_component_get_eld(struct device *kdev, int port,
bool *enabled, bool *enabled,
unsigned char *buf, int max_bytes) unsigned char *buf, int max_bytes)
{ {
struct drm_i915_private *dev_priv = dev_to_i915(dev); struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
struct intel_encoder *intel_encoder; struct intel_encoder *intel_encoder;
struct intel_digital_port *intel_dig_port; struct intel_digital_port *intel_dig_port;
const u8 *eld; const u8 *eld;
...@@ -745,11 +745,11 @@ static const struct i915_audio_component_ops i915_audio_component_ops = { ...@@ -745,11 +745,11 @@ static const struct i915_audio_component_ops i915_audio_component_ops = {
.get_eld = i915_audio_component_get_eld, .get_eld = i915_audio_component_get_eld,
}; };
static int i915_audio_component_bind(struct device *i915_dev, static int i915_audio_component_bind(struct device *i915_kdev,
struct device *hda_dev, void *data) struct device *hda_kdev, void *data)
{ {
struct i915_audio_component *acomp = data; struct i915_audio_component *acomp = data;
struct drm_i915_private *dev_priv = dev_to_i915(i915_dev); struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
int i; int i;
if (WARN_ON(acomp->ops || acomp->dev)) if (WARN_ON(acomp->ops || acomp->dev))
...@@ -757,7 +757,7 @@ static int i915_audio_component_bind(struct device *i915_dev, ...@@ -757,7 +757,7 @@ static int i915_audio_component_bind(struct device *i915_dev,
drm_modeset_lock_all(&dev_priv->drm); drm_modeset_lock_all(&dev_priv->drm);
acomp->ops = &i915_audio_component_ops; acomp->ops = &i915_audio_component_ops;
acomp->dev = i915_dev; acomp->dev = i915_kdev;
BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS); BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS);
for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++) for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++)
acomp->aud_sample_rate[i] = 0; acomp->aud_sample_rate[i] = 0;
...@@ -767,11 +767,11 @@ static int i915_audio_component_bind(struct device *i915_dev, ...@@ -767,11 +767,11 @@ static int i915_audio_component_bind(struct device *i915_dev,
return 0; return 0;
} }
static void i915_audio_component_unbind(struct device *i915_dev, static void i915_audio_component_unbind(struct device *i915_kdev,
struct device *hda_dev, void *data) struct device *hda_kdev, void *data)
{ {
struct i915_audio_component *acomp = data; struct i915_audio_component *acomp = data;
struct drm_i915_private *dev_priv = dev_to_i915(i915_dev); struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
drm_modeset_lock_all(&dev_priv->drm); drm_modeset_lock_all(&dev_priv->drm);
acomp->ops = NULL; acomp->ops = NULL;
......
drivers/gpu/drm/i915/intel_runtime_pm.c
View file @ c49d13ee
...@@ -2288,7 +2288,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) ...@@ -2288,7 +2288,7 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv)
*/ */
void intel_power_domains_fini(struct drm_i915_private *dev_priv) void intel_power_domains_fini(struct drm_i915_private *dev_priv)
{ {
struct device *device = &dev_priv->drm.pdev->dev; struct device *kdev = &dev_priv->drm.pdev->dev;
/* /*
* The i915.ko module is still not prepared to be loaded when * The i915.ko module is still not prepared to be loaded when
...@@ -2310,7 +2310,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv) ...@@ -2310,7 +2310,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)
* the platform doesn't support runtime PM. * the platform doesn't support runtime PM.
*/ */
if (!HAS_RUNTIME_PM(dev_priv)) if (!HAS_RUNTIME_PM(dev_priv))
pm_runtime_put(device); pm_runtime_put(kdev);
} }
static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv) static void intel_power_domains_sync_hw(struct drm_i915_private *dev_priv)
...@@ -2652,9 +2652,9 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv) ...@@ -2652,9 +2652,9 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)
void intel_runtime_pm_get(struct drm_i915_private *dev_priv) void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct device *device = &dev->pdev->dev; struct device *kdev = &dev->pdev->dev;
pm_runtime_get_sync(device); pm_runtime_get_sync(kdev);
atomic_inc(&dev_priv->pm.wakeref_count); atomic_inc(&dev_priv->pm.wakeref_count);
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
...@@ -2673,10 +2673,10 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv) ...@@ -2673,10 +2673,10 @@ void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv) bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct device *device = &dev->pdev->dev; struct device *kdev = &dev->pdev->dev;
if (IS_ENABLED(CONFIG_PM)) { if (IS_ENABLED(CONFIG_PM)) {
int ret = pm_runtime_get_if_in_use(device); int ret = pm_runtime_get_if_in_use(kdev);
/* /*
* In cases runtime PM is disabled by the RPM core and we get * In cases runtime PM is disabled by the RPM core and we get
...@@ -2715,10 +2715,10 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv) ...@@ -2715,10 +2715,10 @@ bool intel_runtime_pm_get_if_in_use(struct drm_i915_private *dev_priv)
void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv) void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct device *device = &dev->pdev->dev; struct device *kdev = &dev->pdev->dev;
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
pm_runtime_get_noresume(device); pm_runtime_get_noresume(kdev);
atomic_inc(&dev_priv->pm.wakeref_count); atomic_inc(&dev_priv->pm.wakeref_count);
} }
...@@ -2734,14 +2734,14 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv) ...@@ -2734,14 +2734,14 @@ void intel_runtime_pm_get_noresume(struct drm_i915_private *dev_priv)
void intel_runtime_pm_put(struct drm_i915_private *dev_priv) void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct device *device = &dev->pdev->dev; struct device *kdev = &dev->pdev->dev;
assert_rpm_wakelock_held(dev_priv); assert_rpm_wakelock_held(dev_priv);
if (atomic_dec_and_test(&dev_priv->pm.wakeref_count)) if (atomic_dec_and_test(&dev_priv->pm.wakeref_count))
atomic_inc(&dev_priv->pm.atomic_seq); atomic_inc(&dev_priv->pm.atomic_seq);
pm_runtime_mark_last_busy(device); pm_runtime_mark_last_busy(kdev);
pm_runtime_put_autosuspend(device); pm_runtime_put_autosuspend(kdev);
} }
/** /**
...@@ -2757,10 +2757,10 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv) ...@@ -2757,10 +2757,10 @@ void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)
{ {
struct drm_device *dev = &dev_priv->drm; struct drm_device *dev = &dev_priv->drm;
struct device *device = &dev->pdev->dev; struct device *kdev = &dev->pdev->dev;
pm_runtime_set_autosuspend_delay(device, 10000); /* 10s */ pm_runtime_set_autosuspend_delay(kdev, 10000); /* 10s */
pm_runtime_mark_last_busy(device); pm_runtime_mark_last_busy(kdev);
/* /*
* Take a permanent reference to disable the RPM functionality and drop * Take a permanent reference to disable the RPM functionality and drop
...@@ -2769,10 +2769,10 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) ...@@ -2769,10 +2769,10 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)
* platforms without RPM support. * platforms without RPM support.
*/ */
if (!HAS_RUNTIME_PM(dev)) { if (!HAS_RUNTIME_PM(dev)) {
pm_runtime_dont_use_autosuspend(device); pm_runtime_dont_use_autosuspend(kdev);
pm_runtime_get_sync(device); pm_runtime_get_sync(kdev);
} else { } else {
pm_runtime_use_autosuspend(device); pm_runtime_use_autosuspend(kdev);
} }
/* /*
...@@ -2780,6 +2780,5 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv) ...@@ -2780,6 +2780,5 @@ void intel_runtime_pm_enable(struct drm_i915_private *dev_priv)
* We drop that here and will reacquire it during unloading in * We drop that here and will reacquire it during unloading in
* intel_power_domains_fini(). * intel_power_domains_fini().
*/ */
pm_runtime_put_autosuspend(device); pm_runtime_put_autosuspend(kdev);
} }
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7