diff options
author | Ben Widawsky <benjamin.widawsky@intel.com> | 2013-12-06 17:10:55 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-18 09:27:49 -0500 |
commit | d7f46fc4e7323887494db13f063a8e59861fefb0 (patch) | |
tree | 7b58d50a01f965ef5f814de57ece105b77cbeb10 /drivers/gpu/drm/i915/intel_pm.c | |
parent | 685987c6915222730f45141a89f1cd87fb092e9a (diff) |
drm/i915: Make pin count per VMA
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 41b6e080e362..cba4be88eddb 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -3298,7 +3298,7 @@ intel_alloc_context_page(struct drm_device *dev) | |||
3298 | return ctx; | 3298 | return ctx; |
3299 | 3299 | ||
3300 | err_unpin: | 3300 | err_unpin: |
3301 | i915_gem_object_unpin(ctx); | 3301 | i915_gem_object_ggtt_unpin(ctx); |
3302 | err_unref: | 3302 | err_unref: |
3303 | drm_gem_object_unreference(&ctx->base); | 3303 | drm_gem_object_unreference(&ctx->base); |
3304 | return NULL; | 3304 | return NULL; |
@@ -4166,13 +4166,13 @@ void ironlake_teardown_rc6(struct drm_device *dev) | |||
4166 | struct drm_i915_private *dev_priv = dev->dev_private; | 4166 | struct drm_i915_private *dev_priv = dev->dev_private; |
4167 | 4167 | ||
4168 | if (dev_priv->ips.renderctx) { | 4168 | if (dev_priv->ips.renderctx) { |
4169 | i915_gem_object_unpin(dev_priv->ips.renderctx); | 4169 | i915_gem_object_ggtt_unpin(dev_priv->ips.renderctx); |
4170 | drm_gem_object_unreference(&dev_priv->ips.renderctx->base); | 4170 | drm_gem_object_unreference(&dev_priv->ips.renderctx->base); |
4171 | dev_priv->ips.renderctx = NULL; | 4171 | dev_priv->ips.renderctx = NULL; |
4172 | } | 4172 | } |
4173 | 4173 | ||
4174 | if (dev_priv->ips.pwrctx) { | 4174 | if (dev_priv->ips.pwrctx) { |
4175 | i915_gem_object_unpin(dev_priv->ips.pwrctx); | 4175 | i915_gem_object_ggtt_unpin(dev_priv->ips.pwrctx); |
4176 | drm_gem_object_unreference(&dev_priv->ips.pwrctx->base); | 4176 | drm_gem_object_unreference(&dev_priv->ips.pwrctx->base); |
4177 | dev_priv->ips.pwrctx = NULL; | 4177 | dev_priv->ips.pwrctx = NULL; |
4178 | } | 4178 | } |