bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-26 14:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpu: drm: amd/radeon: Convert printk(KERN_<LEVEL> to pr_<level>

Browse source 
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>
This commit is contained in:
Joe Perches 2017-02-28 04:55:52 -08:00 • committed by Alex Deucher
parent eeca232490
commit 7ca85295d8
39 changed files with 155 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c
View file

@ -74,9 +74,9 @@ static void amdgpu_afmt_calc_cts(uint32_t clock, int *CTS, int *N, int freq)
/* Check that we are in spec (not always possible) */ /* Check that we are in spec (not always possible) */
if (n < (128*freq/1500)) if (n < (128*freq/1500))
printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n");
if (n > (128*freq/300)) if (n > (128*freq/300))
printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n");
*N = n; *N = n;
*CTS = cts; *CTS = cts;

2
drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c
View file

@ -583,7 +583,7 @@ static bool amdgpu_atpx_detect(void)
if (has_atpx && vga_count == 2) { if (has_atpx && vga_count == 2) {
acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer);
printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", pr_info("vga_switcheroo: detected switching method %s handle\n",
acpi_method_name); acpi_method_name);
amdgpu_atpx_priv.atpx_detected = true; amdgpu_atpx_priv.atpx_detected = true;
amdgpu_atpx_priv.bridge_pm_usable = d3_supported; amdgpu_atpx_priv.bridge_pm_usable = d3_supported;

4
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View file

@ -1059,7 +1059,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
if (state == VGA_SWITCHEROO_ON) { if (state == VGA_SWITCHEROO_ON) {
unsigned d3_delay = dev->pdev->d3_delay; unsigned d3_delay = dev->pdev->d3_delay;
printk(KERN_INFO "amdgpu: switched on\n"); pr_info("amdgpu: switched on\n");
/* don't suspend or resume card normally */ /* don't suspend or resume card normally */
dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
@ -1070,7 +1070,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
dev->switch_power_state = DRM_SWITCH_POWER_ON; dev->switch_power_state = DRM_SWITCH_POWER_ON;
drm_kms_helper_poll_enable(dev); drm_kms_helper_poll_enable(dev);
} else { } else {
printk(KERN_INFO "amdgpu: switched off\n"); pr_info("amdgpu: switched off\n");
drm_kms_helper_poll_disable(dev); drm_kms_helper_poll_disable(dev);
dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
amdgpu_device_suspend(dev, true, true); amdgpu_device_suspend(dev, true, true);

3
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
View file

@ -151,8 +151,7 @@ static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev,
AMDGPU_GEM_CREATE_VRAM_CLEARED, AMDGPU_GEM_CREATE_VRAM_CLEARED,
true, &gobj); true, &gobj);
if (ret) { if (ret) {
printk(KERN_ERR "failed to allocate framebuffer (%d)\n", pr_err("failed to allocate framebuffer (%d)\n", aligned_size);
aligned_size);
return -ENOMEM; return -ENOMEM;
} }
abo = gem_to_amdgpu_bo(gobj); abo = gem_to_amdgpu_bo(gobj);

2
drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
View file

@ -228,7 +228,7 @@ out_unref:
out_cleanup: out_cleanup:
kfree(gtt_obj); kfree(gtt_obj);
if (r) { if (r) {
printk(KERN_WARNING "Error while testing BO move.\n"); pr_warn("Error while testing BO move\n");
} }
} }

40
drivers/gpu/drm/amd/amdgpu/atom.c
View file

@ -166,7 +166,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
case ATOM_IIO_END: case ATOM_IIO_END:
return temp; return temp;
default: default:
printk(KERN_INFO "Unknown IIO opcode.\n"); pr_info("Unknown IIO opcode\n");
return 0; return 0;
} }
} }
@ -190,21 +190,18 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
val = gctx->card->reg_read(gctx->card, idx); val = gctx->card->reg_read(gctx->card, idx);
break; break;
case ATOM_IO_PCI: case ATOM_IO_PCI:
printk(KERN_INFO pr_info("PCI registers are not implemented\n");
"PCI registers are not implemented.\n");
return 0; return 0;
case ATOM_IO_SYSIO: case ATOM_IO_SYSIO:
printk(KERN_INFO pr_info("SYSIO registers are not implemented\n");
"SYSIO registers are not implemented.\n");
return 0; return 0;
default: default:
if (!(gctx->io_mode & 0x80)) { if (!(gctx->io_mode & 0x80)) {
printk(KERN_INFO "Bad IO mode.\n"); pr_info("Bad IO mode\n");
return 0; return 0;
} }
if (!gctx->iio[gctx->io_mode & 0x7F]) { if (!gctx->iio[gctx->io_mode & 0x7F]) {
printk(KERN_INFO pr_info("Undefined indirect IO read method %d\n",
"Undefined indirect IO read method %d.\n",
gctx->io_mode & 0x7F); gctx->io_mode & 0x7F);
return 0; return 0;
} }
@ -469,21 +466,18 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
gctx->card->reg_write(gctx->card, idx, val); gctx->card->reg_write(gctx->card, idx, val);
break; break;
case ATOM_IO_PCI: case ATOM_IO_PCI:
printk(KERN_INFO pr_info("PCI registers are not implemented\n");
"PCI registers are not implemented.\n");
return; return;
case ATOM_IO_SYSIO: case ATOM_IO_SYSIO:
printk(KERN_INFO pr_info("SYSIO registers are not implemented\n");
"SYSIO registers are not implemented.\n");
return; return;
default: default:
if (!(gctx->io_mode & 0x80)) { if (!(gctx->io_mode & 0x80)) {
printk(KERN_INFO "Bad IO mode.\n"); pr_info("Bad IO mode\n");
return; return;
} }
if (!gctx->iio[gctx->io_mode & 0xFF]) { if (!gctx->iio[gctx->io_mode & 0xFF]) {
printk(KERN_INFO pr_info("Undefined indirect IO write method %d\n",
"Undefined indirect IO write method %d.\n",
gctx->io_mode & 0x7F); gctx->io_mode & 0x7F);
return; return;
} }
@ -850,17 +844,17 @@ static void atom_op_postcard(atom_exec_context *ctx, int *ptr, int arg)
static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg) static 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)
} }
(*ptr) += 2; (*ptr) += 2;
} else { } else {
printk(KERN_INFO "Bad case.\n"); pr_info("Bad case\n");
return; return;
} }
(*ptr) += 2; (*ptr) += 2;
@ -1316,14 +1310,14 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
ctx->bios = bios; ctx->bios = bios;
if (CU16(0) != ATOM_BIOS_MAGIC) { if (CU16(0) != ATOM_BIOS_MAGIC) {
printk(KERN_INFO "Invalid BIOS magic.\n"); pr_info("Invalid BIOS magic\n");
kfree(ctx); kfree(ctx);
return NULL; return NULL;
} }
if (strncmp if (strncmp
(CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC, (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC,
strlen(ATOM_ATI_MAGIC))) { strlen(ATOM_ATI_MAGIC))) {
printk(KERN_INFO "Invalid ATI magic.\n"); pr_info("Invalid ATI magic\n");
kfree(ctx); kfree(ctx);
return NULL; return NULL;
} }
@ -1332,7 +1326,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
if (strncmp if (strncmp
(CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC, (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC,
strlen(ATOM_ROM_MAGIC))) { strlen(ATOM_ROM_MAGIC))) {
printk(KERN_INFO "Invalid ATOM magic.\n"); pr_info("Invalid ATOM magic\n");
kfree(ctx); kfree(ctx);
return NULL; return NULL;
} }
@ -1356,7 +1350,7 @@ struct atom_context *amdgpu_atom_parse(struct card_info *card, void *bios)
break; break;
} }
} }
printk(KERN_INFO "ATOM BIOS: %s\n", name); pr_info("ATOM BIOS: %s\n", name);
return ctx; return ctx;
} }

