drm/i915: add support for checking if we hold an RPM reference

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_dma.c

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f75988feb566d0822be1bf2d70cd018fb25b29f4..988a3806512ada739d2b93d8190dac9f3ad50354 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -896,6 +896,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 
        intel_pm_setup(dev);
 
+       intel_runtime_pm_get(dev_priv);
+
        intel_display_crc_init(dev);
 
        i915_dump_device_info(dev_priv);
@@ -1085,6 +1087,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 
        i915_audio_component_init(dev_priv);
 
+       intel_runtime_pm_put(dev_priv);
+
        return 0;
 
 out_power_well:
@@ -1120,6 +1124,9 @@ free_priv:
        kmem_cache_destroy(dev_priv->requests);
        kmem_cache_destroy(dev_priv->vmas);
        kmem_cache_destroy(dev_priv->objects);
+
+       intel_runtime_pm_put(dev_priv);
+
        kfree(dev_priv);
        return ret;
 }