GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/radeon: remove unnecessary braces around conditionals.

Browse source 
As single statement conditionals do not need to be wrapped around
braces, the unnecessary braces can be removed.

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Wambui Karuga 2020-01-03 16:20:35 +03:00 • committed by Alex Deucher
parent fbd62354f0
commit 3c20d544ef
6 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/radeon/atombios_crtc.c
View file

@ -244,9 +244,8 @@ static void atombios_blank_crtc(struct drm_crtc *crtc, int state)
atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
if (ASIC_IS_DCE8(rdev)) { if (ASIC_IS_DCE8(rdev))
WREG32(vga_control_regs[radeon_crtc->crtc_id], vga_control); WREG32(vga_control_regs[radeon_crtc->crtc_id], vga_control);
}
} }
static void atombios_powergate_crtc(struct drm_crtc *crtc, int state) static void atombios_powergate_crtc(struct drm_crtc *crtc, int state)

3
drivers/gpu/drm/radeon/atombios_dp.c
View file

@ -813,9 +813,8 @@ void radeon_dp_link_train(struct drm_encoder *encoder,
dp_info.use_dpencoder = true; dp_info.use_dpencoder = true;
index = GetIndexIntoMasterTable(COMMAND, DPEncoderService); index = GetIndexIntoMasterTable(COMMAND, DPEncoderService);
if (atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) { if (atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) {
if (crev > 1) { if (crev > 1)
dp_info.use_dpencoder = false; dp_info.use_dpencoder = false;
}
} }
dp_info.enc_id = 0; dp_info.enc_id = 0;

9
drivers/gpu/drm/radeon/atombios_encoders.c
View file

@ -1885,11 +1885,10 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)
if (ASIC_IS_AVIVO(rdev)) if (ASIC_IS_AVIVO(rdev))
args.v1.ucCRTC = radeon_crtc->crtc_id; args.v1.ucCRTC = radeon_crtc->crtc_id;
else { else {
if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1) { if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1)
args.v1.ucCRTC = radeon_crtc->crtc_id; args.v1.ucCRTC = radeon_crtc->crtc_id;
} else { else
args.v1.ucCRTC = radeon_crtc->crtc_id << 2; args.v1.ucCRTC = radeon_crtc->crtc_id << 2;
}
} }
switch (radeon_encoder->encoder_id) { switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_INTERNAL_TMDS1: case ENCODER_OBJECT_ID_INTERNAL_TMDS1:
@ -2234,9 +2233,9 @@ assigned:
DRM_ERROR("Got encoder index incorrect - returning 0\n"); DRM_ERROR("Got encoder index incorrect - returning 0\n");
return 0; return 0;
} }
if (rdev->mode_info.active_encoders & (1 << enc_idx)) { if (rdev->mode_info.active_encoders & (1 << enc_idx))
DRM_ERROR("chosen encoder in use %d\n", enc_idx); DRM_ERROR("chosen encoder in use %d\n", enc_idx);
}
rdev->mode_info.active_encoders |= (1 << enc_idx); rdev->mode_info.active_encoders |= (1 << enc_idx);
return enc_idx; return enc_idx;
} }

4
drivers/gpu/drm/radeon/radeon_connectors.c
View file

@ -700,9 +700,9 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct
else else
ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds); ret = radeon_legacy_get_tmds_info_from_combios(radeon_encoder, tmds);
} }
if (val == 1 || !ret) { if (val == 1 || !ret)
radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds); radeon_legacy_get_tmds_info_from_table(radeon_encoder, tmds);
}
radeon_property_change_mode(&radeon_encoder->base); radeon_property_change_mode(&radeon_encoder->base);
} }

4
drivers/gpu/drm/radeon/radeon_vce.c
View file

@ -388,9 +388,9 @@ int radeon_vce_get_create_msg(struct radeon_device *rdev, int ring,
ib.ptr[i] = cpu_to_le32(0x0); ib.ptr[i] = cpu_to_le32(0x0);
r = radeon_ib_schedule(rdev, &ib, NULL, false); r = radeon_ib_schedule(rdev, &ib, NULL, false);
if (r) { if (r)
DRM_ERROR("radeon: failed to schedule ib (%d).\n", r); DRM_ERROR("radeon: failed to schedule ib (%d).\n", r);
}
if (fence) if (fence)
*fence = radeon_fence_ref(ib.fence); *fence = radeon_fence_ref(ib.fence);

16
drivers/gpu/drm/radeon/radeon_vm.c
View file

@ -296,9 +296,9 @@ struct radeon_bo_va *radeon_vm_bo_find(struct radeon_vm *vm,
struct radeon_bo_va *bo_va; struct radeon_bo_va *bo_va;
list_for_each_entry(bo_va, &bo->va, bo_list) { list_for_each_entry(bo_va, &bo->va, bo_list) {
if (bo_va->vm == vm) { if (bo_va->vm == vm)
return bo_va; return bo_va;
}
} }
return NULL; return NULL;
} }
@ -323,9 +323,9 @@ struct radeon_bo_va *radeon_vm_bo_add(struct radeon_device *rdev,
struct radeon_bo_va *bo_va; struct radeon_bo_va *bo_va;
bo_va = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL); bo_va = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);
if (bo_va == NULL) { if (bo_va == NULL)
return NULL; return NULL;
}
bo_va->vm = vm; bo_va->vm = vm;
bo_va->bo = bo; bo_va->bo = bo;
bo_va->it.start = 0; bo_va->it.start = 0;
@ -947,9 +947,9 @@ int radeon_vm_bo_update(struct radeon_device *rdev,
if (mem) { if (mem) {
addr = (u64)mem->start << PAGE_SHIFT; addr = (u64)mem->start << PAGE_SHIFT;
if (mem->mem_type != TTM_PL_SYSTEM) { if (mem->mem_type != TTM_PL_SYSTEM)
bo_va->flags |= RADEON_VM_PAGE_VALID; bo_va->flags |= RADEON_VM_PAGE_VALID;
}
if (mem->mem_type == TTM_PL_TT) { if (mem->mem_type == TTM_PL_TT) {
bo_va->flags |= RADEON_VM_PAGE_SYSTEM; bo_va->flags |= RADEON_VM_PAGE_SYSTEM;
if (!(bo_va->bo->flags & (RADEON_GEM_GTT_WC | RADEON_GEM_GTT_UC))) if (!(bo_va->bo->flags & (RADEON_GEM_GTT_WC | RADEON_GEM_GTT_UC)))
@ -1233,9 +1233,9 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm)
struct radeon_bo_va *bo_va, *tmp; struct radeon_bo_va *bo_va, *tmp;
int i, r; int i, r;
if (!RB_EMPTY_ROOT(&vm->va.rb_root)) { if (!RB_EMPTY_ROOT(&vm->va.rb_root))
dev_err(rdev->dev, "still active bo inside vm\n"); dev_err(rdev->dev, "still active bo inside vm\n");
}
rbtree_postorder_for_each_entry_safe(bo_va, tmp, rbtree_postorder_for_each_entry_safe(bo_va, tmp,
&vm->va.rb_root, it.rb) { &vm->va.rb_root, it.rb) {
interval_tree_remove(&bo_va->it, &vm->va); interval_tree_remove(&bo_va->it, &vm->va);