Rev 2004 | Rev 2997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2004 | Rev 2005 | ||
---|---|---|---|
Line 69... | Line 69... | ||
69 | radeon_fence_unref(&fence); |
69 | radeon_fence_unref(&fence); |
70 | return -EBUSY; |
70 | return -EBUSY; |
71 | } |
71 | } |
72 | rdev->ib_pool.head_id = (nib->idx + 1) & (RADEON_IB_POOL_SIZE - 1); |
72 | rdev->ib_pool.head_id = (nib->idx + 1) & (RADEON_IB_POOL_SIZE - 1); |
73 | nib->free = false; |
73 | nib->free = false; |
74 | // if (nib->fence) { |
74 | if (nib->fence) { |
75 | // mutex_unlock(&rdev->ib_pool.mutex); |
75 | mutex_unlock(&rdev->ib_pool.mutex); |
76 | // r = radeon_fence_wait(nib->fence, false); |
76 | r = radeon_fence_wait(nib->fence, false); |
77 | // if (r) { |
77 | if (r) { |
78 | // dev_err(rdev->dev, "error waiting fence of IB(%u:0x%016lX:%u)\n", |
78 | dev_err(rdev->dev, "error waiting fence of IB(%u:0x%016lX:%u)\n", |
79 | // nib->idx, (unsigned long)nib->gpu_addr, nib->length_dw); |
79 | nib->idx, (unsigned long)nib->gpu_addr, nib->length_dw); |
80 | // mutex_lock(&rdev->ib_pool.mutex); |
80 | mutex_lock(&rdev->ib_pool.mutex); |
81 | // nib->free = true; |
81 | nib->free = true; |
82 | // mutex_unlock(&rdev->ib_pool.mutex); |
82 | mutex_unlock(&rdev->ib_pool.mutex); |
83 | // radeon_fence_unref(&fence); |
83 | radeon_fence_unref(&fence); |
84 | // return r; |
84 | return r; |
85 | // } |
85 | } |
86 | // mutex_lock(&rdev->ib_pool.mutex); |
86 | mutex_lock(&rdev->ib_pool.mutex); |
87 | // } |
87 | } |
88 | radeon_fence_unref(&nib->fence); |
88 | radeon_fence_unref(&nib->fence); |
89 | nib->fence = fence; |
89 | nib->fence = fence; |
90 | nib->length_dw = 0; |
90 | nib->length_dw = 0; |
91 | mutex_unlock(&rdev->ib_pool.mutex); |
91 | mutex_unlock(&rdev->ib_pool.mutex); |
92 | *ib = nib; |
92 | *ib = nib; |