diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-17 08:31:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-06-17 08:31:12 +0200 |
| commit | 20460472952043a4735e9abc1fd9de8e024d1c9e (patch) | |
| tree | 8a9f91828816c3cb3b8fc019dce28d128e13dfef /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | 2db573c5dc1f896d8c6c73d4bdb6429f8b1dcf34 (diff) | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
| download | linux-20460472952043a4735e9abc1fd9de8e024d1c9e.tar.gz linux-20460472952043a4735e9abc1fd9de8e024d1c9e.tar.bz2 linux-20460472952043a4735e9abc1fd9de8e024d1c9e.zip | |
Merge tag 'v6.10-rc4' into char-misc-next
We need the char-misc and iio fixes in here as well to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 8d8c39be6129..c556c8b653fa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -604,8 +604,6 @@ int amdgpu_bo_create(struct amdgpu_device *adev, if (!amdgpu_bo_support_uswc(bo->flags)) bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC; - bo->flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE; - bo->tbo.bdev = &adev->mman.bdev; if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA | AMDGPU_GEM_DOMAIN_GDS)) |