diff options
author | Oscar Mateo | 2014-05-22 15:13:38 +0200 |
---|---|---|
committer | Daniel Vetter | 2014-05-22 23:44:44 +0200 |
commit | f83d6518a13020e3cf7abbcc6b4e6d34459d9a9f (patch) | |
tree | d82b0ed12d8e72262808c34e5208497b4583a384 /drivers/gpu/drm/i915/i915_gem_context.c | |
parent | drm/i915: s/i915_hw_context/intel_context (diff) | |
download | kernel-qcow2-linux-f83d6518a13020e3cf7abbcc6b4e6d34459d9a9f.tar.gz kernel-qcow2-linux-f83d6518a13020e3cf7abbcc6b4e6d34459d9a9f.tar.xz kernel-qcow2-linux-f83d6518a13020e3cf7abbcc6b4e6d34459d9a9f.zip |
drm/i915: Kill private_default_ctx off
It's barely alive now anyway, so give it the "coup de grĂ¢ce".
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 2100f6e8a703..3ffe308d5893 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -497,10 +497,6 @@ static int context_idr_cleanup(int id, void *p, void *data) { struct intel_context *ctx = p; - /* Ignore the default context because close will handle it */ - if (i915_gem_context_is_default(ctx)) - return 0; - i915_gem_context_unreference(ctx); return 0; } @@ -508,17 +504,17 @@ static int context_idr_cleanup(int id, void *p, void *data) int i915_gem_context_open(struct drm_device *dev, struct drm_file *file) { struct drm_i915_file_private *file_priv = file->driver_priv; + struct intel_context *ctx; idr_init(&file_priv->context_idr); mutex_lock(&dev->struct_mutex); - file_priv->private_default_ctx = - i915_gem_create_context(dev, file_priv, USES_FULL_PPGTT(dev)); + ctx = i915_gem_create_context(dev, file_priv, USES_FULL_PPGTT(dev)); mutex_unlock(&dev->struct_mutex); - if (IS_ERR(file_priv->private_default_ctx)) { + if (IS_ERR(ctx)) { idr_destroy(&file_priv->context_idr); - return PTR_ERR(file_priv->private_default_ctx); + return PTR_ERR(ctx); } return 0; @@ -530,8 +526,6 @@ void i915_gem_context_close(struct drm_device *dev, struct drm_file *file) idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL); idr_destroy(&file_priv->context_idr); - - i915_gem_context_unreference(file_priv->private_default_ctx); } struct intel_context * |