diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2019-08-05 16:01:16 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-08-06 08:21:54 +0200 |
| commit | 27c44acebd3fab5448aa3cffdc1996c897965a4a (patch) | |
| tree | 980ca8832d057aca0d1667d4e47718bbf05566ee /drivers/gpu/drm/nouveau/nouveau_gem.c | |
| parent | drm/amdgpu: switch driver from bo->resv to bo->base.resv (diff) | |
| download | linux-27c44acebd3fab5448aa3cffdc1996c897965a4a.tar.xz linux-27c44acebd3fab5448aa3cffdc1996c897965a4a.zip | |
drm/nouveau: switch driver from bo->resv to bo->base.resv
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-15-kraxel@redhat.com
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index b1e4852810ed..c7368aa0bdec 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -887,7 +887,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data, return -ENOENT; nvbo = nouveau_gem_object(gem); - lret = reservation_object_wait_timeout_rcu(nvbo->bo.resv, write, true, + lret = reservation_object_wait_timeout_rcu(nvbo->bo.base.resv, write, true, no_wait ? 0 : 30 * HZ); if (!lret) ret = -EBUSY; |