mirror of
https://github.com/torvalds/linux
synced 2024-09-16 00:58:07 +00:00
drm/amdgpu: Fix the BO release clear memory warning
This happens when the amdgpu_bo_release_notify running
before amdgpu_ttm_set_buffer_funcs_status set the buffer
funcs to enabled.
check the buffer funcs enablement before calling the fill
buffer memory.
v2:(Christian)
- Apply it only for GEM buffers and since GEM buffers are only
allocated/freed while the driver is loaded we never run into
the issue to clear with buffer funcs disabled.
v3:(Mario)
- drop the stable tag as this will presumably go into a
-fixes PR for 6.10
Log snip:
*ERROR* Trying to clear memory with ring turned off.
RIP: 0010:amdgpu_bo_release_notify+0x201/0x220 [amdgpu]
Fixes: a68c7eaa7a
("drm/amdgpu: Enable clear page functionality")
Signed-off-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Tested-by: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Tested-by: Richard Gong <richard.gong@amd.com>
Suggested-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240610180401.9540-1-Arunpravin.PaneerSelvam@amd.com
This commit is contained in:
parent
ce62600c4d
commit
31849bf07e
|
@ -108,6 +108,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
|
||||||
|
|
||||||
memset(&bp, 0, sizeof(bp));
|
memset(&bp, 0, sizeof(bp));
|
||||||
*obj = NULL;
|
*obj = NULL;
|
||||||
|
flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;
|
||||||
|
|
||||||
bp.size = size;
|
bp.size = size;
|
||||||
bp.byte_align = alignment;
|
bp.byte_align = alignment;
|
||||||
|
|
|
@ -604,8 +604,6 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
|
||||||
if (!amdgpu_bo_support_uswc(bo->flags))
|
if (!amdgpu_bo_support_uswc(bo->flags))
|
||||||
bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;
|
bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;
|
||||||
|
|
||||||
bo->flags |= AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE;
|
|
||||||
|
|
||||||
bo->tbo.bdev = &adev->mman.bdev;
|
bo->tbo.bdev = &adev->mman.bdev;
|
||||||
if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA |
|
if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA |
|
||||||
AMDGPU_GEM_DOMAIN_GDS))
|
AMDGPU_GEM_DOMAIN_GDS))
|
||||||
|
|
Loading…
Reference in a new issue