4
drivers/gpu/drm/amd/amdgpu/ci_dpm.c
View file

@ -5840,9 +5840,7 @@ static int ci_dpm_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_smc: Failed to load firmware \"%s\"\n", fw_name);
"cik_smc: Failed to load firmware \"%s\"\n",
fw_name);
release_firmware(adev->pm.fw); release_firmware(adev->pm.fw);
adev->pm.fw = NULL; adev->pm.fw = NULL;
} }

4
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
View file

@ -142,9 +142,7 @@ static int cik_sdma_init_microcode(struct amdgpu_device *adev)
} }
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_sdma: Failed to load firmware \"%s\"\n", fw_name);
"cik_sdma: Failed to load firmware \"%s\"\n",
fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) { for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw); release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL; adev->sdma.instance[i].fw = NULL;

4
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
View file

@ -378,9 +378,7 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("gfx6: Failed to load firmware \"%s\"\n", fw_name);
"gfx6: Failed to load firmware \"%s\"\n",
fw_name);
release_firmware(adev->gfx.pfp_fw); release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL; adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw); release_firmware(adev->gfx.me_fw);

4
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
View file

@ -972,9 +972,7 @@ static int gfx_v7_0_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("gfx7: Failed to load firmware \"%s\"\n", fw_name);
"gfx7: Failed to load firmware \"%s\"\n",
fw_name);
release_firmware(adev->gfx.pfp_fw); release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL; adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw); release_firmware(adev->gfx.me_fw);

8
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
View file

@ -161,9 +161,7 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_mc: Failed to load firmware \"%s\"\n", fw_name);
"cik_mc: Failed to load firmware \"%s\"\n",
fw_name);
release_firmware(adev->mc.fw); release_firmware(adev->mc.fw);
adev->mc.fw = NULL; adev->mc.fw = NULL;
} }
@ -994,12 +992,12 @@ static int gmc_v7_0_sw_init(void *handle)
if (r) { if (r) {
adev->need_dma32 = true; adev->need_dma32 = true;
dma_bits = 32; dma_bits = 32;
printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); pr_warn("amdgpu: No suitable DMA available\n");
} }
r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits));
if (r) { if (r) {
pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32));
printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); pr_warn("amdgpu: No coherent DMA available\n");
} }
r = gmc_v7_0_init_microcode(adev); r = gmc_v7_0_init_microcode(adev);

8
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
View file

@ -245,9 +245,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("mc: Failed to load firmware \"%s\"\n", fw_name);
"mc: Failed to load firmware \"%s\"\n",
fw_name);
release_firmware(adev->mc.fw); release_firmware(adev->mc.fw);
adev->mc.fw = NULL; adev->mc.fw = NULL;
} }
@ -1006,12 +1004,12 @@ static int gmc_v8_0_sw_init(void *handle)
if (r) { if (r) {
adev->need_dma32 = true; adev->need_dma32 = true;
dma_bits = 32; dma_bits = 32;
printk(KERN_WARNING "amdgpu: No suitable DMA available.\n"); pr_warn("amdgpu: No suitable DMA available\n");
} }
r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits)); r = pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(dma_bits));
if (r) { if (r) {
pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32)); pci_set_consistent_dma_mask(adev->pdev, DMA_BIT_MASK(32));
printk(KERN_WARNING "amdgpu: No coherent DMA available.\n"); pr_warn("amdgpu: No coherent DMA available\n");
} }
r = gmc_v8_0_init_microcode(adev); r = gmc_v8_0_init_microcode(adev);

4
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
View file

@ -170,9 +170,7 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("sdma_v2_4: Failed to load firmware \"%s\"\n", fw_name);
"sdma_v2_4: Failed to load firmware \"%s\"\n",
fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) { for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw); release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL; adev->sdma.instance[i].fw = NULL;

4
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
View file

@ -321,9 +321,7 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
} }
out: out:
if (err) { if (err) {
printk(KERN_ERR pr_err("sdma_v3_0: Failed to load firmware \"%s\"\n", fw_name);
"sdma_v3_0: Failed to load firmware \"%s\"\n",
fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) { for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw); release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL; adev->sdma.instance[i].fw = NULL;

4
drivers/gpu/drm/amd/include/amd_pcie_helpers.h
View file

@ -82,7 +82,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap,
switch (pcie_lane_width_cap) { switch (pcie_lane_width_cap) {
case 0: case 0:
printk(KERN_ERR "No valid PCIE lane width reported"); pr_err("No valid PCIE lane width reported\n");
break; break;
case CAIL_PCIE_LINK_WIDTH_SUPPORT_X1: case CAIL_PCIE_LINK_WIDTH_SUPPORT_X1:
new_pcie_lanes = 1; new_pcie_lanes = 1;
@ -126,7 +126,7 @@ static inline uint16_t get_pcie_lane_support(uint32_t pcie_lane_width_cap,
} }
} }
if (j > 7) if (j > 7)
printk(KERN_ERR "Cannot find a valid PCIE lane width!"); pr_err("Cannot find a valid PCIE lane width!\n");
} }
} }
break; break;

42
drivers/gpu/drm/radeon/atom.c
View file

@ -170,7 +170,7 @@ static uint32_t atom_iio_execute(struct atom_context *ctx, int base,
case ATOM_IIO_END: case ATOM_IIO_END:
return temp; return temp;
default: default:
printk(KERN_INFO "Unknown IIO opcode.\n"); pr_info("Unknown IIO opcode\n");
return 0; return 0;
} }
} }
@ -194,21 +194,18 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr,
val = gctx->card->reg_read(gctx->card, idx); val = gctx->card->reg_read(gctx->card, idx);
break; break;
case ATOM_IO_PCI: case ATOM_IO_PCI:
printk(KERN_INFO pr_info("PCI registers are not implemented\n");
"PCI registers are not implemented.\n");
return 0; return 0;
case ATOM_IO_SYSIO: case ATOM_IO_SYSIO:
printk(KERN_INFO pr_info("SYSIO registers are not implemented\n");
"SYSIO registers are not implemented.\n");
return 0; return 0;
default: default:
if (!(gctx->io_mode & 0x80)) { if (!(gctx->io_mode & 0x80)) {
printk(KERN_INFO "Bad IO mode.\n"); pr_info("Bad IO mode\n");
return 0; return 0;
} }
if (!gctx->iio[gctx->io_mode & 0x7F]) { if (!gctx->iio[gctx->io_mode & 0x7F]) {
printk(KERN_INFO pr_info("Undefined indirect IO read method %d\n",
"Undefined indirect IO read method %d.\n",
gctx->io_mode & 0x7F); gctx->io_mode & 0x7F);
return 0; return 0;
} }
@ -473,21 +470,18 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr,
gctx->card->reg_write(gctx->card, idx, val); gctx->card->reg_write(gctx->card, idx, val);
break; break;
case ATOM_IO_PCI: case ATOM_IO_PCI:
printk(KERN_INFO pr_info("PCI registers are not implemented\n");
"PCI registers are not implemented.\n");
return; return;
case ATOM_IO_SYSIO: case ATOM_IO_SYSIO:
printk(KERN_INFO pr_info("SYSIO registers are not implemented\n");
"SYSIO registers are not implemented.\n");
return; return;
default: default:
if (!(gctx->io_mode & 0x80)) { if (!(gctx->io_mode & 0x80)) {
printk(KERN_INFO "Bad IO mode.\n"); pr_info("Bad IO mode\n");
return; return;
} }
if (!gctx->iio[gctx->io_mode & 0xFF]) { if (!gctx->iio[gctx->io_mode & 0xFF]) {
printk(KERN_INFO pr_info("Undefined indirect IO write method %d\n",
"Undefined indirect IO write method %d.\n",
gctx->io_mode & 0x7F); gctx->io_mode & 0x7F);
return; return;
} }
@ -819,17 +813,17 @@ static void atom_op_postcard(atom_exec_context *ctx, int *ptr, int arg)
static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_repeat(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_restorereg(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_savereg(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static void atom_op_setdatablock(atom_exec_context *ctx, int *ptr, int arg) static 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)
} }
(*ptr) += 2; (*ptr) += 2;
} else { } else {
printk(KERN_INFO "Bad case.\n"); pr_info("Bad case\n");
return; return;
} }
(*ptr) += 2; (*ptr) += 2;
@ -1026,7 +1020,7 @@ static void atom_op_xor(atom_exec_context *ctx, int *ptr, int arg)
static void atom_op_debug(atom_exec_context *ctx, int *ptr, int arg) static void atom_op_debug(atom_exec_context *ctx, int *ptr, int arg)
{ {
printk(KERN_INFO "unimplemented!\n"); pr_info("unimplemented!\n");
} }
static struct { static struct {
@ -1280,14 +1274,14 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
ctx->bios = bios; ctx->bios = bios;
if (CU16(0) != ATOM_BIOS_MAGIC) { if (CU16(0) != ATOM_BIOS_MAGIC) {
printk(KERN_INFO "Invalid BIOS magic.\n"); pr_info("Invalid BIOS magic\n");
kfree(ctx); kfree(ctx);
return NULL; return NULL;
} }
if (strncmp if (strncmp
(CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC, (CSTR(ATOM_ATI_MAGIC_PTR), ATOM_ATI_MAGIC,
strlen(ATOM_ATI_MAGIC))) { strlen(ATOM_ATI_MAGIC))) {
printk(KERN_INFO "Invalid ATI magic.\n"); pr_info("Invalid ATI magic\n");
kfree(ctx); kfree(ctx);
return NULL; return NULL;
} }
@ -1296,7 +1290,7 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
if (strncmp if (strncmp
(CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC, (CSTR(base + ATOM_ROM_MAGIC_PTR), ATOM_ROM_MAGIC,
strlen(ATOM_ROM_MAGIC))) { strlen(ATOM_ROM_MAGIC))) {
printk(KERN_INFO "Invalid ATOM magic.\n"); pr_info("Invalid ATOM magic\n");
kfree(ctx); kfree(ctx);
return NULL; return NULL;
} }
@ -1320,7 +1314,7 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
break; break;
} }
} }
printk(KERN_INFO "ATOM BIOS: %s\n", name); pr_info("ATOM BIOS: %s\n", name);
return ctx; return ctx;
} }

56
drivers/gpu/drm/radeon/cik.c
View file

