diff options
author | Maxime Ripard <mripard@kernel.org> | 2025-01-14 18:21:58 +0100 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2025-01-14 18:21:58 +0100 |
commit | 12080e85254fa05ff25ad2e6e74dc523621a8706 (patch) | |
tree | ff0bd8354f12ff20d956a3e15e71555c5ed275a4 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
parent | 34d813e45ecb8e84f7154509b1acf7dda57ef09f (diff) | |
parent | 24c61d553302ee49e9c21dd251275ba8c36dcfe4 (diff) |
Merge drm/drm-next into drm-misc-next-fixes
drm-next has the dmem cgroup patches we need to merge fixes for.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 103513b1d23fb..69429df094771 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -88,10 +88,8 @@ static void amdgpu_gem_object_free(struct drm_gem_object *gobj) { struct amdgpu_bo *aobj = gem_to_amdgpu_bo(gobj); - if (aobj) { - amdgpu_hmm_unregister(aobj); - ttm_bo_put(&aobj->tbo); - } + amdgpu_hmm_unregister(aobj); + ttm_bo_put(&aobj->tbo); } int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, |