Merge tag 'drm-misc-next-2019-08-19' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_object.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index 05dde0dd04ff15618f385a1a8bc4c64530f84d56..658f4c9779b704831c8ebe472ba343921da62429 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -41,7 +41,7 @@ struct amdgpu_bo_param {
        u32                             preferred_domain;
        u64                             flags;
        enum ttm_bo_type                type;
-       struct reservation_object       *resv;
+       struct dma_resv *resv;
 };
 
 /* bo virtual addresses in a vm */