@ -2072,8 +2072,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
printk(KERN_ERR pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
"cik_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->pfp_fw->size, fw_name); rdev->pfp_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@ -2081,8 +2080,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
} else { } else {
err = radeon_ucode_validate(rdev->pfp_fw); err = radeon_ucode_validate(rdev->pfp_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2098,16 +2096,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->me_fw->size != me_req_size) { if (rdev->me_fw->size != me_req_size) {
printk(KERN_ERR pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
"cik_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->me_fw); err = radeon_ucode_validate(rdev->me_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2123,16 +2119,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->ce_fw->size != ce_req_size) { if (rdev->ce_fw->size != ce_req_size) {
printk(KERN_ERR pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
"cik_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->ce_fw->size, fw_name); rdev->ce_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->ce_fw); err = radeon_ucode_validate(rdev->ce_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2148,16 +2142,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->mec_fw->size != mec_req_size) { if (rdev->mec_fw->size != mec_req_size) {
printk(KERN_ERR pr_err("cik_cp: Bogus length %zu in firmware \"%s\"\n",
"cik_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->mec_fw->size, fw_name); rdev->mec_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->mec_fw); err = radeon_ucode_validate(rdev->mec_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2188,16 +2180,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->rlc_fw->size != rlc_req_size) { if (rdev->rlc_fw->size != rlc_req_size) {
printk(KERN_ERR pr_err("cik_rlc: Bogus length %zu in firmware \"%s\"\n",
"cik_rlc: Bogus length %zu in firmware \"%s\"\n",
rdev->rlc_fw->size, fw_name); rdev->rlc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->rlc_fw); err = radeon_ucode_validate(rdev->rlc_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2213,16 +2203,14 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->sdma_fw->size != sdma_req_size) { if (rdev->sdma_fw->size != sdma_req_size) {
printk(KERN_ERR pr_err("cik_sdma: Bogus length %zu in firmware \"%s\"\n",
"cik_sdma: Bogus length %zu in firmware \"%s\"\n",
rdev->sdma_fw->size, fw_name); rdev->sdma_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->sdma_fw); err = radeon_ucode_validate(rdev->sdma_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2245,8 +2233,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
} }
if ((rdev->mc_fw->size != mc_req_size) && if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)){ (rdev->mc_fw->size != mc2_req_size)){
printk(KERN_ERR pr_err("cik_mc: Bogus length %zu in firmware \"%s\"\n",
"cik_mc: Bogus length %zu in firmware \"%s\"\n",
rdev->mc_fw->size, fw_name); rdev->mc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -2254,8 +2241,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
} else { } else {
err = radeon_ucode_validate(rdev->mc_fw); err = radeon_ucode_validate(rdev->mc_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2272,23 +2258,20 @@ static int cik_init_microcode(struct radeon_device *rdev)
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR pr_err("smc: error loading firmware \"%s\"\n",
"smc: error loading firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(rdev->smc_fw); release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL; rdev->smc_fw = NULL;
err = 0; err = 0;
} else if (rdev->smc_fw->size != smc_req_size) { } else if (rdev->smc_fw->size != smc_req_size) {
printk(KERN_ERR pr_err("cik_smc: Bogus length %zu in firmware \"%s\"\n",
"cik_smc: Bogus length %zu in firmware \"%s\"\n",
rdev->smc_fw->size, fw_name); rdev->smc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->smc_fw); err = radeon_ucode_validate(rdev->smc_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("cik_fw: validation failed for firmware \"%s\"\n",
"cik_fw: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -2300,7 +2283,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
if (new_fw == 0) { if (new_fw == 0) {
rdev->new_fw = false; rdev->new_fw = false;
} else if (new_fw < num_fw) { } else if (new_fw < num_fw) {
printk(KERN_ERR "ci_fw: mixing new and old firmware!\n"); pr_err("ci_fw: mixing new and old firmware!\n");
err = -EINVAL; err = -EINVAL;
} else { } else {
rdev->new_fw = true; rdev->new_fw = true;
@ -2309,8 +2292,7 @@ static int cik_init_microcode(struct radeon_device *rdev)
out: out:
if (err) { if (err) {
if (err != -EINVAL) if (err != -EINVAL)
printk(KERN_ERR pr_err("cik_cp: Failed to load firmware \"%s\"\n",
"cik_cp: Failed to load firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;

2
drivers/gpu/drm/radeon/evergreen.c
View file

@ -2486,7 +2486,7 @@ void evergreen_pcie_gart_tlb_flush(struct radeon_device *rdev)
tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE);
tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT;
if (tmp == 2) { if (tmp == 2) {
printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); pr_warn("[drm] r600 flush TLB failed\n");
return; return;
} }
if (tmp) { if (tmp) {

7
drivers/gpu/drm/radeon/evergreen_cs.c
View file

@ -1061,8 +1061,7 @@ static int evergreen_packet0_check(struct radeon_cs_parser *p,
} }
break; break;
default: default:
printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
reg, idx);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -2776,7 +2775,7 @@ int evergreen_cs_parse(struct radeon_cs_parser *p)
} while (p->idx < p->chunk_ib->length_dw); } while (p->idx < p->chunk_ib->length_dw);
#if 0 #if 0
for (r = 0; r < p->ib.length_dw; r++) { for (r = 0; r < p->ib.length_dw; r++) {
printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
mdelay(1); mdelay(1);
} }
#endif #endif
@ -3215,7 +3214,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
} while (p->idx < p->chunk_ib->length_dw); } while (p->idx < p->chunk_ib->length_dw);
#if 0 #if 0
for (r = 0; r < p->ib->length_dw; r++) { for (r = 0; r < p->ib->length_dw; r++) {
printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
mdelay(1); mdelay(1);
} }
#endif #endif

22
drivers/gpu/drm/radeon/ni.c
View file

@ -774,8 +774,7 @@ int ni_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
printk(KERN_ERR pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
"ni_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->pfp_fw->size, fw_name); rdev->pfp_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@ -786,8 +785,7 @@ int ni_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->me_fw->size != me_req_size) { if (rdev->me_fw->size != me_req_size) {
printk(KERN_ERR pr_err("ni_cp: Bogus length %zu in firmware \"%s\"\n",
"ni_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -797,8 +795,7 @@ int ni_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->rlc_fw->size != rlc_req_size) { if (rdev->rlc_fw->size != rlc_req_size) {
printk(KERN_ERR pr_err("ni_rlc: Bogus length %zu in firmware \"%s\"\n",
"ni_rlc: Bogus length %zu in firmware \"%s\"\n",
rdev->rlc_fw->size, fw_name); rdev->rlc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -810,8 +807,7 @@ int ni_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->mc_fw->size != mc_req_size) { if (rdev->mc_fw->size != mc_req_size) {
printk(KERN_ERR pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
"ni_mc: Bogus length %zu in firmware \"%s\"\n",
rdev->mc_fw->size, fw_name); rdev->mc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -821,15 +817,12 @@ int ni_init_microcode(struct radeon_device *rdev)
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR pr_err("smc: error loading firmware \"%s\"\n", fw_name);
"smc: error loading firmware \"%s\"\n",
fw_name);
release_firmware(rdev->smc_fw); release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL; rdev->smc_fw = NULL;
err = 0; err = 0;
} else if (rdev->smc_fw->size != smc_req_size) { } else if (rdev->smc_fw->size != smc_req_size) {
printk(KERN_ERR pr_err("ni_mc: Bogus length %zu in firmware \"%s\"\n",
"ni_mc: Bogus length %zu in firmware \"%s\"\n",
rdev->mc_fw->size, fw_name); rdev->mc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -838,8 +831,7 @@ int ni_init_microcode(struct radeon_device *rdev)
out: out:
if (err) { if (err) {
if (err != -EINVAL) if (err != -EINVAL)
printk(KERN_ERR pr_err("ni_cp: Failed to load firmware \"%s\"\n",
"ni_cp: Failed to load firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;

18
drivers/gpu/drm/radeon/r100.c
View file

@ -1042,11 +1042,9 @@ static int r100_cp_init_microcode(struct radeon_device *rdev)
err = request_firmware(&rdev->me_fw, fw_name, rdev->dev); err = request_firmware(&rdev->me_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR "radeon_cp: Failed to load firmware \"%s\"\n", pr_err("radeon_cp: Failed to load firmware \"%s\"\n", fw_name);
fw_name);
} else if (rdev->me_fw->size % 8) { } else if (rdev->me_fw->size % 8) {
printk(KERN_ERR pr_err("radeon_cp: Bogus length %zu in firmware \"%s\"\n",
"radeon_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
release_firmware(rdev->me_fw); release_firmware(rdev->me_fw);
@ -1087,8 +1085,7 @@ static void r100_cp_load_microcode(struct radeon_device *rdev)
int i, size; int i, size;
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
if (rdev->me_fw) { if (rdev->me_fw) {
@ -1246,8 +1243,7 @@ void r100_cp_disable(struct radeon_device *rdev)
WREG32(RADEON_CP_CSQ_CNTL, 0); WREG32(RADEON_CP_CSQ_CNTL, 0);
WREG32(R_000770_SCRATCH_UMSK, 0); WREG32(R_000770_SCRATCH_UMSK, 0);
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
} }
@ -1881,8 +1877,7 @@ static int r100_packet0_check(struct radeon_cs_parser *p,
track->tex_dirty = true; track->tex_dirty = true;
break; break;
default: default:
printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
reg, idx);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -2486,8 +2481,7 @@ int r100_gui_wait_for_idle(struct radeon_device *rdev)
uint32_t tmp; uint32_t tmp;
if (r100_rbbm_fifo_wait_for_entry(rdev, 64)) { if (r100_rbbm_fifo_wait_for_entry(rdev, 64)) {
printk(KERN_WARNING "radeon: wait for empty RBBM fifo failed !" pr_warn("radeon: wait for empty RBBM fifo failed! Bad things might happen.\n");
" Bad things might happen.\n");
} }
for (i = 0; i < rdev->usec_timeout; i++) { for (i = 0; i < rdev->usec_timeout; i++) {
tmp = RREG32(RADEON_RBBM_STATUS); tmp = RREG32(RADEON_RBBM_STATUS);

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

@ -537,8 +537,7 @@ int r200_packet0_check(struct radeon_cs_parser *p,
track->tex_dirty = true; track->tex_dirty = true;
break; break;
default: default:
printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
reg, idx);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;

13
drivers/gpu/drm/radeon/r300.c
View file

@ -387,8 +387,7 @@ static void r300_gpu_init(struct radeon_device *rdev)
WREG32(R300_GB_TILE_CONFIG, gb_tile_config); WREG32(R300_GB_TILE_CONFIG, gb_tile_config);
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
tmp = RREG32(R300_DST_PIPE_CONFIG); tmp = RREG32(R300_DST_PIPE_CONFIG);
@ -399,14 +398,12 @@ static void r300_gpu_init(struct radeon_device *rdev)
R300_DC_DC_DISABLE_IGNORE_PE); R300_DC_DC_DISABLE_IGNORE_PE);
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
if (r300_mc_wait_for_idle(rdev)) { if (r300_mc_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait MC idle while " pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized.\n", DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized\n",
rdev->num_gb_pipes, rdev->num_z_pipes); rdev->num_gb_pipes, rdev->num_z_pipes);
} }
@ -1165,7 +1162,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
} }
return 0; return 0;
fail: fail:
printk(KERN_ERR "Forbidden register 0x%04X in cs at %d (val=%08x)\n", pr_err("Forbidden register 0x%04X in cs at %d (val=%08x)\n",
reg, idx, idx_value); reg, idx, idx_value);
return -EINVAL; return -EINVAL;
} }

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

@ -92,8 +92,7 @@ void r420_pipes_init(struct radeon_device *rdev)
(1 << 2) | (1 << 3)); (1 << 2) | (1 << 3));
/* add idle wait as per freedesktop.org bug 24041 */ /* add idle wait as per freedesktop.org bug 24041 */
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
/* get max number of pipes */ /* get max number of pipes */
gb_pipe_select = RREG32(R400_GB_PIPE_SELECT); gb_pipe_select = RREG32(R400_GB_PIPE_SELECT);
@ -128,8 +127,7 @@ void r420_pipes_init(struct radeon_device *rdev)
tmp |= R300_TILE_SIZE_16 | R300_ENABLE_TILING; tmp |= R300_TILE_SIZE_16 | R300_ENABLE_TILING;
WREG32(R300_GB_TILE_CONFIG, tmp); WREG32(R300_GB_TILE_CONFIG, tmp);
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
tmp = RREG32(R300_DST_PIPE_CONFIG); tmp = RREG32(R300_DST_PIPE_CONFIG);
@ -141,8 +139,7 @@ void r420_pipes_init(struct radeon_device *rdev)
R300_DC_DC_DISABLE_IGNORE_PE); R300_DC_DC_DISABLE_IGNORE_PE);
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
if (rdev->family == CHIP_RV530) { if (rdev->family == CHIP_RV530) {

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

@ -86,8 +86,7 @@ static void r520_gpu_init(struct radeon_device *rdev)
(((gb_pipe_select >> 8) & 0xF) << 4); (((gb_pipe_select >> 8) & 0xF) << 4);
WREG32_PLL(0x000D, tmp); WREG32_PLL(0x000D, tmp);
if (r520_mc_wait_for_idle(rdev)) { if (r520_mc_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait MC idle while " pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
} }

21
drivers/gpu/drm/radeon/r600.c
View file

@ -1094,7 +1094,7 @@ void r600_pcie_gart_tlb_flush(struct radeon_device *rdev)
tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE); tmp = RREG32(VM_CONTEXT0_REQUEST_RESPONSE);
tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT; tmp = (tmp & RESPONSE_TYPE_MASK) >> RESPONSE_TYPE_SHIFT;
if (tmp == 2) { if (tmp == 2) {
printk(KERN_WARNING "[drm] r600 flush TLB failed\n"); pr_warn("[drm] r600 flush TLB failed\n");
return; return;
} }
if (tmp) { if (tmp) {
@ -2550,8 +2550,7 @@ int r600_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
printk(KERN_ERR pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
"r600_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->pfp_fw->size, fw_name); rdev->pfp_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@ -2562,8 +2561,7 @@ int r600_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->me_fw->size != me_req_size) { if (rdev->me_fw->size != me_req_size) {
printk(KERN_ERR pr_err("r600_cp: Bogus length %zu in firmware \"%s\"\n",
"r600_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -2573,8 +2571,7 @@ int r600_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->rlc_fw->size != rlc_req_size) { if (rdev->rlc_fw->size != rlc_req_size) {
printk(KERN_ERR pr_err("r600_rlc: Bogus length %zu in firmware \"%s\"\n",
"r600_rlc: Bogus length %zu in firmware \"%s\"\n",
rdev->rlc_fw->size, fw_name); rdev->rlc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -2583,15 +2580,12 @@ int r600_init_microcode(struct radeon_device *rdev)
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name); snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", smc_chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR pr_err("smc: error loading firmware \"%s\"\n", fw_name);
"smc: error loading firmware \"%s\"\n",
fw_name);
release_firmware(rdev->smc_fw); release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL; rdev->smc_fw = NULL;
err = 0; err = 0;
} else if (rdev->smc_fw->size != smc_req_size) { } else if (rdev->smc_fw->size != smc_req_size) {
printk(KERN_ERR pr_err("smc: Bogus length %zu in firmware \"%s\"\n",
"smc: Bogus length %zu in firmware \"%s\"\n",
rdev->smc_fw->size, fw_name); rdev->smc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -2600,8 +2594,7 @@ int r600_init_microcode(struct radeon_device *rdev)
out: out:
if (err) { if (err) {
if (err != -EINVAL) if (err != -EINVAL)
printk(KERN_ERR pr_err("r600_cp: Failed to load firmware \"%s\"\n",
"r600_cp: Failed to load firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;

7
drivers/gpu/drm/radeon/r600_cs.c
View file

@ -932,8 +932,7 @@ static int r600_packet0_check(struct radeon_cs_parser *p,
} }
break; break;
default: default:
printk(KERN_ERR "Forbidden register 0x%04X in cs at %d\n", pr_err("Forbidden register 0x%04X in cs at %d\n", reg, idx);
reg, idx);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
@ -2320,7 +2319,7 @@ int r600_cs_parse(struct radeon_cs_parser *p)
} while (p->idx < p->chunk_ib->length_dw); } while (p->idx < p->chunk_ib->length_dw);
#if 0 #if 0
for (r = 0; r < p->ib.length_dw; r++) { for (r = 0; r < p->ib.length_dw; r++) {
printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
mdelay(1); mdelay(1);
} }
#endif #endif
@ -2528,7 +2527,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p)
} while (p->idx < p->chunk_ib->length_dw); } while (p->idx < p->chunk_ib->length_dw);
#if 0 #if 0
for (r = 0; r < p->ib->length_dw; r++) { for (r = 0; r < p->ib->length_dw; r++) {
printk(KERN_INFO "%05d 0x%08X\n", r, p->ib.ptr[r]); pr_info("%05d 0x%08X\n", r, p->ib.ptr[r]);
mdelay(1); mdelay(1);
} }
#endif #endif

3
drivers/gpu/drm/radeon/radeon.h
View file

@ -2535,7 +2535,8 @@ static inline struct radeon_fence *to_radeon_fence(struct dma_fence *f)
#define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg)) #define WREG16(reg, v) writew(v, (rdev->rmmio) + (reg))
#define RREG32(reg) r100_mm_rreg(rdev, (reg), false) #define RREG32(reg) r100_mm_rreg(rdev, (reg), false)
#define RREG32_IDX(reg) r100_mm_rreg(rdev, (reg), true) #define RREG32_IDX(reg) r100_mm_rreg(rdev, (reg), true)
#define DREG32(reg) printk(KERN_INFO "REGISTER: " #reg " : 0x%08X\n", r100_mm_rreg(rdev, (reg), false)) #define DREG32(reg) pr_info("REGISTER: " #reg " : 0x%08X\n", \
r100_mm_rreg(rdev, (reg), false))
#define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v), false) #define WREG32(reg, v) r100_mm_wreg(rdev, (reg), (v), false)
#define WREG32_IDX(reg, v) r100_mm_wreg(rdev, (reg), (v), true) #define WREG32_IDX(reg, v) r100_mm_wreg(rdev, (reg), (v), true)
#define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK) #define REG_SET(FIELD, v) (((v) << FIELD##_SHIFT) & FIELD##_MASK)

2
drivers/gpu/drm/radeon/radeon_atpx_handler.c
View file

@ -577,7 +577,7 @@ static bool radeon_atpx_detect(void)
if (has_atpx && vga_count == 2) { if (has_atpx && vga_count == 2) {
acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer); acpi_get_name(radeon_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer);
printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n", pr_info("vga_switcheroo: detected switching method %s handle\n",
acpi_method_name); acpi_method_name);
radeon_atpx_priv.atpx_detected = true; radeon_atpx_priv.atpx_detected = true;
radeon_atpx_priv.bridge_pm_usable = d3_supported; radeon_atpx_priv.bridge_pm_usable = d3_supported;

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

@ -576,9 +576,9 @@ static void radeon_audio_calc_cts(unsigned int clock, int *CTS, int *N, int freq
/* Check that we are in spec (not always possible) */ /* Check that we are in spec (not always possible) */
if (n < (128*freq/1500)) if (n < (128*freq/1500))
printk(KERN_WARNING "Calculated ACR N value is too small. You may experience audio problems.\n"); pr_warn("Calculated ACR N value is too small. You may experience audio problems.\n");
if (n > (128*freq/300)) if (n > (128*freq/300))
printk(KERN_WARNING "Calculated ACR N value is too large. You may experience audio problems.\n"); pr_warn("Calculated ACR N value is too large. You may experience audio problems.\n");
*N = n; *N = n;
*CTS = cts; *CTS = cts;

2
drivers/gpu/drm/radeon/radeon_clocks.c
View file

@ -111,7 +111,7 @@ static bool radeon_read_clocks_OF(struct drm_device *dev)
return false; return false;
val = of_get_property(dp, "ATY,RefCLK", NULL); val = of_get_property(dp, "ATY,RefCLK", NULL);
if (!val || !*val) { if (!val || !*val) {
printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n"); pr_warn("radeonfb: No ATY,RefCLK property !\n");
return false; return false;
} }
p1pll->reference_freq = p2pll->reference_freq = (*val) / 10; p1pll->reference_freq = p2pll->reference_freq = (*val) / 10;

8
drivers/gpu/drm/radeon/radeon_device.c
View file

@ -1249,7 +1249,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
if (state == VGA_SWITCHEROO_ON) { if (state == VGA_SWITCHEROO_ON) {
unsigned d3_delay = dev->pdev->d3_delay; unsigned d3_delay = dev->pdev->d3_delay;
printk(KERN_INFO "radeon: switched on\n"); pr_info("radeon: switched on\n");
/* don't suspend or resume card normally */ /* don't suspend or resume card normally */
dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
@ -1263,7 +1263,7 @@ static void radeon_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero
dev->switch_power_state = DRM_SWITCH_POWER_ON; dev->switch_power_state = DRM_SWITCH_POWER_ON;
drm_kms_helper_poll_enable(dev); drm_kms_helper_poll_enable(dev);
} else { } else {
printk(KERN_INFO "radeon: switched off\n"); pr_info("radeon: switched off\n");
drm_kms_helper_poll_disable(dev); drm_kms_helper_poll_disable(dev);
dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
radeon_suspend_kms(dev, true, true, false); radeon_suspend_kms(dev, true, true, false);
@ -1410,12 +1410,12 @@ int radeon_device_init(struct radeon_device *rdev,
if (r) { if (r) {
rdev->need_dma32 = true; rdev->need_dma32 = true;
dma_bits = 32; dma_bits = 32;
printk(KERN_WARNING "radeon: No suitable DMA available.\n"); pr_warn("radeon: No suitable DMA available\n");
} }
r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits)); r = pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(dma_bits));
if (r) { if (r) {
pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32)); pci_set_consistent_dma_mask(rdev->pdev, DMA_BIT_MASK(32));
printk(KERN_WARNING "radeon: No coherent DMA available.\n"); pr_warn("radeon: No coherent DMA available\n");
} }
/* Registers mapping */ /* Registers mapping */

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

@ -149,8 +149,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
RADEON_GEM_DOMAIN_VRAM, RADEON_GEM_DOMAIN_VRAM,
0, true, &gobj); 0, true, &gobj);
if (ret) { if (ret) {
printk(KERN_ERR "failed to allocate framebuffer (%d)\n", pr_err("failed to allocate framebuffer (%d)\n", aligned_size);
aligned_size);
return -ENOMEM; return -ENOMEM;
} }
rbo = gem_to_radeon_bo(gobj); rbo = gem_to_radeon_bo(gobj);

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

@ -106,7 +106,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj,
} }
if (!domain) { if (!domain) {
/* Do nothings */ /* Do nothings */
printk(KERN_WARNING "Set domain without domain !\n"); pr_warn("Set domain without domain !\n");
return 0; return 0;
} }
if (domain == RADEON_GEM_DOMAIN_CPU) { if (domain == RADEON_GEM_DOMAIN_CPU) {
@ -116,7 +116,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj,
r = -EBUSY; r = -EBUSY;
if (r < 0 && r != -EINTR) { if (r < 0 && r != -EINTR) {
printk(KERN_ERR "Failed to wait for object: %li\n", r); pr_err("Failed to wait for object: %li\n", r);
return r; return r;
} }
} }

6
drivers/gpu/drm/radeon/radeon_test.c
View file

@ -246,7 +246,7 @@ out_unref:
out_cleanup: out_cleanup:
kfree(gtt_obj); kfree(gtt_obj);
if (r) { if (r) {
printk(KERN_WARNING "Error while testing BO move.\n"); pr_warn("Error while testing BO move\n");
} }
} }
@ -394,7 +394,7 @@ out_cleanup:
radeon_fence_unref(&fence2); radeon_fence_unref(&fence2);
if (r) if (r)
printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); pr_warn("Error while testing ring sync (%d)\n", r);
} }
static void radeon_test_ring_sync2(struct radeon_device *rdev, static void radeon_test_ring_sync2(struct radeon_device *rdev,
@ -504,7 +504,7 @@ out_cleanup:
radeon_fence_unref(&fenceB); radeon_fence_unref(&fenceB);
if (r) if (r)
printk(KERN_WARNING "Error while testing ring sync (%d).\n", r); pr_warn("Error while testing ring sync (%d)\n", r);
} }
static bool radeon_test_sync_possible(struct radeon_ring *ringA, static bool radeon_test_sync_possible(struct radeon_ring *ringA,

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

@ -255,8 +255,8 @@ static void rs400_gpu_init(struct radeon_device *rdev)
/* FIXME: is this correct ? */ /* FIXME: is this correct ? */
r420_pipes_init(rdev); r420_pipes_init(rdev);
if (rs400_mc_wait_for_idle(rdev)) { if (rs400_mc_wait_for_idle(rdev)) {
printk(KERN_WARNING "rs400: Failed to wait MC idle while " pr_warn("rs400: Failed to wait MC idle while programming pipes. Bad things might happen. %08x\n",
"programming pipes. Bad things might happen. %08x\n", RREG32(RADEON_MC_STATUS)); RREG32(RADEON_MC_STATUS));
} }
} }

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

@ -52,8 +52,7 @@ static void rs690_gpu_init(struct radeon_device *rdev)
/* FIXME: is this correct ? */ /* FIXME: is this correct ? */
r420_pipes_init(rdev); r420_pipes_init(rdev);
if (rs690_mc_wait_for_idle(rdev)) { if (rs690_mc_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait MC idle while " pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
} }

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

@ -154,8 +154,7 @@ static void rv515_gpu_init(struct radeon_device *rdev)
unsigned pipe_select_current, gb_pipe_select, tmp; unsigned pipe_select_current, gb_pipe_select, tmp;
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n");
"resetting GPU. Bad things might happen.\n");
} }
rv515_vga_render_disable(rdev); rv515_vga_render_disable(rdev);
r420_pipes_init(rdev); r420_pipes_init(rdev);
@ -166,12 +165,10 @@ static void rv515_gpu_init(struct radeon_device *rdev)
(((gb_pipe_select >> 8) & 0xF) << 4); (((gb_pipe_select >> 8) & 0xF) << 4);
WREG32_PLL(0x000D, tmp); WREG32_PLL(0x000D, tmp);
if (r100_gui_wait_for_idle(rdev)) { if (r100_gui_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait GUI idle while " pr_warn("Failed to wait GUI idle while resetting GPU. Bad things might happen.\n");
"resetting GPU. Bad things might happen.\n");
} }
if (rv515_mc_wait_for_idle(rdev)) { if (rv515_mc_wait_for_idle(rdev)) {
printk(KERN_WARNING "Failed to wait MC idle while " pr_warn("Failed to wait MC idle while programming pipes. Bad things might happen.\n");
"programming pipes. Bad things might happen.\n");
} }
} }

