Commit 54b86443 authored Jun 05, 2024 by Christian König Committed by Alex Deucher Sep 18, 2024

drm/amdgpu: explicitely set the AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS flag



Instead of having that in the amdgpu_bo_pin() function applied for all
pinned BOs.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 42ac749d

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc,
		}

		if (!adev->enable_virtual_display) {
		new_abo->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		r = amdgpu_bo_pin(new_abo,
		amdgpu_display_supported_domains(adev, new_abo->flags));
		if (unlikely(r != 0)) {
		@@ -1759,6 +1760,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)

		r = amdgpu_bo_reserve(aobj, true);
		if (r == 0) {
		aobj->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		r = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM);
		if (r != 0)
		dev_err(adev->dev, "Failed to pin cursor BO (%d)\n", r);

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -942,7 +942,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
		*/
		int amdgpu_bo_pin(struct amdgpu_bo *bo, u32 domain)
		{
		bo->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		return amdgpu_bo_pin_restricted(bo, domain, 0, 0);
		}

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -338,6 +338,7 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane,
		else
		domain = AMDGPU_GEM_DOMAIN_VRAM;

		rbo->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		r = amdgpu_bo_pin(rbo, domain);
		if (unlikely(r != 0)) {
		if (r != -ERESTARTSYS)

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1881,6 +1881,7 @@ static int dce_v10_0_crtc_do_set_base(struct drm_crtc *crtc,
		return r;

		if (!atomic) {
		abo->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		r = amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM);
		if (unlikely(r != 0)) {
		amdgpu_bo_unreserve(abo);
		@@ -2401,6 +2402,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc,
		return ret;
		}

		aobj->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		ret = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM);
		amdgpu_bo_unreserve(aobj);
		if (ret) {

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1931,6 +1931,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,
		return r;

		if (!atomic) {
		abo->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		r = amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM);
		if (unlikely(r != 0)) {
		amdgpu_bo_unreserve(abo);
		@@ -2485,6 +2486,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc,
		return ret;
		}

		aobj->flags \|= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
		ret = amdgpu_bo_pin(aobj, AMDGPU_GEM_DOMAIN_VRAM);
		amdgpu_bo_unreserve(aobj);
		if (ret) {