diff options
author | Christian König <christian.koenig@amd.com> | 2016-02-15 10:59:57 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-16 17:46:24 -0500 |
commit | 418aa0c296ddb5df90c4e94f995cfd3f3c9e96dc (patch) | |
tree | ad4be1eb7a8537b33c479418f6f749f7f827f1d2 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
parent | 7ea235653328644b5ba8707e65484446a118e193 (diff) |
drm/amdgpu: cleanup gem init/finit
Remove the double housekeeping and use something sane to
forcefuly delete BOs on unload.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 4be61f0ed19d..f5bac97a438b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -607,13 +607,7 @@ struct amdgpu_sa_bo { | |||
607 | /* | 607 | /* |
608 | * GEM objects. | 608 | * GEM objects. |
609 | */ | 609 | */ |
610 | struct amdgpu_gem { | 610 | void amdgpu_gem_force_release(struct amdgpu_device *adev); |
611 | struct mutex mutex; | ||
612 | struct list_head objects; | ||
613 | }; | ||
614 | |||
615 | int amdgpu_gem_init(struct amdgpu_device *adev); | ||
616 | void amdgpu_gem_fini(struct amdgpu_device *adev); | ||
617 | int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, | 611 | int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, |
618 | int alignment, u32 initial_domain, | 612 | int alignment, u32 initial_domain, |
619 | u64 flags, bool kernel, | 613 | u64 flags, bool kernel, |
@@ -2012,7 +2006,6 @@ struct amdgpu_device { | |||
2012 | 2006 | ||
2013 | /* memory management */ | 2007 | /* memory management */ |
2014 | struct amdgpu_mman mman; | 2008 | struct amdgpu_mman mman; |
2015 | struct amdgpu_gem gem; | ||
2016 | struct amdgpu_vram_scratch vram_scratch; | 2009 | struct amdgpu_vram_scratch vram_scratch; |
2017 | struct amdgpu_wb wb; | 2010 | struct amdgpu_wb wb; |
2018 | atomic64_t vram_usage; | 2011 | atomic64_t vram_usage; |