45
drivers/gpu/drm/radeon/si.c
View file

@ -1762,8 +1762,7 @@ static int si_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->pfp_fw->size != pfp_req_size) { if (rdev->pfp_fw->size != pfp_req_size) {
printk(KERN_ERR pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
"si_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->pfp_fw->size, fw_name); rdev->pfp_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
goto out; goto out;
@ -1771,8 +1770,7 @@ static int si_init_microcode(struct radeon_device *rdev)
} else { } else {
err = radeon_ucode_validate(rdev->pfp_fw); err = radeon_ucode_validate(rdev->pfp_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("si_cp: validation failed for firmware \"%s\"\n",
"si_cp: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -1788,16 +1786,14 @@ static int si_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->me_fw->size != me_req_size) { if (rdev->me_fw->size != me_req_size) {
printk(KERN_ERR pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
"si_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->me_fw->size, fw_name); rdev->me_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->me_fw); err = radeon_ucode_validate(rdev->me_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("si_cp: validation failed for firmware \"%s\"\n",
"si_cp: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -1813,16 +1809,14 @@ static int si_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->ce_fw->size != ce_req_size) { if (rdev->ce_fw->size != ce_req_size) {
printk(KERN_ERR pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
"si_cp: Bogus length %zu in firmware \"%s\"\n",
rdev->ce_fw->size, fw_name); rdev->ce_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->ce_fw); err = radeon_ucode_validate(rdev->ce_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("si_cp: validation failed for firmware \"%s\"\n",
"si_cp: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -1838,16 +1832,14 @@ static int si_init_microcode(struct radeon_device *rdev)
if (err) if (err)
goto out; goto out;
if (rdev->rlc_fw->size != rlc_req_size) { if (rdev->rlc_fw->size != rlc_req_size) {
printk(KERN_ERR pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n",
"si_rlc: Bogus length %zu in firmware \"%s\"\n",
rdev->rlc_fw->size, fw_name); rdev->rlc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->rlc_fw); err = radeon_ucode_validate(rdev->rlc_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("si_cp: validation failed for firmware \"%s\"\n",
"si_cp: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -1871,8 +1863,7 @@ static int si_init_microcode(struct radeon_device *rdev)
} }
if ((rdev->mc_fw->size != mc_req_size) && if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)) { (rdev->mc_fw->size != mc2_req_size)) {
printk(KERN_ERR pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n",
"si_mc: Bogus length %zu in firmware \"%s\"\n",
rdev->mc_fw->size, fw_name); rdev->mc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
@ -1880,8 +1871,7 @@ static int si_init_microcode(struct radeon_device *rdev)
} else { } else {
err = radeon_ucode_validate(rdev->mc_fw); err = radeon_ucode_validate(rdev->mc_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("si_cp: validation failed for firmware \"%s\"\n",
"si_cp: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -1900,23 +1890,19 @@ static int si_init_microcode(struct radeon_device *rdev)
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name); snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev); err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) { if (err) {
printk(KERN_ERR pr_err("smc: error loading firmware \"%s\"\n", fw_name);
"smc: error loading firmware \"%s\"\n",
fw_name);
release_firmware(rdev->smc_fw); release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL; rdev->smc_fw = NULL;
err = 0; err = 0;
} else if (rdev->smc_fw->size != smc_req_size) { } else if (rdev->smc_fw->size != smc_req_size) {
printk(KERN_ERR pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n",
"si_smc: Bogus length %zu in firmware \"%s\"\n",
rdev->smc_fw->size, fw_name); rdev->smc_fw->size, fw_name);
err = -EINVAL; err = -EINVAL;
} }
} else { } else {
err = radeon_ucode_validate(rdev->smc_fw); err = radeon_ucode_validate(rdev->smc_fw);
if (err) { if (err) {
printk(KERN_ERR pr_err("si_cp: validation failed for firmware \"%s\"\n",
"si_cp: validation failed for firmware \"%s\"\n",
fw_name); fw_name);
goto out; goto out;
} else { } else {
@ -1927,7 +1913,7 @@ static int si_init_microcode(struct radeon_device *rdev)
if (new_fw == 0) { if (new_fw == 0) {
rdev->new_fw = false; rdev->new_fw = false;
} else if (new_fw < 6) { } else if (new_fw < 6) {
printk(KERN_ERR "si_fw: mixing new and old firmware!\n"); pr_err("si_fw: mixing new and old firmware!\n");
err = -EINVAL; err = -EINVAL;
} else { } else {
rdev->new_fw = true; rdev->new_fw = true;
@ -1935,8 +1921,7 @@ static int si_init_microcode(struct radeon_device *rdev)
out: out:
if (err) { if (err) {
if (err != -EINVAL) if (err != -EINVAL)
printk(KERN_ERR pr_err("si_cp: Failed to load firmware \"%s\"\n",
"si_cp: Failed to load firmware \"%s\"\n",
fw_name); fw_name);
release_firmware(rdev->pfp_fw); release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL; rdev->pfp_fw = NULL;