From 20f9d24636f8f1314e2be3d0ff8b2f7a35518059 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Feb 2016 17:37:00 -0800 Subject: [PATCH] 3.14-stable patches added patches: drm-i915-get-runtime-pm-reference-around-gem-set_caching-ioctl.patch --- ...ference-around-gem-set_caching-ioctl.patch | 56 +++++++++++++++++++ queue-3.14/series | 1 + 2 files changed, 57 insertions(+) create mode 100644 queue-3.14/drm-i915-get-runtime-pm-reference-around-gem-set_caching-ioctl.patch diff --git a/queue-3.14/drm-i915-get-runtime-pm-reference-around-gem-set_caching-ioctl.patch b/queue-3.14/drm-i915-get-runtime-pm-reference-around-gem-set_caching-ioctl.patch new file mode 100644 index 00000000000..eb3ce750270 --- /dev/null +++ b/queue-3.14/drm-i915-get-runtime-pm-reference-around-gem-set_caching-ioctl.patch @@ -0,0 +1,56 @@ +From fd0fe6acf1dd88aabfbf383f7e4c16315387a7b7 Mon Sep 17 00:00:00 2001 +From: Imre Deak +Date: Wed, 4 Nov 2015 21:25:32 +0200 +Subject: drm/i915: get runtime PM reference around GEM set_caching IOCTL + +From: Imre Deak + +commit fd0fe6acf1dd88aabfbf383f7e4c16315387a7b7 upstream. + +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 +Reviewed-by: Paulo Zanoni +Link: http://patchwork.freedesktop.org/patch/msgid/1446665132-22491-1-git-send-email-imre.deak@intel.com +Signed-off-by: Jani Nikula +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/i915_gem.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/i915_gem.c ++++ b/drivers/gpu/drm/i915/i915_gem.c +@@ -3655,6 +3655,7 @@ unlock: + int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data, + struct drm_file *file) + { ++ struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_i915_gem_caching *args = data; + struct drm_i915_gem_object *obj; + enum i915_cache_level level; +@@ -3674,9 +3675,11 @@ int i915_gem_set_caching_ioctl(struct dr + return -EINVAL; + } + ++ intel_runtime_pm_get(dev_priv); ++ + ret = i915_mutex_lock_interruptible(dev); + if (ret) +- return ret; ++ goto rpm_put; + + obj = to_intel_bo(drm_gem_object_lookup(dev, file, args->handle)); + if (&obj->base == NULL) { +@@ -3689,6 +3692,9 @@ int i915_gem_set_caching_ioctl(struct dr + drm_gem_object_unreference(&obj->base); + unlock: + mutex_unlock(&dev->struct_mutex); ++rpm_put: ++ intel_runtime_pm_put(dev_priv); ++ + return ret; + } + diff --git a/queue-3.14/series b/queue-3.14/series index 3b758928c7c..0e736c41bf5 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -1 +1,2 @@ x86-mm-pat-avoid-truncation-when-converting-cpa-numpages-to-address.patch +drm-i915-get-runtime-pm-reference-around-gem-set_caching-ioctl.patch -- 2.47.3