Signed-off-by: Pierre Moreau <pierre.morrow@xxxxxxx> --- drm/nouveau/nouveau_acpi.c | 8 ++++---- drm/nouveau/nouveau_vga.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drm/nouveau/nouveau_acpi.c b/drm/nouveau/nouveau_acpi.c index 7aeaf7d..104d291 100644 --- a/drm/nouveau/nouveau_acpi.c +++ b/drm/nouveau/nouveau_acpi.c @@ -91,7 +91,7 @@ static int nouveau_evaluate_optimus_dsm(acpi_handle handle, int func, int arg, u obj = acpi_evaluate_dsm(handle, nouveau_op_dsm_muid, nouveau_op_dsm_rid, func, &argv4); if (!obj) { - acpi_handle_info(handle, "failed to evaluate _DSM\n"); + acpi_handle_err(handle, "failed to evaluate Optimus _DSM\n"); return AE_ERROR; } else if (obj->type == ACPI_TYPE_BUFFER) { if (!result && obj->buffer.length == 4) { @@ -150,7 +150,7 @@ static int nouveau_evaluate_mux_dsm(acpi_handle handle, int func, int arg) obj = acpi_evaluate_dsm_typed(handle, nouveau_mux_dsm_muid, nouveau_mux_dsm_rid, func, &argv4, ACPI_TYPE_INTEGER); if (!obj) { - acpi_handle_info(handle, "failed to evaluate _DSM\n"); + acpi_handle_err(handle, "failed to evaluate mux _DSM\n"); return AE_ERROR; } else { if (obj->integer.value == 0x80000002) @@ -272,7 +272,7 @@ static bool nouveau_dsm_detect(void) guid_valid = mxm_wmi_supported(); if (guid_valid) - printk("MXM: GUID detected in BIOS\n"); + printk(KERN_INFO "MXM: GUID detected in BIOS\n"); /* now do DSM detection */ while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) { @@ -375,7 +375,7 @@ static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios, status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer); if (ACPI_FAILURE(status)) { - printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status)); + printk(KERN_ERR "ACPI: failed to evaluate ROM got %s\n", acpi_format_exception(status)); return -ENODEV; } obj = (union acpi_object *)buffer.pointer; diff --git a/drm/nouveau/nouveau_vga.c b/drm/nouveau/nouveau_vga.c index 6297566..9a6328f 100644 --- a/drm/nouveau/nouveau_vga.c +++ b/drm/nouveau/nouveau_vga.c @@ -40,13 +40,13 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev, return; if (state == VGA_SWITCHEROO_ON) { - printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); + printk(KERN_INFO "VGA switcheroo: switched nouveau on\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; nouveau_pmops_resume(&pdev->dev); drm_kms_helper_poll_enable(dev); dev->switch_power_state = DRM_SWITCH_POWER_ON; } else { - printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); + printk(KERN_INFO "VGA switcheroo: switched nouveau off\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; drm_kms_helper_poll_disable(dev); nouveau_switcheroo_optimus_dsm(); -- 2.4.1 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel