Commit 1d2361e5 authored by Samuel Li's avatar Samuel Li Committed by Alex Deucher
Browse files

drm/amdgpu: Rename amdgpu_display_framebuffer_domains() 



It returns supported domains for display, and domains actually used are to be
decided later when pinned.

Signed-off-by: default avatarSamuel Li <Samuel.Li@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f5264548

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

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
		goto cleanup;

	}



	r = amdgpu_bo_pin(new_abo, amdgpu_display_framebuffer_domains(adev), &base);

	r = amdgpu_bo_pin(new_abo, amdgpu_display_supported_domains(adev), &base);

	if (unlikely(r != 0)) {

		DRM_ERROR("failed to pin new abo buffer before flip\n");

		goto unreserve;
@@ -484,7 +484,7 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { 
	.create_handle = drm_gem_fb_create_handle,

};



uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev)

uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev)

{

	uint32_t domain = AMDGPU_GEM_DOMAIN_VRAM;

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#ifndef __AMDGPU_DISPLAY_H__

#define __AMDGPU_DISPLAY_H__



uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev);

uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev);

struct drm_framebuffer *

amdgpu_display_user_framebuffer_create(struct drm_device *dev,

				       struct drm_file *file_priv,

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, 
	/* need to align pitch with crtc limits */

	mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, cpp,

						  fb_tiled);

	domain = amdgpu_display_framebuffer_domains(adev);

	domain = amdgpu_display_supported_domains(adev);



	height = ALIGN(mode_cmd->height, 8);

	size = mode_cmd->pitches[0] * height;

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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int amdgpu_gem_begin_cpu_access(struct dma_buf *dma_buf, 
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv);

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	struct ttm_operation_ctx ctx = { true, false };

	u32 domain = amdgpu_display_framebuffer_domains(adev);

	u32 domain = amdgpu_display_supported_domains(adev);

	int ret;

	bool reads = (direction == DMA_BIDIRECTIONAL ||

		      direction == DMA_FROM_DEVICE);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −2
Original line number Diff line number Diff line
@@ -3049,12 +3049,11 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, 
		return r;



	if (plane->type != DRM_PLANE_TYPE_CURSOR)

		domain = amdgpu_display_framebuffer_domains(adev);

		domain = amdgpu_display_supported_domains(adev);

	else

		domain = AMDGPU_GEM_DOMAIN_VRAM;



	r = amdgpu_bo_pin(rbo, domain, &afb->address);



	amdgpu_bo_unreserve(rbo);



	if (unlikely(r != 0)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE