aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-09-15 09:06:50 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-09-28 16:16:20 -0400
commit765e7fbf081d0e8bd22b35468a1c016358b46179 (patch)
tree47bf14c467cfec99984a0bd4283bf42b06df4063 /drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
parent1927ffc0c19d7d42f775604f6984933bbb0d419b (diff)
drm/amdgpu: rename all rbo variable to abo v2
Just to cleanup some radeon leftovers. sed -i "s/rbo/abo/g" drivers/gpu/drm/amd/amdgpu/*.c sed -i "s/rbo/abo/g" drivers/gpu/drm/amd/amdgpu/*.h v2: rebased Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v11_0.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 5f26024f7d3b..e8a6919baf46 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -2088,7 +2088,7 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,
2088 struct amdgpu_framebuffer *amdgpu_fb; 2088 struct amdgpu_framebuffer *amdgpu_fb;
2089 struct drm_framebuffer *target_fb; 2089 struct drm_framebuffer *target_fb;
2090 struct drm_gem_object *obj; 2090 struct drm_gem_object *obj;
2091 struct amdgpu_bo *rbo; 2091 struct amdgpu_bo *abo;
2092 uint64_t fb_location, tiling_flags; 2092 uint64_t fb_location, tiling_flags;
2093 uint32_t fb_format, fb_pitch_pixels; 2093 uint32_t fb_format, fb_pitch_pixels;
2094 u32 fb_swap = REG_SET_FIELD(0, GRPH_SWAP_CNTL, GRPH_ENDIAN_SWAP, ENDIAN_NONE); 2094 u32 fb_swap = REG_SET_FIELD(0, GRPH_SWAP_CNTL, GRPH_ENDIAN_SWAP, ENDIAN_NONE);
@@ -2115,23 +2115,23 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,
2115 * just update base pointers 2115 * just update base pointers
2116 */ 2116 */
2117 obj = amdgpu_fb->obj; 2117 obj = amdgpu_fb->obj;
2118 rbo = gem_to_amdgpu_bo(obj); 2118 abo = gem_to_amdgpu_bo(obj);
2119 r = amdgpu_bo_reserve(rbo, false); 2119 r = amdgpu_bo_reserve(abo, false);
2120 if (unlikely(r != 0)) 2120 if (unlikely(r != 0))
2121 return r; 2121 return r;
2122 2122
2123 if (atomic) { 2123 if (atomic) {
2124 fb_location = amdgpu_bo_gpu_offset(rbo); 2124 fb_location = amdgpu_bo_gpu_offset(abo);
2125 } else { 2125 } else {
2126 r = amdgpu_bo_pin(rbo, AMDGPU_GEM_DOMAIN_VRAM, &fb_location); 2126 r = amdgpu_bo_pin(abo, AMDGPU_GEM_DOMAIN_VRAM, &fb_location);
2127 if (unlikely(r != 0)) { 2127 if (unlikely(r != 0)) {
2128 amdgpu_bo_unreserve(rbo); 2128 amdgpu_bo_unreserve(abo);
2129 return -EINVAL; 2129 return -EINVAL;
2130 } 2130 }
2131 } 2131 }
2132 2132
2133 amdgpu_bo_get_tiling_flags(rbo, &tiling_flags); 2133 amdgpu_bo_get_tiling_flags(abo, &tiling_flags);
2134 amdgpu_bo_unreserve(rbo); 2134 amdgpu_bo_unreserve(abo);
2135 2135
2136 pipe_config = AMDGPU_TILING_GET(tiling_flags, PIPE_CONFIG); 2136 pipe_config = AMDGPU_TILING_GET(tiling_flags, PIPE_CONFIG);
2137 2137
@@ -2305,12 +2305,12 @@ static int dce_v11_0_crtc_do_set_base(struct drm_crtc *crtc,
2305 2305
2306 if (!atomic && fb && fb != crtc->primary->fb) { 2306 if (!atomic && fb && fb != crtc->primary->fb) {
2307 amdgpu_fb = to_amdgpu_framebuffer(fb); 2307 amdgpu_fb = to_amdgpu_framebuffer(fb);
2308 rbo = gem_to_amdgpu_bo(amdgpu_fb->obj); 2308 abo = gem_to_amdgpu_bo(amdgpu_fb->obj);
2309 r = amdgpu_bo_reserve(rbo, false); 2309 r = amdgpu_bo_reserve(abo, false);
2310 if (unlikely(r != 0)) 2310 if (unlikely(r != 0))
2311 return r; 2311 return r;
2312 amdgpu_bo_unpin(rbo); 2312 amdgpu_bo_unpin(abo);
2313 amdgpu_bo_unreserve(rbo); 2313 amdgpu_bo_unreserve(abo);
2314 } 2314 }
2315 2315
2316 /* Bytes per pixel may have changed */ 2316 /* Bytes per pixel may have changed */
@@ -2825,16 +2825,16 @@ static void dce_v11_0_crtc_disable(struct drm_crtc *crtc)
2825 if (crtc->primary->fb) { 2825 if (crtc->primary->fb) {
2826 int r; 2826 int r;
2827 struct amdgpu_framebuffer *amdgpu_fb; 2827 struct amdgpu_framebuffer *amdgpu_fb;
2828 struct amdgpu_bo *rbo; 2828 struct amdgpu_bo *abo;
2829 2829
2830 amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb); 2830 amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb);
2831 rbo = gem_to_amdgpu_bo(amdgpu_fb->obj); 2831 abo = gem_to_amdgpu_bo(amdgpu_fb->obj);
2832 r = amdgpu_bo_reserve(rbo, false); 2832 r = amdgpu_bo_reserve(abo, false);
2833 if (unlikely(r)) 2833 if (unlikely(r))
2834 DRM_ERROR("failed to reserve rbo before unpin\n"); 2834 DRM_ERROR("failed to reserve abo before unpin\n");
2835 else { 2835 else {
2836 amdgpu_bo_unpin(rbo); 2836 amdgpu_bo_unpin(abo);
2837 amdgpu_bo_unreserve(rbo); 2837 amdgpu_bo_unreserve(abo);
2838 } 2838 }
2839 } 2839 }
2840 /* disable the GRPH */ 2840 /* disable the GRPH */