From patchwork Fri Oct 12 07:54:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 1585871 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id E89EE4025F for ; Fri, 12 Oct 2012 09:03:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDF89A0E0A for ; Fri, 12 Oct 2012 02:03:21 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by gabe.freedesktop.org (Postfix) with ESMTP id C5A8BA0DC1 for ; Fri, 12 Oct 2012 00:55:02 -0700 (PDT) Received: by mail-pa0-f49.google.com with SMTP id bi5so2700428pad.36 for ; Fri, 12 Oct 2012 00:55:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=G3qetBYXMN97YE8cpC8TNX+J8ceNGjyEikZmXSsWSyg=; b=lNxHQOwrtMOgXz+td5aV/JHCpnQ8sBRYhx0VGBpPUBzg6NEW4cZ5qFBRsrC1bhQJdm u4JuIhUVJJqtSNGFQ32vQYkkkRzi66Hbijgy8b0fhhAHmrPXqoPxwcSu/XEftZlK9l8A qSBuOnw8nXXTsdUrI40ZnGwlbKp50Pphy6mamEMQkGWrM8bP0z0lvfA4p9Qt0YhPT4hr mKflR0LD3g/fCN1EBQZ4eo8rQgPHmw5kSriGndJoj1E+iB/7cAy2OEwblsWWuqenFKB1 l5G1/Lt255kv8G9FeV/CaqpXPFm+b2imkvmJEJ8ZdohfK+lKJc9FtwRE/NOH4W1WrDTk LN4Q== Received: by 10.66.78.199 with SMTP id d7mr9148421pax.77.1350028502669; Fri, 12 Oct 2012 00:55:02 -0700 (PDT) Received: from meiko.1dn ([115.42.131.38]) by mx.google.com with ESMTPS id x6sm3956768pav.29.2012.10.12.00.54.58 (version=SSLv3 cipher=OTHER); Fri, 12 Oct 2012 00:55:01 -0700 (PDT) From: Daniel J Blueman To: David Airlie Subject: [PATCH] radeon: Prevent confusion when fimware loading fails Date: Fri, 12 Oct 2012 15:54:52 +0800 Message-Id: <1350028492-10117-1-git-send-email-daniel@quora.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQk3yXM1cec5CZiCZz6ug5qSH57exYwtiV2+VqXAZmmx/IsC5CgU4RyCz0HZ6AFgC0HTM0AV X-Mailman-Approved-At: Fri, 12 Oct 2012 01:59:14 -0700 Cc: Alex Deucher , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Daniel J Blueman , xorg-driver-ati@lists.x.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org When firmware loading fails eg due to running a newer kernel and hardware on an older distro, prevent the user confusing this subsequent warning backtrace with the real issue further up, ie "failed to load firmware", which doesn't produce a backtrace. Signed-off-by: Daniel J Blueman --- drivers/gpu/drm/radeon/evergreen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index e93b80a..444cdf5 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2416,7 +2416,7 @@ int evergreen_irq_set(struct radeon_device *rdev) u32 afmt1 = 0, afmt2 = 0, afmt3 = 0, afmt4 = 0, afmt5 = 0, afmt6 = 0; if (!rdev->irq.installed) { - WARN(1, "Can't enable IRQ/MSI because no handler is installed\n"); + dev_warn(rdev->dev, "not enabling IRQ/MSI as no handler is installed\n"); return -EINVAL; } /* don't enable anything if the ih is disabled */