Skip to content

Commit 18ef754

Browse files
Ran Sunalexdeucher
authored andcommitted
drm/amdgpu: Clean up errors in dce_v8_0.c
Fix the following errors reported by checkpatch: ERROR: that open brace { should be on the previous line ERROR: code indent should use tabs where possible ERROR: space required before the open brace '{' Signed-off-by: Ran Sun <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 665ba81 commit 18ef754

File tree

1 file changed

+14
-23
lines changed

1 file changed

+14
-23
lines changed

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

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
static void dce_v8_0_set_display_funcs(struct amdgpu_device *adev);
5454
static void dce_v8_0_set_irq_funcs(struct amdgpu_device *adev);
5555

56-
static const u32 crtc_offsets[6] =
57-
{
56+
static const u32 crtc_offsets[6] = {
5857
CRTC0_REGISTER_OFFSET,
5958
CRTC1_REGISTER_OFFSET,
6059
CRTC2_REGISTER_OFFSET,
@@ -63,8 +62,7 @@ static const u32 crtc_offsets[6] =
6362
CRTC5_REGISTER_OFFSET
6463
};
6564

66-
static const u32 hpd_offsets[] =
67-
{
65+
static const u32 hpd_offsets[] = {
6866
HPD0_REGISTER_OFFSET,
6967
HPD1_REGISTER_OFFSET,
7068
HPD2_REGISTER_OFFSET,
@@ -1345,9 +1343,9 @@ static void dce_v8_0_audio_write_sad_regs(struct drm_encoder *encoder)
13451343
if (sad->channels > max_channels) {
13461344
value = (sad->channels <<
13471345
AZALIA_F0_CODEC_PIN_CONTROL_AUDIO_DESCRIPTOR0__MAX_CHANNELS__SHIFT) |
1348-
(sad->byte2 <<
1346+
(sad->byte2 <<
13491347
AZALIA_F0_CODEC_PIN_CONTROL_AUDIO_DESCRIPTOR0__DESCRIPTOR_BYTE_2__SHIFT) |
1350-
(sad->freq <<
1348+
(sad->freq <<
13511349
AZALIA_F0_CODEC_PIN_CONTROL_AUDIO_DESCRIPTOR0__SUPPORTED_FREQUENCIES__SHIFT);
13521350
max_channels = sad->channels;
13531351
}
@@ -1379,8 +1377,7 @@ static void dce_v8_0_audio_enable(struct amdgpu_device *adev,
13791377
enable ? AZALIA_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL__AUDIO_ENABLED_MASK : 0);
13801378
}
13811379

1382-
static const u32 pin_offsets[7] =
1383-
{
1380+
static const u32 pin_offsets[7] = {
13841381
(0x1780 - 0x1780),
13851382
(0x1786 - 0x1780),
13861383
(0x178c - 0x1780),
@@ -1740,8 +1737,7 @@ static void dce_v8_0_afmt_fini(struct amdgpu_device *adev)
17401737
}
17411738
}
17421739

1743-
static const u32 vga_control_regs[6] =
1744-
{
1740+
static const u32 vga_control_regs[6] = {
17451741
mmD1VGA_CONTROL,
17461742
mmD2VGA_CONTROL,
17471743
mmD3VGA_CONTROL,
@@ -1895,9 +1891,9 @@ static int dce_v8_0_crtc_do_set_base(struct drm_crtc *crtc,
18951891
case DRM_FORMAT_XBGR8888:
18961892
case DRM_FORMAT_ABGR8888:
18971893
fb_format = ((GRPH_DEPTH_32BPP << GRPH_CONTROL__GRPH_DEPTH__SHIFT) |
1898-
(GRPH_FORMAT_ARGB8888 << GRPH_CONTROL__GRPH_FORMAT__SHIFT));
1894+
(GRPH_FORMAT_ARGB8888 << GRPH_CONTROL__GRPH_FORMAT__SHIFT));
18991895
fb_swap = ((GRPH_RED_SEL_B << GRPH_SWAP_CNTL__GRPH_RED_CROSSBAR__SHIFT) |
1900-
(GRPH_BLUE_SEL_R << GRPH_SWAP_CNTL__GRPH_BLUE_CROSSBAR__SHIFT));
1896+
(GRPH_BLUE_SEL_R << GRPH_SWAP_CNTL__GRPH_BLUE_CROSSBAR__SHIFT));
19011897
#ifdef __BIG_ENDIAN
19021898
fb_swap |= (GRPH_ENDIAN_8IN32 << GRPH_SWAP_CNTL__GRPH_ENDIAN_SWAP__SHIFT);
19031899
#endif
@@ -3151,7 +3147,7 @@ static int dce_v8_0_pageflip_irq(struct amdgpu_device *adev,
31513147

31523148
spin_lock_irqsave(&adev_to_drm(adev)->event_lock, flags);
31533149
works = amdgpu_crtc->pflip_works;
3154-
if (amdgpu_crtc->pflip_status != AMDGPU_FLIP_SUBMITTED){
3150+
if (amdgpu_crtc->pflip_status != AMDGPU_FLIP_SUBMITTED) {
31553151
DRM_DEBUG_DRIVER("amdgpu_crtc->pflip_status = %d != "
31563152
"AMDGPU_FLIP_SUBMITTED(%d)\n",
31573153
amdgpu_crtc->pflip_status,
@@ -3544,44 +3540,39 @@ static void dce_v8_0_set_irq_funcs(struct amdgpu_device *adev)
35443540
adev->hpd_irq.funcs = &dce_v8_0_hpd_irq_funcs;
35453541
}
35463542

3547-
const struct amdgpu_ip_block_version dce_v8_0_ip_block =
3548-
{
3543+
const struct amdgpu_ip_block_version dce_v8_0_ip_block = {
35493544
.type = AMD_IP_BLOCK_TYPE_DCE,
35503545
.major = 8,
35513546
.minor = 0,
35523547
.rev = 0,
35533548
.funcs = &dce_v8_0_ip_funcs,
35543549
};
35553550

3556-
const struct amdgpu_ip_block_version dce_v8_1_ip_block =
3557-
{
3551+
const struct amdgpu_ip_block_version dce_v8_1_ip_block = {
35583552
.type = AMD_IP_BLOCK_TYPE_DCE,
35593553
.major = 8,
35603554
.minor = 1,
35613555
.rev = 0,
35623556
.funcs = &dce_v8_0_ip_funcs,
35633557
};
35643558

3565-
const struct amdgpu_ip_block_version dce_v8_2_ip_block =
3566-
{
3559+
const struct amdgpu_ip_block_version dce_v8_2_ip_block = {
35673560
.type = AMD_IP_BLOCK_TYPE_DCE,
35683561
.major = 8,
35693562
.minor = 2,
35703563
.rev = 0,
35713564
.funcs = &dce_v8_0_ip_funcs,
35723565
};
35733566

3574-
const struct amdgpu_ip_block_version dce_v8_3_ip_block =
3575-
{
3567+
const struct amdgpu_ip_block_version dce_v8_3_ip_block = {
35763568
.type = AMD_IP_BLOCK_TYPE_DCE,
35773569
.major = 8,
35783570
.minor = 3,
35793571
.rev = 0,
35803572
.funcs = &dce_v8_0_ip_funcs,
35813573
};
35823574

3583-
const struct amdgpu_ip_block_version dce_v8_5_ip_block =
3584-
{
3575+
const struct amdgpu_ip_block_version dce_v8_5_ip_block = {
35853576
.type = AMD_IP_BLOCK_TYPE_DCE,
35863577
.major = 8,
35873578
.minor = 5,

0 commit comments

Comments
 (0)