projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
12c100b
)
drm/i915: Fix up some stray to_i915(dev) after a recent merge
author
Chris Wilson
<chris@chris-wilson.co.uk>
Wed, 27 Jul 2016 18:32:29 +0000
(19:32 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 28 Jul 2016 06:28:17 +0000
(07:28 +0100)
The merge conflict resolution caused some dev->dev_private to return
from the dead. Kill them with to_i915().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link:
http://patchwork.freedesktop.org/patch/msgid/1469644349-24571-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/i915_sysfs.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_sysfs.c
b/drivers/gpu/drm/i915/i915_sysfs.c
index
d47281b
..
f1ffde7
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_sysfs.c
+++ b/
drivers/gpu/drm/i915/i915_sysfs.c
@@
-323,7
+323,7
@@
static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
{
struct drm_minor *minor = dev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev;
- struct drm_i915_private *dev_priv =
dev->dev_private
;
+ struct drm_i915_private *dev_priv =
to_i915(dev)
;
u32 val;
ssize_t ret;