Skip to content

Commit fd0fe6a

Browse files
ideakjnikula
authored andcommitted
drm/i915: get runtime PM reference around GEM set_caching IOCTL
After Damien's D3 fix I started to get runtime suspend residency for the first time and that revealed a breakage on the set_caching IOCTL path that accesses the HW but doesn't take an RPM ref. Fix this up. Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: stable@vger.kernel.org Link: http://patchwork.freedesktop.org/patch/msgid/1446665132-22491-1-git-send-email-imre.deak@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 500a3d2 commit fd0fe6a

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/gpu/drm/i915/i915_gem.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3809,6 +3809,7 @@ int i915_gem_get_caching_ioctl(struct drm_device *dev, void *data,
38093809
int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
38103810
struct drm_file *file)
38113811
{
3812+
struct drm_i915_private *dev_priv = dev->dev_private;
38123813
struct drm_i915_gem_caching *args = data;
38133814
struct drm_i915_gem_object *obj;
38143815
enum i915_cache_level level;
@@ -3837,9 +3838,11 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
38373838
return -EINVAL;
38383839
}
38393840

3841+
intel_runtime_pm_get(dev_priv);
3842+
38403843
ret = i915_mutex_lock_interruptible(dev);
38413844
if (ret)
3842-
return ret;
3845+
goto rpm_put;
38433846

38443847
obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle));
38453848
if (&obj->base == NULL) {
@@ -3852,6 +3855,9 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
38523855
drm_gem_object_unreference(&obj->base);
38533856
unlock:
38543857
mutex_unlock(&dev->struct_mutex);
3858+
rpm_put:
3859+
intel_runtime_pm_put(dev_priv);
3860+
38553861
return ret;
38563862
}
38573863

0 commit comments

Comments
 (0)