diff options
author | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
---|---|---|
committer | Maxime Ripard <maxime@cerno.tech> | 2020-03-17 09:29:11 +0100 |
commit | 51b8479ab20ba3804348824c63abdb3f35b0aaeb (patch) | |
tree | f3ecae09fc31773c9da185de167bf2034f1aaa2e /drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | |
parent | 6afe6929964bca6847986d0507a555a041f07753 (diff) | |
parent | 69ddce0970d9d1de63bed9c24eefa0814db29a5a (diff) |
Merge drm/drm-next into drm-misc-next
Jernej needs some patches that got merged in -rc5.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h index 7551f3729445..bd05bbb4878d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h @@ -134,6 +134,5 @@ uint64_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, struct ttm_mem_reg *mem); int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev); -void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev); #endif |