lkml.org 
[lkml]   [2013]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 33/77] drm/i915: convert to idr_alloc()
    Date
    Convert to the much saner new idr interface.

    Only compile tested.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: David Airlie <airlied@linux.ie>
    Cc: dri-devel@lists.freedesktop.org
    ---
    drivers/gpu/drm/i915/i915_gem_context.c | 21 +++++----------------
    1 file changed, 5 insertions(+), 16 deletions(-)

    diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
    index a3f06bc..27e586a 100644
    --- a/drivers/gpu/drm/i915/i915_gem_context.c
    +++ b/drivers/gpu/drm/i915/i915_gem_context.c
    @@ -144,7 +144,7 @@ create_hw_context(struct drm_device *dev,
    {
    struct drm_i915_private *dev_priv = dev->dev_private;
    struct i915_hw_context *ctx;
    - int ret, id;
    + int ret;

    ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
    if (ctx == NULL)
    @@ -169,22 +169,11 @@ create_hw_context(struct drm_device *dev,

    ctx->file_priv = file_priv;

    -again:
    - if (idr_pre_get(&file_priv->context_idr, GFP_KERNEL) == 0) {
    - ret = -ENOMEM;
    - DRM_DEBUG_DRIVER("idr allocation failed\n");
    - goto err_out;
    - }
    -
    - ret = idr_get_new_above(&file_priv->context_idr, ctx,
    - DEFAULT_CONTEXT_ID + 1, &id);
    - if (ret == 0)
    - ctx->id = id;
    -
    - if (ret == -EAGAIN)
    - goto again;
    - else if (ret)
    + ret = idr_alloc(&file_priv->context_idr, ctx, DEFAULT_CONTEXT_ID + 1, 0,
    + GFP_KERNEL);
    + if (ret < 0)
    goto err_out;
    + ctx->id = ret;

    return ctx;

    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-06 21:46    [W:4.106 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site