|
@@ -428,7 +428,6 @@ int radeon_gem_mmap_ioctl(struct drm_device *dev, void *data,
|
|
int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
|
|
int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *filp)
|
|
struct drm_file *filp)
|
|
{
|
|
{
|
|
- struct radeon_device *rdev = dev->dev_private;
|
|
|
|
struct drm_radeon_gem_busy *args = data;
|
|
struct drm_radeon_gem_busy *args = data;
|
|
struct drm_gem_object *gobj;
|
|
struct drm_gem_object *gobj;
|
|
struct radeon_bo *robj;
|
|
struct radeon_bo *robj;
|
|
@@ -440,10 +439,16 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
|
|
return -ENOENT;
|
|
return -ENOENT;
|
|
}
|
|
}
|
|
robj = gem_to_radeon_bo(gobj);
|
|
robj = gem_to_radeon_bo(gobj);
|
|
- r = radeon_bo_wait(robj, &cur_placement, true);
|
|
|
|
|
|
+
|
|
|
|
+ r = reservation_object_test_signaled_rcu(robj->tbo.resv, true);
|
|
|
|
+ if (r == 0)
|
|
|
|
+ r = -EBUSY;
|
|
|
|
+ else
|
|
|
|
+ r = 0;
|
|
|
|
+
|
|
|
|
+ cur_placement = ACCESS_ONCE(robj->tbo.mem.mem_type);
|
|
args->domain = radeon_mem_type_to_domain(cur_placement);
|
|
args->domain = radeon_mem_type_to_domain(cur_placement);
|
|
drm_gem_object_unreference_unlocked(gobj);
|
|
drm_gem_object_unreference_unlocked(gobj);
|
|
- r = radeon_gem_handle_lockup(rdev, r);
|
|
|
|
return r;
|
|
return r;
|
|
}
|
|
}
|
|
|
|
|