aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-02-28 07:55:52 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-03-29 23:53:24 -0400
commit7ca85295d8cc280ea79cf6250c47363b7fd92f92 (patch)
treeefcd4b095533ddbb7e03dc305403fde3873d940c /drivers
parenteeca2324900e922b693b2b6ddacc502c78f1c1ef (diff)
gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level>
Use a more common logging style. Miscellanea: o Coalesce formats and realign arguments o Neaten a few macros now using pr_<level> Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c3
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_test.c2
-rw-r--r--drivers/gpu/drm/amd/amdgpu/atom.c44
-rw-r--r--drivers/gpu/drm/amd/amdgpu/ci_dpm.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/cik_sdma.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c8
-rw-r--r--drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c4
-rw-r--r--drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c4
-rw-r--r--drivers/gpu/drm/amd/include/amd_pcie_helpers.h4
-rw-r--r--drivers/gpu/drm/radeon/atom.c46
-rw-r--r--drivers/gpu/drm/radeon/cik.c56
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c2
-rw-r--r--drivers/gpu/drm/radeon/evergreen_cs.c7
-rw-r--r--drivers/gpu/drm/radeon/ni.c22
-rw-r--r--drivers/gpu/drm/radeon/r100.c18
-rw-r--r--drivers/gpu/drm/radeon/r200.c3
-rw-r--r--drivers/gpu/drm/radeon/r300.c13
-rw-r--r--drivers/gpu/drm/radeon/r420.c9
-rw-r--r--drivers/gpu/drm/radeon/r520.c3
-rw-r--r--drivers/gpu/drm/radeon/r600.c21
-rw-r--r--drivers/gpu/drm/radeon/r600_cs.c7
-rw-r--r--drivers/gpu/drm/radeon/radeon.h3
-rw-r--r--drivers/gpu/drm/radeon/radeon_atpx_handler.c4
-rw-r--r--drivers/gpu/drm/radeon/radeon_audio.c4
-rw-r--r--drivers/gpu/drm/radeon/radeon_clocks.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c8
-rw-r--r--drivers/gpu/drm/radeon/radeon_fb.c3
-rw-r--r--drivers/gpu/drm/radeon/radeon_gem.c4
-rw-r--r--drivers/gpu/drm/radeon/radeon_test.c6
-rw-r--r--drivers/gpu/drm/radeon/rs400.c4
-rw-r--r--drivers/gpu/drm/radeon/rs690.c3
-rw-r--r--drivers/gpu/drm/radeon/rv515.c9
-rw-r--r--drivers/gpu/drm/radeon/si.c45
39 files changed, 155 insertions, 252 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c
index 857ba0897159..3889486f71fe 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c
@@ -74,9 +74,9 @@ static void amdgpu_afmt_calc_cts(uint32_t clock, int *CTS, int *N, int freq)
74 74
75 /* Check that we are in spec (not always possible) */ 75 /* Check that we are in spec (not always possible) */
76 if (n < (128*freq/1500)) 76 if (n < (128*freq/1500))
77 printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); 77 pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n");
78 if (n > (128*freq/300)) 78 if (n > (128*freq/300))
79 printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); 79 pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n");
80 80
81 *N = n; 81 *N = n;
82 *CTS = cts; 82 *CTS = cts;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
index 6c343a933182..c13c51af0b68 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
@@ -583,8 +583,8 @@ static bool amdgpu_atpx_detect(void)
583 583
584 if (has_atpx && vga_count == 2) { 584 if (has_atpx && vga_count == 2) {
585 acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); 585 acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer);
586 printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", 586 pr_info("vga_switcheroo: detected switching method %s handle\n",
587 acpi_method_name); 587 acpi_method_name);
588 amdgpu_atpx_priv.atpx_detected = true; 588 amdgpu_atpx_priv.atpx_detected = true;
589 amdgpu_atpx_priv.bridge_pm_usable = d3_supported; 589 amdgpu_atpx_priv.bridge_pm_usable = d3_supported;
590 amdgpu_atpx_init(); 590 amdgpu_atpx_init();
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index cc01b3f27a1f..e71a89c73684 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1059,7 +1059,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
1059 if (state == VGA_SWITCHEROO_ON) { 1059 if (state == VGA_SWITCHEROO_ON) {
1060 unsigned d3_delay = dev->pdev->d3_delay; 1060 unsigned d3_delay = dev->pdev->d3_delay;
1061 1061
1062 printk(KERN_INFO "amdgpu: switched on\n"); 1062 pr_info("amdgpu: switched on\n");
1063 /* don't suspend or resume card normally */ 1063 /* don't suspend or resume card normally */
1064 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; 1064 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
1065 1065
@@ -1070,7 +1070,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
1070 dev->switch_power_state = DRM_SWITCH_POWER_ON; 1070 dev->switch_power_state = DRM_SWITCH_POWER_ON;
1071 drm_kms_helper_poll_enable(dev); 1071 drm_kms_helper_poll_enable(dev);
1072 } else { 1072 } else {
1073 printk(KERN_INFO "amdgpu: switched off\n"); 1073 pr_info("amdgpu: switched off\n");
1074 drm_kms_helper_poll_disable(dev); 1074 drm_kms_helper_poll_disable(dev);
1075 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; 1075 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
1076 amdgpu_device_suspend(dev, true, true); 1076 amdgpu_device_suspend(dev, true, true);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index bab109e46d22..a48142d930c6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -151,8 +151,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
151 AMDGPU_GEM_CREATE_VRAM_CLEARED, 151 AMDGPU_GEM_CREATE_VRAM_CLEARED,
152 true, &gobj); 152 true, &gobj);
153 if (ret) { 153 if (ret) {
154 printk(KERN_ERR "failed to allocate framebuffer (%d)\n", 154 pr_err("failed to allocate framebuffer (%d)\n", aligned_size);
155 aligned_size);
156 return -ENOMEM; 155 return -ENOMEM;
157 } 156 }
158 abo = gem_to_amdgpu_bo(gobj); 157 abo = gem_to_amdgpu_bo(gobj);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index e05a24325eeb..b0483e6e536f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -228,7 +228,7 @@ out_unref:
228out_cleanup: 228out_cleanup:
229 kfree(gtt_obj); 229 kfree(gtt_obj);
230 if (r) { 230 if (r) {
231 printk(KERN_WARNING "Error while testing BO move.\n"); 231 pr_warn("Error while testing BO move\n");
232 } 232 }
233} 233}
234 234
diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index 1b50e6c13fb3..d1444aaca038 100644
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -166,7 +166,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
166 case ATOM_IIO_END: 166 case ATOM_IIO_END:
167 return temp; 167 return temp;
168 default: 168 default:
169 printk(KERN_INFO "Unknown IIO opcode.\n"); 169 pr_info("Unknown IIO opcode\n");
170 return 0; 170 return 0;
171 } 171 }
172} 172}
@@ -190,22 +190,19 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
190 val = gctx->card->reg_read(gctx->card, idx); 190 val = gctx->card->reg_read(gctx->card, idx);
191 break; 191 break;
192 case ATOM_IO_PCI: 192 case ATOM_IO_PCI:
193 printk(KERN_INFO 193 pr_info("PCI registers are not implemented\n");
194 "PCI registers are not implemented.\n");
195 return 0; 194 return 0;
196 case ATOM_IO_SYSIO: 195 case ATOM_IO_SYSIO:
197 printk(KERN_INFO 196 pr_info("SYSIO registers are not implemented\n");
198 "SYSIO registers are not implemented.\n");
199 return 0; 197 return 0;
200 default: 198 default:
201 if (!(gctx->io_mode & 0x80)) { 199 if (!(gctx->io_mode & 0x80)) {
202 printk(KERN_INFO "Bad IO mode.\n"); 200 pr_info("Bad IO mode\n");
203 return 0; 201 return 0;
204 } 202 }
205 if (!gctx->iio[gctx->io_mode & 0x7F]) { 203 if (!gctx->iio[gctx->io_mode & 0x7F]) {
206 printk(KERN_INFO 204 pr_info("Undefined indirect IO read method %d\n",
207 "Undefined indirect IO read method %d.\n", 205 gctx->io_mode & 0x7F);
208 gctx->io_mode & 0x7F);
209 return 0; 206 return 0;
210 } 207 }
211 val = 208 val =
@@ -469,22 +466,19 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
469 gctx->card->reg_write(gctx->card, idx, val); 466 gctx->card->reg_write(gctx->card, idx, val);
470 break; 467 break;
471 case ATOM_IO_PCI: 468 case ATOM_IO_PCI:
472 printk(KERN_INFO 469 pr_info("PCI registers are not implemented\n");
473 "PCI registers are not implemented.\n");
474 return; 470 return;
475 case ATOM_IO_SYSIO: 471 case ATOM_IO_SYSIO:
476 printk(KERN_INFO 472 pr_info("SYSIO registers are not implemented\n");
477 "SYSIO registers are not implemented.\n");
478 return; 473 return;
479 default: 474 default:
480 if (!(gctx->io_mode & 0x80)) { 475 if (!(gctx->io_mode & 0x80)) {
481 printk(KERN_INFO "Bad IO mode.\n"); 476 pr_info("Bad IO mode\n");
482 return; 477 return;
483 } 478 }
484 if (!gctx->iio[gctx->io_mode & 0xFF]) { 479 if (!gctx->iio[gctx->io_mode & 0xFF]) {
485 printk(KERN_INFO 480 pr_info("Undefined indirect IO write method %d\n",
486 "Undefined indirect IO write method %d.\n", 481 gctx->io_mode & 0x7F);
487 gctx->io_mode & 0x7F);
488 return; 482 return;
489 } 483 }
490 atom_iio_execute(gctx, gctx->iio[gctx->io_mode & 0xFF], 484 atom_iio_execute(gctx, gctx->iio[gctx->io_mode & 0xFF],
@@ -850,17 +844,17 @@ static void atom_op_postcard(atom_exec_context *ctx, int *ptr, int arg)
850 844
851static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg) 845static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg)
852{ 846{
853 printk(KERN_INFO "unimplemented!\n"); 847 pr_info("unimplemented!\n");
854} 848}
855 849
856static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg) 850static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg)
857{ 851{
858 printk(KERN_INFO "unimplemented!\n"); 852 pr_info("unimplemented!\n");
859} 853}
860 854
861static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg) 855static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg)
862{ 856{
863 printk(KERN_INFO "unimplemented!\n"); 857 pr_info("unimplemented!\n");
864} 858}
865 859
866static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg) 860static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg)
@@ -1023,7 +1017,7 @@ static void atom_op_switch(atom_exec_context *ctx, int *ptr, int arg)
1023 } 1017 }
1024 (*ptr) += 2; 1018 (*ptr) += 2;
1025 } else { 1019 } else {
1026 printk(KERN_INFO "Bad case.\n"); 1020 pr_info("Bad case\n");
1027 return; 1021 return;
1028 } 1022 }
1029 (*ptr) += 2; 1023 (*ptr) += 2;
@@ -1316,14 +1310,14 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
1316 ctx->bios = bios; 1310 ctx->bios = bios;
1317 1311
1318 if (CU16(0) != ATOM_BIOS_MAGIC) { 1312 if (CU16(0) != ATOM_BIOS_MAGIC) {
1319 printk(KERN_INFO "Invalid BIOS magic.\n"); 1313 pr_info("Invalid BIOS magic\n");
1320 kfree(ctx); 1314 kfree(ctx);
1321 return NULL; 1315 return NULL;
1322 } 1316 }
1323 if (strncmp 1317 if (strncmp
1324 (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC, 1318 (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC,
1325 strlen(ATOM_ATI_MAGIC))) { 1319 strlen(ATOM_ATI_MAGIC))) {
1326 printk(KERN_INFO "Invalid ATI magic.\n"); 1320 pr_info("Invalid ATI magic\n");
1327 kfree(ctx); 1321 kfree(ctx);
1328 return NULL; 1322 return NULL;
1329 } 1323 }
@@ -1332,7 +1326,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
1332 if (strncmp 1326 if (strncmp
1333 (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC, 1327 (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC,
1334 strlen(ATOM_ROM_MAGIC))) { 1328 strlen(ATOM_ROM_MAGIC))) {
1335 printk(KERN_INFO "Invalid ATOM magic.\n"); 1329 pr_info("Invalid ATOM magic\n");
1336 kfree(ctx); 1330 kfree(ctx);
1337 return NULL; 1331 return NULL;
1338 } 1332 }
@@ -1356,7 +1350,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
1356 break; 1350 break;
1357 } 1351 }
1358 } 1352 }
1359 printk(KERN_INFO "ATOM BIOS: %s\n", name); 1353 pr_info("ATOM BIOS: %s\n", name);
1360 1354
1361 return ctx; 1355 return ctx;
1362} 1356}
diff --git a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
index b00e81db522d..c8cb96409125 100644
--- a/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/ci_dpm.c
@@ -5840,9 +5840,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
5840 5840
5841out: 5841out:
5842 if (err) { 5842 if (err) {
5843 printk(KERN_ERR 5843 pr_err("cik_smc: Failed to load firmware \"%s\"\n", fw_name);
5844 "cik_smc: Failed to load firmware \"%s\"\n",
5845 fw_name);
5846 release_firmware(adev->pm.fw); 5844 release_firmware(adev->pm.fw);
5847 adev->pm.fw = NULL; 5845 adev->pm.fw = NULL;
5848 } 5846 }
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 810bba533975..c33bc1bb4655 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -142,9 +142,7 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
142 } 142 }
143out: 143out:
144 if (err) { 144 if (err) {
145 printk(KERN_ERR 145 pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name);
146 "cik_sdma: Failed to load firmware \"%s\"\n",
147 fw_name);
148 for (i = 0; i < adev->sdma.num_instances; i++) { 146 for (i = 0; i < adev->sdma.num_instances; i++) {
149 release_firmware(adev->sdma.instance[i].fw); 147 release_firmware(adev->sdma.instance[i].fw);
150 adev->sdma.instance[i].fw = NULL; 148 adev->sdma.instance[i].fw = NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index e78433799a6d..02ca2322c30b 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -378,9 +378,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
378 378
379out: 379out:
380 if (err) { 380 if (err) {
381 printk(KERN_ERR 381 pr_err("gfx6: Failed to load firmware \"%s\"\n", fw_name);
382 "gfx6: Failed to load firmware \"%s\"\n",
383 fw_name);
384 release_firmware(adev->gfx.pfp_fw); 382 release_firmware(adev->gfx.pfp_fw);
385 adev->gfx.pfp_fw = NULL; 383 adev->gfx.pfp_fw = NULL;
386 release_firmware(adev->gfx.me_fw); 384 release_firmware(adev->gfx.me_fw);
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 286d6763afa7..e471c08dd249 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -972,9 +972,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
972 972
973out: 973out:
974 if (err) { 974 if (err) {
975 printk(KERN_ERR 975 pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name);
976 "gfx7: Failed to load firmware \"%s\"\n",
977 fw_name);
978 release_firmware(adev->gfx.pfp_fw); 976 release_firmware(adev->gfx.pfp_fw);
979 adev->gfx.pfp_fw = NULL; 977 adev->gfx.pfp_fw = NULL;
980 release_firmware(adev->gfx.me_fw); 978 release_firmware(adev->gfx.me_fw);
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
index 4b38d062cbe4..552bf6b7851c 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
@@ -161,9 +161,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
161 161
162out: 162out:
163 if (err) { 163 if (err) {
164 printk(KERN_ERR 164 pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name);
165 "cik_mc: Failed to load firmware \"%s\"\n",
166 fw_name);
167 release_firmware(adev->mc.fw); 165 release_firmware(adev->mc.fw);
168 adev->mc.fw = NULL; 166 adev->mc.fw = NULL;
169 } 167 }
@@ -994,12 +992,12 @@ static int gmc_v7_0_sw_init(void *handle)
994 if (r) { 992 if (r) {
995 adev->need_dma32 = true; 993 adev->need_dma32 = true;
996 dma_bits = 32; 994 dma_bits = 32;
997 printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); 995 pr_warn("amdgpu: No suitable DMA available\n");
998 } 996 }
999 r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); 997 r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits));
1000 if (r) { 998 if (r) {
1001 pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); 999 pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32));
1002 printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); 1000 pr_warn("amdgpu: No coherent DMA available\n");
1003 } 1001 }
1004 1002
1005 r = gmc_v7_0_init_microcode(adev); 1003 r = gmc_v7_0_init_microcode(adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 6e32f28eafde..f2bd0164bdfd 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -245,9 +245,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
245 245
246out: 246out:
247 if (err) { 247 if (err) {
248 printk(KERN_ERR 248 pr_err("mc: Failed to load firmware \"%s\"\n", fw_name);
249 "mc: Failed to load firmware \"%s\"\n",
250 fw_name);
251 release_firmware(adev->mc.fw); 249 release_firmware(adev->mc.fw);
252 adev->mc.fw = NULL; 250 adev->mc.fw = NULL;
253 } 251 }
@@ -1006,12 +1004,12 @@ static int gmc_v8_0_sw_init(void *handle)
1006 if (r) { 1004 if (r) {
1007 adev->need_dma32 = true; 1005 adev->need_dma32 = true;
1008 dma_bits = 32; 1006 dma_bits = 32;
1009 printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); 1007 pr_warn("amdgpu: No suitable DMA available\n");
1010 } 1008 }
1011 r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); 1009 r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits));
1012 if (r) { 1010 if (r) {
1013 pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); 1011 pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32));
1014 printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); 1012 pr_warn("amdgpu: No coherent DMA available\n");
1015 } 1013 }
1016 1014
1017 r = gmc_v8_0_init_microcode(adev); 1015 r = gmc_v8_0_init_microcode(adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 896be64b7013..a881cf475a19 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -170,9 +170,7 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
170 170
171out: 171out:
172 if (err) { 172 if (err) {
173 printk(KERN_ERR 173 pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name);
174 "sdma_v2_4: Failed to load firmware \"%s\"\n",
175 fw_name);
176 for (i = 0; i < adev->sdma.num_instances; i++) { 174 for (i = 0; i < adev->sdma.num_instances; i++) {
177 release_firmware(adev->sdma.instance[i].fw); 175 release_firmware(adev->sdma.instance[i].fw);
178 adev->sdma.instance[i].fw = NULL; 176 adev->sdma.instance[i].fw = NULL;
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 1ac876fe3d5a..c4d7dd7f73a8 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -321,9 +321,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
321 } 321 }
322out: 322out:
323 if (err) { 323 if (err) {
324 printk(KERN_ERR 324 pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name);
325 "sdma_v3_0: Failed to load firmware \"%s\"\n",
326 fw_name);
327 for (i = 0; i < adev->sdma.num_instances; i++) { 325 for (i = 0; i < adev->sdma.num_instances; i++) {
328 release_firmware(adev->sdma.instance[i].fw); 326 release_firmware(adev->sdma.instance[i].fw);
329 adev->sdma.instance[i].fw = NULL; 327 adev->sdma.instance[i].fw = NULL;
diff --git a/drivers/gpu/drm/amd/include/amd_pcie_helpers.h b/drivers/gpu/drm/amd/include/amd_pcie_helpers.h
index 5725bf85eacc..7e5a965450c7 100644
--- a/drivers/gpu/drm/amd/include/amd_pcie_helpers.h
+++ b/drivers/gpu/drm/amd/include/amd_pcie_helpers.h
@@ -82,7 +82,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap,
82 82
83 switch (pcie_lane_width_cap) { 83 switch (pcie_lane_width_cap) {
84 case 0: 84 case 0:
85 printk(KERN_ERR "No valid PCIE lane width reported"); 85 pr_err("No valid PCIE lane width reported\n");
86 break; 86 break;
87 case CAIL_PCIE_LINK_WIDTH_SUPPORT_X1: 87 case CAIL_PCIE_LINK_WIDTH_SUPPORT_X1:
88 new_pcie_lanes = 1; 88 new_pcie_lanes = 1;
@@ -126,7 +126,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap,
126 } 126 }
127 } 127 }
128 if (j > 7) 128 if (j > 7)
129 printk(KERN_ERR "Cannot find a valid PCIE lane width!"); 129 pr_err("Cannot find a valid PCIE lane width!\n");
130 } 130 }
131 } 131 }
132 break; 132 break;
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
index f66c33dd21a3..6a2e091aa7b6 100644
--- a/drivers/gpu/drm/radeon/atom.c
+++ b/drivers/gpu/drm/radeon/atom.c
@@ -170,7 +170,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
170 case ATOM_IIO_END: 170 case ATOM_IIO_END:
171 return temp; 171 return temp;
172 default: 172 default:
173 printk(KERN_INFO "Unknown IIO opcode.\n"); 173 pr_info("Unknown IIO opcode\n");
174 return 0; 174 return 0;
175 } 175 }
176} 176}
@@ -194,22 +194,19 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
194 val = gctx->card->reg_read(gctx->card, idx); 194 val = gctx->card->reg_read(gctx->card, idx);
195 break; 195 break;
196 case ATOM_IO_PCI: 196 case ATOM_IO_PCI:
197 printk(KERN_INFO 197 pr_info("PCI registers are not implemented\n");
198 "PCI registers are not implemented.\n");
199 return 0; 198 return 0;
200 case ATOM_IO_SYSIO: 199 case ATOM_IO_SYSIO:
201 printk(KERN_INFO 200 pr_info("SYSIO registers are not implemented\n");
202 "SYSIO registers are not implemented.\n");
203 return 0; 201 return 0;
204 default: 202 default:
205 if (!(gctx->io_mode & 0x80)) { 203 if (!(gctx->io_mode & 0x80)) {
206 printk(KERN_INFO "Bad IO mode.\n"); 204 pr_info("Bad IO mode\n");
207 return 0; 205 return 0;
208 } 206 }
209 if (!gctx->iio[gctx->io_mode & 0x7F]) { 207 if (!gctx->iio[gctx->io_mode & 0x7F]) {
210 printk(KERN_INFO 208 pr_info("Undefined indirect IO read method %d\n",
211 "Undefined indirect IO read method %d.\n", 209 gctx->io_mode & 0x7F);
212 gctx->io_mode & 0x7F);
213 return 0; 210 return 0;
214 } 211 }
215 val = 212 val =
@@ -473,22 +470,19 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
473 gctx->card->reg_write(gctx->card, idx, val); 470 gctx->card->reg_write(gctx->card, idx, val);
474 break; 471 break;
475 case ATOM_IO_PCI: 472 case ATOM_IO_PCI:
476 printk(KERN_INFO 473 pr_info("PCI registers are not implemented\n");
477 "PCI registers are not implemented.\n");
478 return; 474 return;
479 case ATOM_IO_SYSIO: 475 case ATOM_IO_SYSIO:
480 printk(KERN_INFO 476 pr_info("SYSIO registers are not implemented\n");
481 "SYSIO registers are not implemented.\n");
482 return; 477 return;
483 default: 478 default:
484 if (!(gctx->io_mode & 0x80)) { 479 if (!(gctx->io_mode & 0x80)) {
485 printk(KERN_INFO "Bad IO mode.\n"); 480 pr_info("Bad IO mode\n");
486 return; 481 return;
487 } 482 }
488 if (!gctx->iio[gctx->io_mode & 0xFF]) { 483 if (!gctx->iio[gctx->io_mode & 0xFF]) {
489 printk(KERN_INFO 484 pr_info("Undefined indirect IO write method %d\n",
490 "Undefined indirect IO write method %d.\n", 485 gctx->io_mode & 0x7F);
491 gctx->io_mode & 0x7F);
492 return; 486 return;
493 } 487 }
494 atom_iio_execute(gctx, gctx->iio[gctx->io_mode & 0xFF], 488 atom_iio_execute(gctx, gctx->iio[gctx->io_mode & 0xFF],
@@ -819,17 +813,17 @@ static void atom_op_postcard(atom_exec_context *ctx, int *ptr, int arg)
819 813
820static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg) 814static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg)
821{ 815{
822 printk(KERN_INFO "unimplemented!\n"); 816 pr_info("unimplemented!\n");
823} 817}
824 818
825static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg) 819static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg)
826{ 820{
827 printk(KERN_INFO "unimplemented!\n"); 821 pr_info("unimplemented!\n");
828} 822}
829 823
830static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg) 824static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg)
831{ 825{
832 printk(KERN_INFO "unimplemented!\n"); 826 pr_info("unimplemented!\n");
833} 827}
834 828
835static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg) 829static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg)
@@ -992,7 +986,7 @@ static void atom_op_switch(atom_exec_context *ctx, int *ptr, int arg)
992 } 986 }
993 (*ptr) += 2; 987 (*ptr) += 2;
994 } else { 988 } else {
995 printk(KERN_INFO "Bad case.\n"); 989 pr_info("Bad case\n");
996 return; 990 return;
997 } 991 }
998 (*ptr) += 2; 992 (*ptr) += 2;
@@ -1026,7 +1020,7 @@ static void atom_op_xor(atom_exec_context *ctx, int *ptr, int arg)
1026 1020
1027static void atom_op_debug(atom_exec_context *ctx, int *ptr, int arg) 1021static void atom_op_debug(atom_exec_context *ctx, int *ptr, int arg)
1028{ 1022{
1029 printk(KERN_INFO "unimplemented!\n"); 1023 pr_info("unimplemented!\n");
1030} 1024}
1031 1025
1032static struct { 1026static struct {
@@ -1280,14 +1274,14 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
1280 ctx->bios = bios; 1274 ctx->bios = bios;
1281 1275
1282 if (CU16(0) != ATOM_BIOS_MAGIC) { 1276 if (CU16(0) != ATOM_BIOS_MAGIC) {
1283 printk(KERN_INFO "Invalid BIOS magic.\n"); 1277 pr_info("Invalid BIOS magic\n");
1284 kfree(ctx); 1278 kfree(ctx);
1285 return NULL; 1279 return NULL;
1286 } 1280 }
1287 if (strncmp 1281 if (strncmp
1288 (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC, 1282 (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC,
1289 strlen(ATOM_ATI_MAGIC))) { 1283 strlen(ATOM_ATI_MAGIC))) {
1290 printk(KERN_INFO "Invalid ATI magic.\n"); 1284 pr_info("Invalid ATI magic\n");
1291 kfree(ctx); 1285 kfree(ctx);
1292 return NULL; 1286 return NULL;
1293 } 1287 }
@@ -1296,7 +1290,7 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
1296 if (strncmp 1290 if (strncmp
1297 (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC, 1291 (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC,
1298 strlen(ATOM_ROM_MAGIC))) { 1292 strlen(ATOM_ROM_MAGIC))) {
1299 printk(KERN_INFO "Invalid ATOM magic.\n"); 1293 pr_info("Invalid ATOM magic\n");
1300 kfree(ctx); 1294 kfree(ctx);
1301 return NULL; 1295 return NULL;
1302 } 1296 }
@@ -1320,7 +1314,7 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
1320 break; 1314 break;
1321 } 1315 }
1322 } 1316 }
1323 printk(KERN_INFO "ATOM BIOS: %s\n", name); 1317 pr_info("ATOM BIOS: %s\n", name);
1324 1318
1325 return ctx; 1319 return ctx;
1326} 1320}
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index ac0d93936d77..53710dd7d5dd 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -2072,8 +2072,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
2072 if (err) 2072 if (err)
2073 goto out; 2073 goto out;
2074 if (rdev->pfp_fw->size != pfp_req_size) { 2074 if (rdev->pfp_fw->size != pfp_req_size) {
2075 printk(KERN_ERR 2075 pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
2076 "cik_cp: Bogus length %zu in firmware \"%s\"\n",
2077 rdev->pfp_fw->size, fw_name); 2076 rdev->pfp_fw->size, fw_name);
2078 err = -EINVAL; 2077 err = -EINVAL;
2079 goto out; 2078 goto out;
@@ -2081,8 +2080,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
2081 } else { 2080 } else {
2082 err = radeon_ucode_validate(rdev->pfp_fw); 2081 err = radeon_ucode_validate(rdev->pfp_fw);
2083 if (err) { 2082 if (err) {
2084 printk(KERN_ERR 2083 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2085 "cik_fw: validation failed for firmware \"%s\"\n",
2086 fw_name); 2084 fw_name);
2087 goto out; 2085 goto out;
2088 } else { 2086 } else {
@@ -2098,16 +2096,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
2098 if (err) 2096 if (err)
2099 goto out; 2097 goto out;
2100 if (rdev->me_fw->size != me_req_size) { 2098 if (rdev->me_fw->size != me_req_size) {
2101 printk(KERN_ERR 2099 pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
2102 "cik_cp: Bogus length %zu in firmware \"%s\"\n",
2103 rdev->me_fw->size, fw_name); 2100 rdev->me_fw->size, fw_name);
2104 err = -EINVAL; 2101 err = -EINVAL;
2105 } 2102 }
2106 } else { 2103 } else {
2107 err = radeon_ucode_validate(rdev->me_fw); 2104 err = radeon_ucode_validate(rdev->me_fw);
2108 if (err) { 2105 if (err) {
2109 printk(KERN_ERR 2106 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2110 "cik_fw: validation failed for firmware \"%s\"\n",
2111 fw_name); 2107 fw_name);
2112 goto out; 2108 goto out;
2113 } else { 2109 } else {
@@ -2123,16 +2119,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
2123 if (err) 2119 if (err)
2124 goto out; 2120 goto out;
2125 if (rdev->ce_fw->size != ce_req_size) { 2121 if (rdev->ce_fw->size != ce_req_size) {
2126 printk(KERN_ERR 2122 pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
2127 "cik_cp: Bogus length %zu in firmware \"%s\"\n",
2128 rdev->ce_fw->size, fw_name); 2123 rdev->ce_fw->size, fw_name);
2129 err = -EINVAL; 2124 err = -EINVAL;
2130 } 2125 }
2131 } else { 2126 } else {
2132 err = radeon_ucode_validate(rdev->ce_fw); 2127 err = radeon_ucode_validate(rdev->ce_fw);
2133 if (err) { 2128 if (err) {
2134 printk(KERN_ERR 2129 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2135 "cik_fw: validation failed for firmware \"%s\"\n",
2136 fw_name); 2130 fw_name);
2137 goto out; 2131 goto out;
2138 } else { 2132 } else {
@@ -2148,16 +2142,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
2148 if (err) 2142 if (err)
2149 goto out; 2143 goto out;
2150 if (rdev->mec_fw->size != mec_req_size) { 2144 if (rdev->mec_fw->size != mec_req_size) {
2151 printk(KERN_ERR 2145 pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
2152 "cik_cp: Bogus length %zu in firmware \"%s\"\n",
2153 rdev->mec_fw->size, fw_name); 2146 rdev->mec_fw->size, fw_name);
2154 err = -EINVAL; 2147 err = -EINVAL;
2155 } 2148 }
2156 } else { 2149 } else {
2157 err = radeon_ucode_validate(rdev->mec_fw); 2150 err = radeon_ucode_validate(rdev->mec_fw);
2158 if (err) { 2151 if (err) {
2159 printk(KERN_ERR 2152 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2160 "cik_fw: validation failed for firmware \"%s\"\n",
2161 fw_name); 2153 fw_name);
2162 goto out; 2154 goto out;
2163 } else { 2155 } else {
@@ -2188,16 +2180,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
2188 if (err) 2180 if (err)
2189 goto out; 2181 goto out;
2190 if (rdev->rlc_fw->size != rlc_req_size) { 2182 if (rdev->rlc_fw->size != rlc_req_size) {
2191 printk(KERN_ERR 2183 pr_err("cik_rlc: Bogus length %zu in firmware \"%s\"\n",
2192 "cik_rlc: Bogus length %zu in firmware \"%s\"\n",
2193 rdev->rlc_fw->size, fw_name); 2184 rdev->rlc_fw->size, fw_name);
2194 err = -EINVAL; 2185 err = -EINVAL;
2195 } 2186 }
2196 } else { 2187 } else {
2197 err = radeon_ucode_validate(rdev->rlc_fw); 2188 err = radeon_ucode_validate(rdev->rlc_fw);
2198 if (err) { 2189 if (err) {
2199 printk(KERN_ERR 2190 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2200 "cik_fw: validation failed for firmware \"%s\"\n",
2201 fw_name); 2191 fw_name);
2202 goto out; 2192 goto out;
2203 } else { 2193 } else {
@@ -2213,16 +2203,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
2213 if (err) 2203 if (err)
2214 goto out; 2204 goto out;
2215 if (rdev->sdma_fw->size != sdma_req_size) { 2205 if (rdev->sdma_fw->size != sdma_req_size) {
2216 printk(KERN_ERR 2206 pr_err("cik_sdma: Bogus length %zu in firmware \"%s\"\n",
2217 "cik_sdma: Bogus length %zu in firmware \"%s\"\n",
2218 rdev->sdma_fw->size, fw_name); 2207 rdev->sdma_fw->size, fw_name);
2219 err = -EINVAL; 2208 err = -EINVAL;
2220 } 2209 }
2221 } else { 2210 } else {
2222 err = radeon_ucode_validate(rdev->sdma_fw); 2211 err = radeon_ucode_validate(rdev->sdma_fw);
2223 if (err) { 2212 if (err) {
2224 printk(KERN_ERR 2213 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2225 "cik_fw: validation failed for firmware \"%s\"\n",
2226 fw_name); 2214 fw_name);
2227 goto out; 2215 goto out;
2228 } else { 2216 } else {
@@ -2245,8 +2233,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
2245 } 2233 }
2246 if ((rdev->mc_fw->size != mc_req_size) && 2234 if ((rdev->mc_fw->size != mc_req_size) &&
2247 (rdev->mc_fw->size != mc2_req_size)){ 2235 (rdev->mc_fw->size != mc2_req_size)){
2248 printk(KERN_ERR 2236 pr_err("cik_mc: Bogus length %zu in firmware \"%s\"\n",
2249 "cik_mc: Bogus length %zu in firmware \"%s\"\n",
2250 rdev->mc_fw->size, fw_name); 2237 rdev->mc_fw->size, fw_name);
2251 err = -EINVAL; 2238 err = -EINVAL;
2252 } 2239 }
@@ -2254,8 +2241,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
2254 } else { 2241 } else {
2255 err = radeon_ucode_validate(rdev->mc_fw); 2242 err = radeon_ucode_validate(rdev->mc_fw);
2256 if (err) { 2243 if (err) {
2257 printk(KERN_ERR 2244 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2258 "cik_fw: validation failed for firmware \"%s\"\n",
2259 fw_name); 2245 fw_name);
2260 goto out; 2246 goto out;
2261 } else { 2247 } else {
@@ -2272,23 +2258,20 @@ static int cik_init_microcode(struct radeon_device *rdev)
2272 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); 2258 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
2273 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); 2259 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
2274 if (err) { 2260 if (err) {
2275 printk(KERN_ERR 2261 pr_err("smc: error loading firmware \"%s\"\n",
2276 "smc: error loading firmware \"%s\"\n",
2277 fw_name); 2262 fw_name);
2278 release_firmware(rdev->smc_fw); 2263 release_firmware(rdev->smc_fw);
2279 rdev->smc_fw = NULL; 2264 rdev->smc_fw = NULL;
2280 err = 0; 2265 err = 0;
2281 } else if (rdev->smc_fw->size != smc_req_size) { 2266 } else if (rdev->smc_fw->size != smc_req_size) {
2282 printk(KERN_ERR 2267 pr_err("cik_smc: Bogus length %zu in firmware \"%s\"\n",
2283 "cik_smc: Bogus length %zu in firmware \"%s\"\n",
2284 rdev->smc_fw->size, fw_name); 2268 rdev->smc_fw->size, fw_name);
2285 err = -EINVAL; 2269 err = -EINVAL;
2286 } 2270 }
2287 } else { 2271 } else {
2288 err = radeon_ucode_validate(rdev->smc_fw); 2272 err = radeon_ucode_validate(rdev->smc_fw);
2289 if (err) { 2273 if (err) {
2290 printk(KERN_ERR 2274 pr_err("cik_fw: validation failed for firmware \"%s\"\n",
2291 "cik_fw: validation failed for firmware \"%s\"\n",
2292 fw_name); 2275 fw_name);
2293 goto out; 2276 goto out;
2294 } else { 2277 } else {
@@ -2300,7 +2283,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
2300 if (new_fw == 0) { 2283 if (new_fw == 0) {
2301 rdev->new_fw = false; 2284 rdev->new_fw = false;
2302 } else if (new_fw < num_fw) { 2285 } else if (new_fw < num_fw) {
2303 printk(KERN_ERR "ci_fw: mixing new and old firmware!\n"); 2286 pr_err("ci_fw: mixing new and old firmware!\n");
2304 err = -EINVAL; 2287 err = -EINVAL;
2305 } else { 2288 } else {
2306 rdev->new_fw = true; 2289 rdev->new_fw = true;
@@ -2309,8 +2292,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
2309out: 2292out:
2310 if (err) { 2293 if (err) {
2311 if (err != -EINVAL) 2294 if (err != -EINVAL)
2312 printk(KERN_ERR 2295 pr_err("cik_cp: Failed to load firmware \"%s\"\n",
2313 "cik_cp: Failed to load firmware \"%s\"\n",
2314 fw_name); 2296 fw_name);
2315 release_firmware(rdev->pfp_fw); 2297 release_firmware(rdev->pfp_fw);
2316 rdev->pfp_fw = NULL; 2298 rdev->pfp_fw = NULL;
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 0b6b5766216f..d1b1e0cc3c25 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2486,7 +2486,7 @@ void evergreen_pcie_gart_tlb_flush(struct radeon_device *rdev)
2486 tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); 2486 tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE);
2487 tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; 2487 tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT;
2488 if (tmp == 2) { 2488 if (tmp == 2) {
2489 printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); 2489 pr_warn("[drm] r600 flush TLB failed\n");
2490 return; 2490 return;
2491 } 2491 }
2492 if (tmp) { 2492 if (tmp) {
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c
index f8b05090232a..54324330b91f 100644
--- a/drivers/gpu/drm/radeon/evergreen_cs.c
+++ b/drivers/gpu/drm/radeon/evergreen_cs.c
@@ -1061,8 +1061,7 @@ static int evergreen_packet0_check(struct radeon_cs_parser *p,
1061 } 1061 }
1062 break; 1062 break;
1063 default: 1063 default:
1064 printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", 1064 pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
1065 reg, idx);
1066 return -EINVAL; 1065 return -EINVAL;
1067 } 1066 }
1068 return 0; 1067 return 0;
@@ -2776,7 +2775,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p)
2776 } while (p->idx < p->chunk_ib->length_dw); 2775 } while (p->idx < p->chunk_ib->length_dw);
2777#if 0 2776#if 0
2778 for (r = 0; r < p->ib.length_dw; r++) { 2777 for (r = 0; r < p->ib.length_dw; r++) {
2779 printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); 2778 pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
2780 mdelay(1); 2779 mdelay(1);
2781 } 2780 }
2782#endif 2781#endif
@@ -3215,7 +3214,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
3215 } while (p->idx < p->chunk_ib->length_dw); 3214 } while (p->idx < p->chunk_ib->length_dw);
3216#if 0 3215#if 0
3217 for (r = 0; r < p->ib->length_dw; r++) { 3216 for (r = 0; r < p->ib->length_dw; r++) {
3218 printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); 3217 pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
3219 mdelay(1); 3218 mdelay(1);
3220 } 3219 }
3221#endif 3220#endif
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index a0d4a0522fdc..9eccd0c81d88 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -774,8 +774,7 @@ int ni_init_microcode(struct radeon_device *rdev)
774 if (err) 774 if (err)
775 goto out; 775 goto out;
776 if (rdev->pfp_fw->size != pfp_req_size) { 776 if (rdev->pfp_fw->size != pfp_req_size) {
777 printk(KERN_ERR 777 pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
778 "ni_cp: Bogus length %zu in firmware \"%s\"\n",
779 rdev->pfp_fw->size, fw_name); 778 rdev->pfp_fw->size, fw_name);
780 err = -EINVAL; 779 err = -EINVAL;
781 goto out; 780 goto out;
@@ -786,8 +785,7 @@ int ni_init_microcode(struct radeon_device *rdev)
786 if (err) 785 if (err)
787 goto out; 786 goto out;
788 if (rdev->me_fw->size != me_req_size) { 787 if (rdev->me_fw->size != me_req_size) {
789 printk(KERN_ERR 788 pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
790 "ni_cp: Bogus length %zu in firmware \"%s\"\n",
791 rdev->me_fw->size, fw_name); 789 rdev->me_fw->size, fw_name);
792 err = -EINVAL; 790 err = -EINVAL;
793 } 791 }
@@ -797,8 +795,7 @@ int ni_init_microcode(struct radeon_device *rdev)
797 if (err) 795 if (err)
798 goto out; 796 goto out;
799 if (rdev->rlc_fw->size != rlc_req_size) { 797 if (rdev->rlc_fw->size != rlc_req_size) {
800 printk(KERN_ERR 798 pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n",
801 "ni_rlc: Bogus length %zu in firmware \"%s\"\n",
802 rdev->rlc_fw->size, fw_name); 799 rdev->rlc_fw->size, fw_name);
803 err = -EINVAL; 800 err = -EINVAL;
804 } 801 }
@@ -810,8 +807,7 @@ int ni_init_microcode(struct radeon_device *rdev)
810 if (err) 807 if (err)
811 goto out; 808 goto out;
812 if (rdev->mc_fw->size != mc_req_size) { 809 if (rdev->mc_fw->size != mc_req_size) {
813 printk(KERN_ERR 810 pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
814 "ni_mc: Bogus length %zu in firmware \"%s\"\n",
815 rdev->mc_fw->size, fw_name); 811 rdev->mc_fw->size, fw_name);
816 err = -EINVAL; 812 err = -EINVAL;
817 } 813 }
@@ -821,15 +817,12 @@ int ni_init_microcode(struct radeon_device *rdev)
821 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); 817 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
822 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); 818 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
823 if (err) { 819 if (err) {
824 printk(KERN_ERR 820 pr_err("smc: error loading firmware \"%s\"\n", fw_name);
825 "smc: error loading firmware \"%s\"\n",
826 fw_name);
827 release_firmware(rdev->smc_fw); 821 release_firmware(rdev->smc_fw);
828 rdev->smc_fw = NULL; 822 rdev->smc_fw = NULL;
829 err = 0; 823 err = 0;
830 } else if (rdev->smc_fw->size != smc_req_size) { 824 } else if (rdev->smc_fw->size != smc_req_size) {
831 printk(KERN_ERR 825 pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
832 "ni_mc: Bogus length %zu in firmware \"%s\"\n",
833 rdev->mc_fw->size, fw_name); 826 rdev->mc_fw->size, fw_name);
834 err = -EINVAL; 827 err = -EINVAL;
835 } 828 }
@@ -838,8 +831,7 @@ int ni_init_microcode(struct radeon_device *rdev)
838out: 831out:
839 if (err) { 832 if (err) {
840 if (err != -EINVAL) 833 if (err != -EINVAL)
841 printk(KERN_ERR 834 pr_err("ni_cp: Failed to load firmware \"%s\"\n",
842 "ni_cp: Failed to load firmware \"%s\"\n",
843 fw_name); 835 fw_name);
844 release_firmware(rdev->pfp_fw); 836 release_firmware(rdev->pfp_fw);
845 rdev->pfp_fw = NULL; 837 rdev->pfp_fw = NULL;
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index e3399310d41d..aefca0b03f38 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1042,11 +1042,9 @@ static int r100_cp_init_microcode(struct radeon_device *rdev)
1042 1042
1043 err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); 1043 err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
1044 if (err) { 1044 if (err) {
1045 printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", 1045 pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name);
1046 fw_name);
1047 } else if (rdev->me_fw->size % 8) { 1046 } else if (rdev->me_fw->size % 8) {
1048 printk(KERN_ERR 1047 pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n",
1049 "radeon_cp: Bogus length %zu in firmware \"%s\"\n",
1050 rdev->me_fw->size, fw_name); 1048 rdev->me_fw->size, fw_name);
1051 err = -EINVAL; 1049 err = -EINVAL;
1052 release_firmware(rdev->me_fw); 1050 release_firmware(rdev->me_fw);
@@ -1087,8 +1085,7 @@ static void r100_cp_load_microcode(struct radeon_device *rdev)
1087 int i, size; 1085 int i, size;
1088 1086
1089 if (r100_gui_wait_for_idle(rdev)) { 1087 if (r100_gui_wait_for_idle(rdev)) {
1090 printk(KERN_WARNING "Failed to wait GUI idle while " 1088 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
1091 "programming pipes. Bad things might happen.\n");
1092 } 1089 }
1093 1090
1094 if (rdev->me_fw) { 1091 if (rdev->me_fw) {
@@ -1246,8 +1243,7 @@ void r100_cp_disable(struct radeon_device *rdev)
1246 WREG32(RADEON_CP_CSQ_CNTL, 0); 1243 WREG32(RADEON_CP_CSQ_CNTL, 0);
1247 WREG32(R_000770_SCRATCH_UMSK, 0); 1244 WREG32(R_000770_SCRATCH_UMSK, 0);
1248 if (r100_gui_wait_for_idle(rdev)) { 1245 if (r100_gui_wait_for_idle(rdev)) {
1249 printk(KERN_WARNING "Failed to wait GUI idle while " 1246 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
1250 "programming pipes. Bad things might happen.\n");
1251 } 1247 }
1252} 1248}
1253 1249
@@ -1881,8 +1877,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
1881 track->tex_dirty = true; 1877 track->tex_dirty = true;
1882 break; 1878 break;
1883 default: 1879 default:
1884 printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", 1880 pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
1885 reg, idx);
1886 return -EINVAL; 1881 return -EINVAL;
1887 } 1882 }
1888 return 0; 1883 return 0;
@@ -2486,8 +2481,7 @@ int r100_gui_wait_for_idle(struct radeon_device *rdev)
2486 uint32_t tmp; 2481 uint32_t tmp;
2487 2482
2488 if (r100_rbbm_fifo_wait_for_entry(rdev, 64)) { 2483 if (r100_rbbm_fifo_wait_for_entry(rdev, 64)) {
2489 printk(KERN_WARNING "radeon: wait for empty RBBM fifo failed !" 2484 pr_warn("radeon: wait for empty RBBM fifo failed! Bad things might happen.\n");
2490 " Bad things might happen.\n");
2491 } 2485 }
2492 for (i = 0; i < rdev->usec_timeout; i++) { 2486 for (i = 0; i < rdev->usec_timeout; i++) {
2493 tmp = RREG32(RADEON_RBBM_STATUS); 2487 tmp = RREG32(RADEON_RBBM_STATUS);
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c
index c70e6d5bcd19..c22321cc5a41 100644
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
@@ -537,8 +537,7 @@ int r200_packet0_check(struct radeon_cs_parser *p,
537 track->tex_dirty = true; 537 track->tex_dirty = true;
538 break; 538 break;
539 default: 539 default:
540 printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", 540 pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
541 reg, idx);
542 return -EINVAL; 541 return -EINVAL;
543 } 542 }
544 return 0; 543 return 0;
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 7e417d8dc733..21161aa8acbf 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -387,8 +387,7 @@ static void r300_gpu_init(struct radeon_device *rdev)
387 WREG32(R300_GB_TILE_CONFIG, gb_tile_config); 387 WREG32(R300_GB_TILE_CONFIG, gb_tile_config);
388 388
389 if (r100_gui_wait_for_idle(rdev)) { 389 if (r100_gui_wait_for_idle(rdev)) {
390 printk(KERN_WARNING "Failed to wait GUI idle while " 390 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
391 "programming pipes. Bad things might happen.\n");
392 } 391 }
393 392
394 tmp = RREG32(R300_DST_PIPE_CONFIG); 393 tmp = RREG32(R300_DST_PIPE_CONFIG);
@@ -399,14 +398,12 @@ static void r300_gpu_init(struct radeon_device *rdev)
399 R300_DC_DC_DISABLE_IGNORE_PE); 398 R300_DC_DC_DISABLE_IGNORE_PE);
400 399
401 if (r100_gui_wait_for_idle(rdev)) { 400 if (r100_gui_wait_for_idle(rdev)) {
402 printk(KERN_WARNING "Failed to wait GUI idle while " 401 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
403 "programming pipes. Bad things might happen.\n");
404 } 402 }
405 if (r300_mc_wait_for_idle(rdev)) { 403 if (r300_mc_wait_for_idle(rdev)) {
406 printk(KERN_WARNING "Failed to wait MC idle while " 404 pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
407 "programming pipes. Bad things might happen.\n");
408 } 405 }
409 DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized.\n", 406 DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized\n",
410 rdev->num_gb_pipes, rdev->num_z_pipes); 407 rdev->num_gb_pipes, rdev->num_z_pipes);
411} 408}
412 409
@@ -1165,7 +1162,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
1165 } 1162 }
1166 return 0; 1163 return 0;
1167fail: 1164fail:
1168 printk(KERN_ERR "Forbidden register 0x%04X in cs at %d (val=%08x)\n", 1165 pr_err("Forbidden register 0x%04X in cs at %d (val=%08x)\n",
1169 reg, idx, idx_value); 1166 reg, idx, idx_value);
1170 return -EINVAL; 1167 return -EINVAL;
1171} 1168}
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 2828605aef3f..3eb0c4f9f796 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -92,8 +92,7 @@ void r420_pipes_init(struct radeon_device *rdev)
92 (1 << 2) | (1 << 3)); 92 (1 << 2) | (1 << 3));
93 /* add idle wait as per freedesktop.org bug 24041 */ 93 /* add idle wait as per freedesktop.org bug 24041 */
94 if (r100_gui_wait_for_idle(rdev)) { 94 if (r100_gui_wait_for_idle(rdev)) {
95 printk(KERN_WARNING "Failed to wait GUI idle while " 95 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
96 "programming pipes. Bad things might happen.\n");
97 } 96 }
98 /* get max number of pipes */ 97 /* get max number of pipes */
99 gb_pipe_select = RREG32(R400_GB_PIPE_SELECT); 98 gb_pipe_select = RREG32(R400_GB_PIPE_SELECT);
@@ -128,8 +127,7 @@ void r420_pipes_init(struct radeon_device *rdev)
128 tmp |= R300_TILE_SIZE_16 | R300_ENABLE_TILING; 127 tmp |= R300_TILE_SIZE_16 | R300_ENABLE_TILING;
129 WREG32(R300_GB_TILE_CONFIG, tmp); 128 WREG32(R300_GB_TILE_CONFIG, tmp);
130 if (r100_gui_wait_for_idle(rdev)) { 129 if (r100_gui_wait_for_idle(rdev)) {
131 printk(KERN_WARNING "Failed to wait GUI idle while " 130 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
132 "programming pipes. Bad things might happen.\n");
133 } 131 }
134 132
135 tmp = RREG32(R300_DST_PIPE_CONFIG); 133 tmp = RREG32(R300_DST_PIPE_CONFIG);
@@ -141,8 +139,7 @@ void r420_pipes_init(struct radeon_device *rdev)
141 R300_DC_DC_DISABLE_IGNORE_PE); 139 R300_DC_DC_DISABLE_IGNORE_PE);
142 140
143 if (r100_gui_wait_for_idle(rdev)) { 141 if (r100_gui_wait_for_idle(rdev)) {
144 printk(KERN_WARNING "Failed to wait GUI idle while " 142 pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
145 "programming pipes. Bad things might happen.\n");
146 } 143 }
147 144
148 if (rdev->family == CHIP_RV530) { 145 if (rdev->family == CHIP_RV530) {
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 98d6053c36c6..074cf752faef 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -86,8 +86,7 @@ static void r520_gpu_init(struct radeon_device *rdev)
86 (((gb_pipe_select >> 8) & 0xF) << 4); 86 (((gb_pipe_select >> 8) & 0xF) << 4);
87 WREG32_PLL(0x000D, tmp); 87 WREG32_PLL(0x000D, tmp);
88 if (r520_mc_wait_for_idle(rdev)) { 88 if (r520_mc_wait_for_idle(rdev)) {
89 printk(KERN_WARNING "Failed to wait MC idle while " 89 pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
90 "programming pipes. Bad things might happen.\n");
91 } 90 }
92} 91}
93 92
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index a951881c2a50..0a085176e79b 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1094,7 +1094,7 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev)
1094 tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); 1094 tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE);
1095 tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; 1095 tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT;
1096 if (tmp == 2) { 1096 if (tmp == 2) {
1097 printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); 1097 pr_warn("[drm] r600 flush TLB failed\n");
1098 return; 1098 return;
1099 } 1099 }
1100 if (tmp) { 1100 if (tmp) {
@@ -2550,8 +2550,7 @@ int r600_init_microcode(struct radeon_device *rdev)
2550 if (err) 2550 if (err)
2551 goto out; 2551 goto out;
2552 if (rdev->pfp_fw->size != pfp_req_size) { 2552 if (rdev->pfp_fw->size != pfp_req_size) {
2553 printk(KERN_ERR 2553 pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
2554 "r600_cp: Bogus length %zu in firmware \"%s\"\n",
2555 rdev->pfp_fw->size, fw_name); 2554 rdev->pfp_fw->size, fw_name);
2556 err = -EINVAL; 2555 err = -EINVAL;
2557 goto out; 2556 goto out;
@@ -2562,8 +2561,7 @@ int r600_init_microcode(struct radeon_device *rdev)
2562 if (err) 2561 if (err)
2563 goto out; 2562 goto out;
2564 if (rdev->me_fw->size != me_req_size) { 2563 if (rdev->me_fw->size != me_req_size) {
2565 printk(KERN_ERR 2564 pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
2566 "r600_cp: Bogus length %zu in firmware \"%s\"\n",
2567 rdev->me_fw->size, fw_name); 2565 rdev->me_fw->size, fw_name);
2568 err = -EINVAL; 2566 err = -EINVAL;
2569 } 2567 }
@@ -2573,8 +2571,7 @@ int r600_init_microcode(struct radeon_device *rdev)
2573 if (err) 2571 if (err)
2574 goto out; 2572 goto out;
2575 if (rdev->rlc_fw->size != rlc_req_size) { 2573 if (rdev->rlc_fw->size != rlc_req_size) {
2576 printk(KERN_ERR 2574 pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n",
2577 "r600_rlc: Bogus length %zu in firmware \"%s\"\n",
2578 rdev->rlc_fw->size, fw_name); 2575 rdev->rlc_fw->size, fw_name);
2579 err = -EINVAL; 2576 err = -EINVAL;
2580 } 2577 }
@@ -2583,15 +2580,12 @@ int r600_init_microcode(struct radeon_device *rdev)
2583 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name); 2580 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name);
2584 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); 2581 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
2585 if (err) { 2582 if (err) {
2586 printk(KERN_ERR 2583 pr_err("smc: error loading firmware \"%s\"\n", fw_name);
2587 "smc: error loading firmware \"%s\"\n",
2588 fw_name);
2589 release_firmware(rdev->smc_fw); 2584 release_firmware(rdev->smc_fw);
2590 rdev->smc_fw = NULL; 2585 rdev->smc_fw = NULL;
2591 err = 0; 2586 err = 0;
2592 } else if (rdev->smc_fw->size != smc_req_size) { 2587 } else if (rdev->smc_fw->size != smc_req_size) {
2593 printk(KERN_ERR 2588 pr_err("smc: Bogus length %zu in firmware \"%s\"\n",
2594 "smc: Bogus length %zu in firmware \"%s\"\n",
2595 rdev->smc_fw->size, fw_name); 2589 rdev->smc_fw->size, fw_name);
2596 err = -EINVAL; 2590 err = -EINVAL;
2597 } 2591 }
@@ -2600,8 +2594,7 @@ int r600_init_microcode(struct radeon_device *rdev)
2600out: 2594out:
2601 if (err) { 2595 if (err) {
2602 if (err != -EINVAL) 2596 if (err != -EINVAL)
2603 printk(KERN_ERR 2597 pr_err("r600_cp: Failed to load firmware \"%s\"\n",
2604 "r600_cp: Failed to load firmware \"%s\"\n",
2605 fw_name); 2598 fw_name);
2606 release_firmware(rdev->pfp_fw); 2599 release_firmware(rdev->pfp_fw);
2607 rdev->pfp_fw = NULL; 2600 rdev->pfp_fw = NULL;
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
index 595a19736458..97fd58e97043 100644
--- a/drivers/gpu/drm/radeon/r600_cs.c
+++ b/drivers/gpu/drm/radeon/r600_cs.c
@@ -932,8 +932,7 @@ static int r600_packet0_check(struct radeon_cs_parser *p,
932 } 932 }
933 break; 933 break;
934 default: 934 default:
935 printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", 935 pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
936 reg, idx);
937 return -EINVAL; 936 return -EINVAL;
938 } 937 }
939 return 0; 938 return 0;
@@ -2320,7 +2319,7 @@ int r600_cs_parse(struct radeon_cs_parser *p)
2320 } while (p->idx < p->chunk_ib->length_dw); 2319 } while (p->idx < p->chunk_ib->length_dw);
2321#if 0 2320#if 0
2322 for (r = 0; r < p->ib.length_dw; r++) { 2321 for (r = 0; r < p->ib.length_dw; r++) {
2323 printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); 2322 pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
2324 mdelay(1); 2323 mdelay(1);
2325 } 2324 }
2326#endif 2325#endif
@@ -2528,7 +2527,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p)
2528 } while (p->idx < p->chunk_ib->length_dw); 2527 } while (p->idx < p->chunk_ib->length_dw);
2529#if 0 2528#if 0
2530 for (r = 0; r < p->ib->length_dw; r++) { 2529 for (r = 0; r < p->ib->length_dw; r++) {
2531 printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); 2530 pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
2532 mdelay(1); 2531 mdelay(1);
2533 } 2532 }
2534#endif 2533#endif
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 44e0c5ed6418..2e400dc414e3 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -2535,7 +2535,8 @@ static inline struct radeon_fence *to_radeon_fence(struct dma_fence *f)
2535#define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg)) 2535#define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg))
2536#define RREG32(reg) r100_mm_rreg(rdev, (reg), false) 2536#define RREG32(reg) r100_mm_rreg(rdev, (reg), false)
2537#define RREG32_IDX(reg) r100_mm_rreg(rdev, (reg), true) 2537#define RREG32_IDX(reg) r100_mm_rreg(rdev, (reg), true)
2538#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg), false)) 2538#define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n", \
2539 r100_mm_rreg(rdev, (reg), false))
2539#define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v), false) 2540#define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v), false)
2540#define WREG32_IDX(reg, v) r100_mm_wreg(rdev, (reg), (v), true) 2541#define WREG32_IDX(reg, v) r100_mm_wreg(rdev, (reg), (v), true)
2541#define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) 2542#define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 0ae13cd2adda..40be4068ca69 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -577,8 +577,8 @@ static bool radeon_atpx_detect(void)
577 577
578 if (has_atpx && vga_count == 2) { 578 if (has_atpx && vga_count == 2) {
579 acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); 579 acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer);
580 printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", 580 pr_info("vga_switcheroo: detected switching method %s handle\n",
581 acpi_method_name); 581 acpi_method_name);
582 radeon_atpx_priv.atpx_detected = true; 582 radeon_atpx_priv.atpx_detected = true;
583 radeon_atpx_priv.bridge_pm_usable = d3_supported; 583 radeon_atpx_priv.bridge_pm_usable = d3_supported;
584 radeon_atpx_init(); 584 radeon_atpx_init();
diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c
index b214663b370d..aaacac190d26 100644
--- a/drivers/gpu/drm/radeon/radeon_audio.c
+++ b/drivers/gpu/drm/radeon/radeon_audio.c
@@ -576,9 +576,9 @@ static void radeon_audio_calc_cts(unsigned int clock, int *CTS, int *N, int freq
576 576
577 /* Check that we are in spec (not always possible) */ 577 /* Check that we are in spec (not always possible) */
578 if (n < (128*freq/1500)) 578 if (n < (128*freq/1500))
579 printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); 579 pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n");
580 if (n > (128*freq/300)) 580 if (n > (128*freq/300))
581 printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); 581 pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n");
582 582
583 *N = n; 583 *N = n;
584 *CTS = cts; 584 *CTS = cts;
diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c
index c1135feb93c1..e55146cdf543 100644
--- a/drivers/gpu/drm/radeon/radeon_clocks.c
+++ b/drivers/gpu/drm/radeon/radeon_clocks.c
@@ -111,7 +111,7 @@ static bool radeon_read_clocks_OF(struct drm_device *dev)
111 return false; 111 return false;
112 val = of_get_property(dp, "ATY,RefCLK", NULL); 112 val = of_get_property(dp, "ATY,RefCLK", NULL);
113 if (!val || !*val) { 113 if (!val || !*val) {
114 printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); 114 pr_warn("radeonfb: No ATY,RefCLK property !\n");
115 return false; 115 return false;
116 } 116 }
117 p1pll->reference_freq = p2pll->reference_freq = (*val) / 10; 117 p1pll->reference_freq = p2pll->reference_freq = (*val) / 10;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 4b0c388be3f5..dde59c36ba92 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1249,7 +1249,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
1249 if (state == VGA_SWITCHEROO_ON) { 1249 if (state == VGA_SWITCHEROO_ON) {
1250 unsigned d3_delay = dev->pdev->d3_delay; 1250 unsigned d3_delay = dev->pdev->d3_delay;
1251 1251
1252 printk(KERN_INFO "radeon: switched on\n"); 1252 pr_info("radeon: switched on\n");
1253 /* don't suspend or resume card normally */ 1253 /* don't suspend or resume card normally */
1254 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; 1254 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
1255 1255
@@ -1263,7 +1263,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
1263 dev->switch_power_state = DRM_SWITCH_POWER_ON; 1263 dev->switch_power_state = DRM_SWITCH_POWER_ON;
1264 drm_kms_helper_poll_enable(dev); 1264 drm_kms_helper_poll_enable(dev);
1265 } else { 1265 } else {
1266 printk(KERN_INFO "radeon: switched off\n"); 1266 pr_info("radeon: switched off\n");
1267 drm_kms_helper_poll_disable(dev); 1267 drm_kms_helper_poll_disable(dev);
1268 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; 1268 dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
1269 radeon_suspend_kms(dev, true, true, false); 1269 radeon_suspend_kms(dev, true, true, false);
@@ -1410,12 +1410,12 @@ int radeon_device_init(struct radeon_device *rdev,
1410 if (r) { 1410 if (r) {
1411 rdev->need_dma32 = true; 1411 rdev->need_dma32 = true;
1412 dma_bits = 32; 1412 dma_bits = 32;
1413 printk(KERN_WARNING "radeon: No suitable DMA available.\n"); 1413 pr_warn("radeon: No suitable DMA available\n");
1414 } 1414 }
1415 r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); 1415 r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));
1416 if (r) { 1416 if (r) {
1417 pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32)); 1417 pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32));
1418 printk(KERN_WARNING "radeon: No coherent DMA available.\n"); 1418 pr_warn("radeon: No coherent DMA available\n");
1419 } 1419 }
1420 1420
1421 /* Registers mapping */ 1421 /* Registers mapping */
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 8d28fe6a280a..356ad90a5238 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -149,8 +149,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
149 RADEON_GEM_DOMAIN_VRAM, 149 RADEON_GEM_DOMAIN_VRAM,
150 0, true, &gobj); 150 0, true, &gobj);
151 if (ret) { 151 if (ret) {
152 printk(KERN_ERR "failed to allocate framebuffer (%d)\n", 152 pr_err("failed to allocate framebuffer (%d)\n", aligned_size);
153 aligned_size);
154 return -ENOMEM; 153 return -ENOMEM;
155 } 154 }
156 rbo = gem_to_radeon_bo(gobj); 155 rbo = gem_to_radeon_bo(gobj);
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 96683f5b2b1b..9b0b123ce079 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -106,7 +106,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj,
106 } 106 }
107 if (!domain) { 107 if (!domain) {
108 /* Do nothings */ 108 /* Do nothings */
109 printk(KERN_WARNING "Set domain without domain !\n"); 109 pr_warn("Set domain without domain !\n");
110 return 0; 110 return 0;
111 } 111 }
112 if (domain == RADEON_GEM_DOMAIN_CPU) { 112 if (domain == RADEON_GEM_DOMAIN_CPU) {
@@ -116,7 +116,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj,
116 r = -EBUSY; 116 r = -EBUSY;
117 117
118 if (r < 0 && r != -EINTR) { 118 if (r < 0 && r != -EINTR) {
119 printk(KERN_ERR "Failed to wait for object: %li\n", r); 119 pr_err("Failed to wait for object: %li\n", r);
120 return r; 120 return r;
121 } 121 }
122 } 122 }
diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 791818165c76..4fdc7bda7a7d 100644
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -246,7 +246,7 @@ out_unref:
246out_cleanup: 246out_cleanup:
247 kfree(gtt_obj); 247 kfree(gtt_obj);
248 if (r) { 248 if (r) {
249 printk(KERN_WARNING "Error while testing BO move.\n"); 249 pr_warn("Error while testing BO move\n");
250 } 250 }
251} 251}
252 252
@@ -394,7 +394,7 @@ out_cleanup:
394 radeon_fence_unref(&fence2); 394 radeon_fence_unref(&fence2);
395 395
396 if (r) 396 if (r)
397 printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); 397 pr_warn("Error while testing ring sync (%d)\n", r);
398} 398}
399 399
400static void radeon_test_ring_sync2(struct radeon_device *rdev, 400static void radeon_test_ring_sync2(struct radeon_device *rdev,
@@ -504,7 +504,7 @@ out_cleanup:
504 radeon_fence_unref(&fenceB); 504 radeon_fence_unref(&fenceB);
505 505
506 if (r) 506 if (r)
507 printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); 507 pr_warn("Error while testing ring sync (%d)\n", r);
508} 508}
509 509
510static bool radeon_test_sync_possible(struct radeon_ring *ringA, 510static bool radeon_test_sync_possible(struct radeon_ring *ringA,
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 34e3235f41d2..4121209c183e 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -255,8 +255,8 @@ static void rs400_gpu_init(struct radeon_device *rdev)
255 /* FIXME: is this correct ? */ 255 /* FIXME: is this correct ? */
256 r420_pipes_init(rdev); 256 r420_pipes_init(rdev);
257 if (rs400_mc_wait_for_idle(rdev)) { 257 if (rs400_mc_wait_for_idle(rdev)) {
258 printk(KERN_WARNING "rs400: Failed to wait MC idle while " 258 pr_warn("rs400: Failed to wait MC idle while programming pipes. Bad things might happen. %08x\n",
259 "programming pipes. Bad things might happen. %08x\n", RREG32(RADEON_MC_STATUS)); 259 RREG32(RADEON_MC_STATUS));
260 } 260 }
261} 261}
262 262
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 6bc44c24e837..1bae33e43f3c 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -52,8 +52,7 @@ static void rs690_gpu_init(struct radeon_device *rdev)
52 /* FIXME: is this correct ? */ 52 /* FIXME: is this correct ? */
53 r420_pipes_init(rdev); 53 r420_pipes_init(rdev);
54 if (rs690_mc_wait_for_idle(rdev)) { 54 if (rs690_mc_wait_for_idle(rdev)) {
55 printk(KERN_WARNING "Failed to wait MC idle while " 55 pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
56 "programming pipes. Bad things might happen.\n");
57 } 56 }
58} 57}
59 58
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index c55d653aaf5f..ffbd2c006f60 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -154,8 +154,7 @@ static void rv515_gpu_init(struct radeon_device *rdev)
154 unsigned pipe_select_current, gb_pipe_select, tmp; 154 unsigned pipe_select_current, gb_pipe_select, tmp;
155 155
156 if (r100_gui_wait_for_idle(rdev)) { 156 if (r100_gui_wait_for_idle(rdev)) {
157 printk(KERN_WARNING "Failed to wait GUI idle while " 157 pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n");
158 "resetting GPU. Bad things might happen.\n");
159 } 158 }
160 rv515_vga_render_disable(rdev); 159 rv515_vga_render_disable(rdev);
161 r420_pipes_init(rdev); 160 r420_pipes_init(rdev);
@@ -166,12 +165,10 @@ static void rv515_gpu_init(struct radeon_device *rdev)
166 (((gb_pipe_select >> 8) & 0xF) << 4); 165 (((gb_pipe_select >> 8) & 0xF) << 4);
167 WREG32_PLL(0x000D, tmp); 166 WREG32_PLL(0x000D, tmp);
168 if (r100_gui_wait_for_idle(rdev)) { 167 if (r100_gui_wait_for_idle(rdev)) {
169 printk(KERN_WARNING "Failed to wait GUI idle while " 168 pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n");
170 "resetting GPU. Bad things might happen.\n");
171 } 169 }
172 if (rv515_mc_wait_for_idle(rdev)) { 170 if (rv515_mc_wait_for_idle(rdev)) {
173 printk(KERN_WARNING "Failed to wait MC idle while " 171 pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
174 "programming pipes. Bad things might happen.\n");
175 } 172 }
176} 173}
177 174
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 414776811e71..528e5a49a214 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -1762,8 +1762,7 @@ static int si_init_microcode(struct radeon_device *rdev)
1762 if (err) 1762 if (err)
1763 goto out; 1763 goto out;
1764 if (rdev->pfp_fw->size != pfp_req_size) { 1764 if (rdev->pfp_fw->size != pfp_req_size) {
1765 printk(KERN_ERR 1765 pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
1766 "si_cp: Bogus length %zu in firmware \"%s\"\n",
1767 rdev->pfp_fw->size, fw_name); 1766 rdev->pfp_fw->size, fw_name);
1768 err = -EINVAL; 1767 err = -EINVAL;
1769 goto out; 1768 goto out;
@@ -1771,8 +1770,7 @@ static int si_init_microcode(struct radeon_device *rdev)
1771 } else { 1770 } else {
1772 err = radeon_ucode_validate(rdev->pfp_fw); 1771 err = radeon_ucode_validate(rdev->pfp_fw);
1773 if (err) { 1772 if (err) {
1774 printk(KERN_ERR 1773 pr_err("si_cp: validation failed for firmware \"%s\"\n",
1775 "si_cp: validation failed for firmware \"%s\"\n",
1776 fw_name); 1774 fw_name);
1777 goto out; 1775 goto out;
1778 } else { 1776 } else {
@@ -1788,16 +1786,14 @@ static int si_init_microcode(struct radeon_device *rdev)
1788 if (err) 1786 if (err)
1789 goto out; 1787 goto out;
1790 if (rdev->me_fw->size != me_req_size) { 1788 if (rdev->me_fw->size != me_req_size) {
1791 printk(KERN_ERR 1789 pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
1792 "si_cp: Bogus length %zu in firmware \"%s\"\n",
1793 rdev->me_fw->size, fw_name); 1790 rdev->me_fw->size, fw_name);
1794 err = -EINVAL; 1791 err = -EINVAL;
1795 } 1792 }
1796 } else { 1793 } else {
1797 err = radeon_ucode_validate(rdev->me_fw); 1794 err = radeon_ucode_validate(rdev->me_fw);
1798 if (err) { 1795 if (err) {
1799 printk(KERN_ERR 1796 pr_err("si_cp: validation failed for firmware \"%s\"\n",
1800 "si_cp: validation failed for firmware \"%s\"\n",
1801 fw_name); 1797 fw_name);
1802 goto out; 1798 goto out;
1803 } else { 1799 } else {
@@ -1813,16 +1809,14 @@ static int si_init_microcode(struct radeon_device *rdev)
1813 if (err) 1809 if (err)
1814 goto out; 1810 goto out;
1815 if (rdev->ce_fw->size != ce_req_size) { 1811 if (rdev->ce_fw->size != ce_req_size) {
1816 printk(KERN_ERR 1812 pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
1817 "si_cp: Bogus length %zu in firmware \"%s\"\n",
1818 rdev->ce_fw->size, fw_name); 1813 rdev->ce_fw->size, fw_name);
1819 err = -EINVAL; 1814 err = -EINVAL;
1820 } 1815 }
1821 } else { 1816 } else {
1822 err = radeon_ucode_validate(rdev->ce_fw); 1817 err = radeon_ucode_validate(rdev->ce_fw);
1823 if (err) { 1818 if (err) {
1824 printk(KERN_ERR 1819 pr_err("si_cp: validation failed for firmware \"%s\"\n",
1825 "si_cp: validation failed for firmware \"%s\"\n",
1826 fw_name); 1820 fw_name);
1827 goto out; 1821 goto out;
1828 } else { 1822 } else {
@@ -1838,16 +1832,14 @@ static int si_init_microcode(struct radeon_device *rdev)
1838 if (err) 1832 if (err)
1839 goto out; 1833 goto out;
1840 if (rdev->rlc_fw->size != rlc_req_size) { 1834 if (rdev->rlc_fw->size != rlc_req_size) {
1841 printk(KERN_ERR 1835 pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n",
1842 "si_rlc: Bogus length %zu in firmware \"%s\"\n",
1843 rdev->rlc_fw->size, fw_name); 1836 rdev->rlc_fw->size, fw_name);
1844 err = -EINVAL; 1837 err = -EINVAL;
1845 } 1838 }
1846 } else { 1839 } else {
1847 err = radeon_ucode_validate(rdev->rlc_fw); 1840 err = radeon_ucode_validate(rdev->rlc_fw);
1848 if (err) { 1841 if (err) {
1849 printk(KERN_ERR 1842 pr_err("si_cp: validation failed for firmware \"%s\"\n",
1850 "si_cp: validation failed for firmware \"%s\"\n",
1851 fw_name); 1843 fw_name);
1852 goto out; 1844 goto out;
1853 } else { 1845 } else {
@@ -1871,8 +1863,7 @@ static int si_init_microcode(struct radeon_device *rdev)
1871 } 1863 }
1872 if ((rdev->mc_fw->size != mc_req_size) && 1864 if ((rdev->mc_fw->size != mc_req_size) &&
1873 (rdev->mc_fw->size != mc2_req_size)) { 1865 (rdev->mc_fw->size != mc2_req_size)) {
1874 printk(KERN_ERR 1866 pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n",
1875 "si_mc: Bogus length %zu in firmware \"%s\"\n",
1876 rdev->mc_fw->size, fw_name); 1867 rdev->mc_fw->size, fw_name);
1877 err = -EINVAL; 1868 err = -EINVAL;
1878 } 1869 }
@@ -1880,8 +1871,7 @@ static int si_init_microcode(struct radeon_device *rdev)
1880 } else { 1871 } else {
1881 err = radeon_ucode_validate(rdev->mc_fw); 1872 err = radeon_ucode_validate(rdev->mc_fw);
1882 if (err) { 1873 if (err) {
1883 printk(KERN_ERR 1874 pr_err("si_cp: validation failed for firmware \"%s\"\n",
1884 "si_cp: validation failed for firmware \"%s\"\n",
1885 fw_name); 1875 fw_name);
1886 goto out; 1876 goto out;
1887 } else { 1877 } else {
@@ -1900,23 +1890,19 @@ static int si_init_microcode(struct radeon_device *rdev)
1900 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); 1890 snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
1901 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); 1891 err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
1902 if (err) { 1892 if (err) {
1903 printk(KERN_ERR 1893 pr_err("smc: error loading firmware \"%s\"\n", fw_name);
1904 "smc: error loading firmware \"%s\"\n",
1905 fw_name);
1906 release_firmware(rdev->smc_fw); 1894 release_firmware(rdev->smc_fw);
1907 rdev->smc_fw = NULL; 1895 rdev->smc_fw = NULL;
1908 err = 0; 1896 err = 0;
1909 } else if (rdev->smc_fw->size != smc_req_size) { 1897 } else if (rdev->smc_fw->size != smc_req_size) {
1910 printk(KERN_ERR 1898 pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n",
1911 "si_smc: Bogus length %zu in firmware \"%s\"\n",
1912 rdev->smc_fw->size, fw_name); 1899 rdev->smc_fw->size, fw_name);
1913 err = -EINVAL; 1900 err = -EINVAL;
1914 } 1901 }
1915 } else { 1902 } else {
1916 err = radeon_ucode_validate(rdev->smc_fw); 1903 err = radeon_ucode_validate(rdev->smc_fw);
1917 if (err) { 1904 if (err) {
1918 printk(KERN_ERR 1905 pr_err("si_cp: validation failed for firmware \"%s\"\n",
1919 "si_cp: validation failed for firmware \"%s\"\n",
1920 fw_name); 1906 fw_name);
1921 goto out; 1907 goto out;
1922 } else { 1908 } else {
@@ -1927,7 +1913,7 @@ static int si_init_microcode(struct radeon_device *rdev)
1927 if (new_fw == 0) { 1913 if (new_fw == 0) {
1928 rdev->new_fw = false; 1914 rdev->new_fw = false;
1929 } else if (new_fw < 6) { 1915 } else if (new_fw < 6) {
1930 printk(KERN_ERR "si_fw: mixing new and old firmware!\n"); 1916 pr_err("si_fw: mixing new and old firmware!\n");
1931 err = -EINVAL; 1917 err = -EINVAL;
1932 } else { 1918 } else {
1933 rdev->new_fw = true; 1919 rdev->new_fw = true;
@@ -1935,8 +1921,7 @@ static int si_init_microcode(struct radeon_device *rdev)
1935out: 1921out:
1936 if (err) { 1922 if (err) {
1937 if (err != -EINVAL) 1923 if (err != -EINVAL)
1938 printk(KERN_ERR 1924 pr_err("si_cp: Failed to load firmware \"%s\"\n",
1939 "si_cp: Failed to load firmware \"%s\"\n",
1940 fw_name); 1925 fw_name);
1941 release_firmware(rdev->pfp_fw); 1926 release_firmware(rdev->pfp_fw);
1942 rdev->pfp_fw = NULL; 1927 rdev->pfp_fw = NULL;
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-14 23:29:06 -0400