diff options
author | Samuel Li <Samuel.Li@amd.com> | 2018-04-18 15:06:02 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-05-15 14:43:43 -0400 |
commit | 1d2361e5a6c60d7b142d19555c3e6240ffe93731 (patch) | |
tree | efaef338f353484c7eb20efbeb3d144573604040 /drivers/gpu/drm/amd/amdgpu | |
parent | f5264548008a5cde7090c2b6b85c8d65cb86d2f7 (diff) |
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: Samuel Li <Samuel.Li@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index b83ae998fe27..76ee8e04ff11 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |||
@@ -189,7 +189,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, | |||
189 | goto cleanup; | 189 | goto cleanup; |
190 | } | 190 | } |
191 | 191 | ||
192 | r = amdgpu_bo_pin(new_abo, amdgpu_display_framebuffer_domains(adev), &base); | 192 | r = amdgpu_bo_pin(new_abo, amdgpu_display_supported_domains(adev), &base); |
193 | if (unlikely(r != 0)) { | 193 | if (unlikely(r != 0)) { |
194 | DRM_ERROR("failed to pin new abo buffer before flip\n"); | 194 | DRM_ERROR("failed to pin new abo buffer before flip\n"); |
195 | goto unreserve; | 195 | goto unreserve; |
@@ -484,7 +484,7 @@ static const struct drm_framebuffer_funcs amdgpu_fb_funcs = { | |||
484 | .create_handle = drm_gem_fb_create_handle, | 484 | .create_handle = drm_gem_fb_create_handle, |
485 | }; | 485 | }; |
486 | 486 | ||
487 | uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev) | 487 | uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev) |
488 | { | 488 | { |
489 | uint32_t domain = AMDGPU_GEM_DOMAIN_VRAM; | 489 | uint32_t domain = AMDGPU_GEM_DOMAIN_VRAM; |
490 | 490 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h index 2b11d808f297..f66e3e3fef0a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #ifndef __AMDGPU_DISPLAY_H__ | 23 | #ifndef __AMDGPU_DISPLAY_H__ |
24 | #define __AMDGPU_DISPLAY_H__ | 24 | #define __AMDGPU_DISPLAY_H__ |
25 | 25 | ||
26 | uint32_t amdgpu_display_framebuffer_domains(struct amdgpu_device *adev); | 26 | uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev); |
27 | struct drm_framebuffer * | 27 | struct drm_framebuffer * |
28 | amdgpu_display_user_framebuffer_create(struct drm_device *dev, | 28 | amdgpu_display_user_framebuffer_create(struct drm_device *dev, |
29 | struct drm_file *file_priv, | 29 | struct drm_file *file_priv, |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index ff89e84b34ce..bc5fd8ebab5d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | |||
@@ -137,7 +137,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, | |||
137 | /* need to align pitch with crtc limits */ | 137 | /* need to align pitch with crtc limits */ |
138 | mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, cpp, | 138 | mode_cmd->pitches[0] = amdgpu_align_pitch(adev, mode_cmd->width, cpp, |
139 | fb_tiled); | 139 | fb_tiled); |
140 | domain = amdgpu_display_framebuffer_domains(adev); | 140 | domain = amdgpu_display_supported_domains(adev); |
141 | 141 | ||
142 | height = ALIGN(mode_cmd->height, 8); | 142 | height = ALIGN(mode_cmd->height, 8); |
143 | size = mode_cmd->pitches[0] * height; | 143 | size = mode_cmd->pitches[0] * height; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c index 713417b6d15d..4683626b065f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | |||
@@ -215,7 +215,7 @@ static int amdgpu_gem_begin_cpu_access(struct dma_buf *dma_buf, | |||
215 | struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv); | 215 | struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv); |
216 | struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); | 216 | struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev); |
217 | struct ttm_operation_ctx ctx = { true, false }; | 217 | struct ttm_operation_ctx ctx = { true, false }; |
218 | u32 domain = amdgpu_display_framebuffer_domains(adev); | 218 | u32 domain = amdgpu_display_supported_domains(adev); |
219 | int ret; | 219 | int ret; |
220 | bool reads = (direction == DMA_BIDIRECTIONAL || | 220 | bool reads = (direction == DMA_BIDIRECTIONAL || |
221 | direction == DMA_FROM_DEVICE); | 221 | direction == DMA_FROM_DEVICE); |