OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
40ae4e1
)
drm/i915: Move load time runtime PM get later
author
Imre Deak
<imre.deak@intel.com>
Wed, 16 Mar 2016 11:38:57 +0000
(13:38 +0200)
committer
Imre Deak
<imre.deak@intel.com>
Thu, 17 Mar 2016 13:22:05 +0000
(15:22 +0200)
We require the device to be powered only before accessing it, so we can
move this call later.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link:
http://patchwork.freedesktop.org/patch/msgid/1458128348-15730-9-git-send-email-imre.deak@intel.com
drivers/gpu/drm/i915/i915_dma.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_dma.c
b/drivers/gpu/drm/i915/i915_dma.c
index
b89fa73
..
a07e359
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_dma.c
+++ b/
drivers/gpu/drm/i915/i915_dma.c
@@
-1033,8
+1033,6
@@
int i915_driver_load(struct drm_device *dev, unsigned long flags)
intel_init_audio_hooks(dev_priv);
i915_gem_load_init(dev);
- intel_runtime_pm_get(dev_priv);
-
intel_display_crc_init(dev);
i915_dump_device_info(dev_priv);
@@
-1047,6
+1045,8
@@
int i915_driver_load(struct drm_device *dev, unsigned long flags)
DRM_INFO("This is an early pre-production Haswell machine. "
"It may not be fully functional.\n");
+ intel_runtime_pm_get(dev_priv);
+
if (i915_get_bridge_dev(dev)) {
ret = -EIO;
goto out_runtime_pm_put;