|
@@ -2012,8 +2012,7 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc,
|
|
if (atomic) {
|
|
if (atomic) {
|
|
amdgpu_fb = to_amdgpu_framebuffer(fb);
|
|
amdgpu_fb = to_amdgpu_framebuffer(fb);
|
|
target_fb = fb;
|
|
target_fb = fb;
|
|
- }
|
|
|
|
- else {
|
|
|
|
|
|
+ } else {
|
|
amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb);
|
|
amdgpu_fb = to_amdgpu_framebuffer(crtc->primary->fb);
|
|
target_fb = crtc->primary->fb;
|
|
target_fb = crtc->primary->fb;
|
|
}
|
|
}
|
|
@@ -2027,9 +2026,9 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc,
|
|
if (unlikely(r != 0))
|
|
if (unlikely(r != 0))
|
|
return r;
|
|
return r;
|
|
|
|
|
|
- if (atomic)
|
|
|
|
|
|
+ if (atomic) {
|
|
fb_location = amdgpu_bo_gpu_offset(rbo);
|
|
fb_location = amdgpu_bo_gpu_offset(rbo);
|
|
- else {
|
|
|
|
|
|
+ } else {
|
|
r = amdgpu_bo_pin(rbo, AMDGPU_GEM_DOMAIN_VRAM, &fb_location);
|
|
r = amdgpu_bo_pin(rbo, AMDGPU_GEM_DOMAIN_VRAM, &fb_location);
|
|
if (unlikely(r != 0)) {
|
|
if (unlikely(r != 0)) {
|
|
amdgpu_bo_unreserve(rbo);
|
|
amdgpu_bo_unreserve(rbo);
|