From patchwork Thu Apr 9 01:28:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurabindo Pillai X-Patchwork-Id: 11481351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4BBE514B4 for ; Thu, 9 Apr 2020 07:33:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 27499206F7 for ; Thu, 9 Apr 2020 07:33:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aurabindo.in header.i=@aurabindo.in header.b="NlMqSZt8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 27499206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=aurabindo.in Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C11F06EB5C; Thu, 9 Apr 2020 07:33:25 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6830A6EB2E for ; Thu, 9 Apr 2020 01:28:21 +0000 (UTC) Received: by mail-qv1-xf41.google.com with SMTP id s18so4781860qvn.1 for ; Wed, 08 Apr 2020 18:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aurabindo.in; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a8mBf/x6tKmxXEyAN6VSKYHc9JSU+mIaA50Z6TnFau4=; b=NlMqSZt8QFI8sd/DDnRRiuydXjaYLzxItlei1QSWHbiyShTaKKSGURBOkhrkk91CxW /X+Qgb5kT/Tps0tzjntpYhBtxqSIyEiUAJrD28KSW+Ak6UERz5KiIAuFmidnFOXF3saq y5hxwSo82HWB2DKzD+N3OLxUlzmHRmC7x9lEqr/VOOaWRmBSLLr5JZ1o1m2bcGFp2N8K CMMceFTqTpBOdT8lUa6F6lNm7O38kfcGVYWCp2tJIxAZHD7mDG/r8vp2SL6SxRNJ0j6b ewLTd/FthX6hcv+JmkjXbKfzvZNfibmvWUqRC0qmB1IZrqJkjbZSCFgDsIDSquzFIxOR J1KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a8mBf/x6tKmxXEyAN6VSKYHc9JSU+mIaA50Z6TnFau4=; b=c++X9gVSpuSKZ/55eo6vdD96bjZDk2gad8c+XbLyB4NFmnVYRxPWcZvw3jXngrBDk+ A81FTenL8dmWSlkcYtbOPnzQr27YAVJKEMXSctmt5EsECuAycopOp4Gv8vpeF57FdHk5 /Y37sD7EJwc9f+ZiJHjk4Bx6aanXA8kCpkVaqLqTkXq6IeVOh3bbmZtOihHntScDH3Ux O1oqc1UWewvEZlD1141z0xVXm/Jn6ueFp1n/URQaZv/ew5IGnYd6Yicm2zPPmdE5dYuY rMozJg0eFGR5WQtjKJS8qy068mzhNViJhsTzDG8fJBzYGz110AAcyFVnB/rLfQwuru/6 tYqQ== X-Gm-Message-State: AGi0PuYSldW03+zc0ky6p5gcGXTvBCJ7NiLHyvaA0FYNNdET1wxVpPh2 GZVVu76vjFjFERNdPwxsOHyBww== X-Google-Smtp-Source: APiQypLHyltpW2woM041SGTay/GRNOYCz+x3AjvXnaurPcRm5EFzWLaZMasX8iJ0rPqFFM0GH+KX3Q== X-Received: by 2002:a0c:bd99:: with SMTP id n25mr10491345qvg.149.1586395700553; Wed, 08 Apr 2020 18:28:20 -0700 (PDT) Received: from localhost.localdomain (135-23-249-169.cpe.pppoe.ca. [135.23.249.169]) by smtp.gmail.com with ESMTPSA id h13sm11710186qkj.21.2020.04.08.18.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 18:28:20 -0700 (PDT) From: Aurabindo Pillai To: christian.koenig@amd.com, alexander.deucher@amd.com, David1.Zhou@amd.com Subject: [PATCH v2 1/3] drm/amd/amdgpu: add prefix for pr_* prints Date: Wed, 8 Apr 2020 21:28:13 -0400 Message-Id: <20200409012815.22309-2-mail@aurabindo.in> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200409012815.22309-1-mail@aurabindo.in> References: <20200409012815.22309-1-mail@aurabindo.in> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 09 Apr 2020 07:33:24 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, Felix.Kuehling@amd.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" amdgpu uses lots of pr_* calls for printing error messages. With this prefix, errors shall be more obvious to the end use regarding its origin, and may help debugging. Prefix format: [xxx.xxxxx] amdgpu: ... Signed-off-by: Aurabindo Pillai --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index da3bcff61..67d654a89 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -28,6 +28,12 @@ #ifndef __AMDGPU_H__ #define __AMDGPU_H__ +#ifdef pr_fmt +#undef pr_fmt +#endif + +#define pr_fmt(fmt) "amdgpu: " fmt + #include "amdgpu_ctx.h" #include From patchwork Thu Apr 9 01:28:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurabindo Pillai X-Patchwork-Id: 11481365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86B8314B4 for ; Thu, 9 Apr 2020 07:34:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 631EF206F7 for ; Thu, 9 Apr 2020 07:34:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aurabindo.in header.i=@aurabindo.in header.b="gGAFmj/f" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 631EF206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=aurabindo.in Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD22E6EB7C; Thu, 9 Apr 2020 07:33:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 369B16EB2D for ; Thu, 9 Apr 2020 01:28:23 +0000 (UTC) Received: by mail-qv1-xf44.google.com with SMTP id ef12so4733642qvb.11 for ; Wed, 08 Apr 2020 18:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aurabindo.in; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iAZ49xsLFafBw1eWwQbQgcyCMLWhUsSohaRadPz3t44=; b=gGAFmj/fpiuOrhiYazOd8ZJKb6FeO5AcwBXbcykszik2Cxb11C6INXDPGjZMgX/IFL +8D0QXaBjKOfXqrfiz6uxYMOaI+BTDldCTv+XLW5SH3eY3eJ9F4BdJAQvelqu8zm58RA kOFtmJcThBkMtMItCWkwgfjkzJVC141uKOV6IXm/dAyZ0eueS4wO3b437dyZRrVzdG6I 601kOarVFZTFtZOMcPJkE9U7ugiUoPFoXsFT+CLNnzBlQ5DKbHJQpeHrHCMSO18ArPJ6 5XSjo+2ShjDn/GNQK7IhGamQxv+BtZuN4R9pV98ffL7O6gPAENUwTiasoXfWUWVkjRf1 j2ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iAZ49xsLFafBw1eWwQbQgcyCMLWhUsSohaRadPz3t44=; b=j+br4ekLe3D0R3QnovFgAnZJbG8rO9tLW/JwtYCvWiwTcS9AEMdlGPmQhuTLiR47Pn PT/ZJllbeM7gFnONRC/Hi/kSftY5y5/iaZnM9J8ESHOaQr6cqn885SbKeA8rIMnVLk2k OS+K8rDKe+C156u7mTr5JouKoEkq3T05ps47SFaJeJ/tqwhLfFR1/Pl7oQ4rNQYSLUvD Qu6LtliVi6L2pvc0vbXnfUxEDLpsirv4sbCJqQXHmnWPPdhJnoBFzWPxJ2GoF6KZ/pjm OLtK+TYP2Q2inwuHfnqh8FEC96LuoZkqS09rlgjkOB3IFfJhZDLMgLp8ihPW3cpXN66p OJIA== X-Gm-Message-State: AGi0PubFBfdL6I+6F5XnOo1ZkVBrde6NouNW5SyQrOQcyoMXZw3PZm6L kn4DD4kk/JME8cVMVclzQO6V1Q== X-Google-Smtp-Source: APiQypJc2DhYwtTtM+Ce7usYBK/yFp24XNfCDvHn8AqXL3/muK8IGYc5YthGfwGZy0C04JbdRiUWqQ== X-Received: by 2002:a05:6214:9cb:: with SMTP id dp11mr9948057qvb.60.1586395702443; Wed, 08 Apr 2020 18:28:22 -0700 (PDT) Received: from localhost.localdomain (135-23-249-169.cpe.pppoe.ca. [135.23.249.169]) by smtp.gmail.com with ESMTPSA id h13sm11710186qkj.21.2020.04.08.18.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 18:28:22 -0700 (PDT) From: Aurabindo Pillai To: christian.koenig@amd.com, alexander.deucher@amd.com, David1.Zhou@amd.com Subject: [PATCH v2 2/3] drm/amd/amdgpu: add print prefix for dev_* variants Date: Wed, 8 Apr 2020 21:28:14 -0400 Message-Id: <20200409012815.22309-3-mail@aurabindo.in> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200409012815.22309-1-mail@aurabindo.in> References: <20200409012815.22309-1-mail@aurabindo.in> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 09 Apr 2020 07:33:24 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, Felix.Kuehling@amd.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Define dev_fmt macro for informative print messages Signed-off-by: Aurabindo Pillai --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 67d654a89..7a52d37e6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -34,6 +34,12 @@ #define pr_fmt(fmt) "amdgpu: " fmt +#ifdef dev_fmt +#undef dev_fmt +#endif + +#define dev_fmt(fmt) "amdgpu: " fmt + #include "amdgpu_ctx.h" #include From patchwork Thu Apr 9 01:28:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurabindo Pillai X-Patchwork-Id: 11481363 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E28C314DD for ; Thu, 9 Apr 2020 07:34:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BEF2020769 for ; Thu, 9 Apr 2020 07:34:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aurabindo.in header.i=@aurabindo.in header.b="IdhsTx1X" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BEF2020769 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=aurabindo.in Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 057556EB6D; Thu, 9 Apr 2020 07:33:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by gabe.freedesktop.org (Postfix) with ESMTPS id 992C76EB32 for ; Thu, 9 Apr 2020 01:28:25 +0000 (UTC) Received: by mail-qt1-x843.google.com with SMTP id m33so1619786qtb.3 for ; Wed, 08 Apr 2020 18:28:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aurabindo.in; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n5kw2Wbvm+jeuA0TKaixDRv8+MULXqVay3QBIHkyklY=; b=IdhsTx1X7K+gu0qszXrpQefgwGzG8CB0RvoL1PoE6xMluCGUybvuH1Y1hDU0yhH3lb S7ZxnE671zW/V5dVCMIOgpJYyC6qX5dEi8rT9ldP5rLRXGT846mhZ4uTxSNMgJq8hgiy DVf+/oXW92XTx+Ke/57DO0CfcC3ryfBU3gwHz3BbjYvxCYPFGah+zYcwZG7q8cWAt+Bn VIcoN22EpwE9vvdtIKTtUjvSq0zQv4hHLEppbWzfwOwGFjYq+r3btl1GVxJzPRz8Otf/ qDz08PtlqeYREFn5SzmohAt6B1fCFjcFdODvQ8szTdoaDTK7sYBdq6qNVFfqbhUZsGdf gcXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n5kw2Wbvm+jeuA0TKaixDRv8+MULXqVay3QBIHkyklY=; b=RBeXaVf9GLNLV3YlAVcuPwJXuoR7yJEah5cfszL9FzXo09kFOORI1B/PfPm5Ygp5L7 VLrcEEvtc6TkgcgcouuJOaKApLPzxOpnMVBPZJ0KL10qrXIzFJ4EKH83hFUEnA+W4Ufy JRZ7WlY8SX6J+cT6clBtEjSALZzWPI90rWj9lXle4Q5BB+CLMmrJ++KfxDIvJa1ajXgv 2Tnul1WmueNdu3xNRxy+KfLDgroBamd1BPQouIV1scbpuLe7EJzSubkmG6cfbSsrPkwT tnG7o/AJctPSpw806snLvXbG5ndoqc5Ltpjy0znVP9VXPdiQD6Ci4kZLxEVeKD1HH4z7 LViQ== X-Gm-Message-State: AGi0Pub5eusby6I9XK/Agg+AtvQR8jX6rWyhT1s6AJbNC06/EPnz99TS /fz5AjID+O8WobDv5cx5FqOWcQ== X-Google-Smtp-Source: APiQypKkLtyEqv2exCrhc0LFffwP7h8eu9YlvpRilNhQ13nMJibLG+kUqVy7Zkjty2jLqU3zF9iILA== X-Received: by 2002:ac8:6719:: with SMTP id e25mr10113060qtp.367.1586395704610; Wed, 08 Apr 2020 18:28:24 -0700 (PDT) Received: from localhost.localdomain (135-23-249-169.cpe.pppoe.ca. [135.23.249.169]) by smtp.gmail.com with ESMTPSA id h13sm11710186qkj.21.2020.04.08.18.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 18:28:24 -0700 (PDT) From: Aurabindo Pillai To: christian.koenig@amd.com, alexander.deucher@amd.com, David1.Zhou@amd.com Subject: [PATCH v2 3/3] drm/amd/amdgpu: remove hardcoded module name in prints Date: Wed, 8 Apr 2020 21:28:15 -0400 Message-Id: <20200409012815.22309-4-mail@aurabindo.in> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200409012815.22309-1-mail@aurabindo.in> References: <20200409012815.22309-1-mail@aurabindo.in> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 09 Apr 2020 07:33:24 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, Felix.Kuehling@amd.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Let format prefixes take care of printing the module name through pr_fmt and dev_fmt definitions. Signed-off-by: Aurabindo Pillai --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index fa8ac9d19..4afd4ef54 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -325,13 +325,13 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) ret = amdgpu_vm_validate_pt_bos(adev, vm, amdgpu_amdkfd_validate, ¶m); if (ret) { - pr_err("amdgpu: failed to validate PT BOs\n"); + pr_err("failed to validate PT BOs\n"); return ret; } ret = amdgpu_amdkfd_validate(¶m, pd); if (ret) { - pr_err("amdgpu: failed to validate PD\n"); + pr_err("failed to validate PD\n"); return ret; } @@ -340,7 +340,7 @@ static int vm_validate_pt_pd_bos(struct amdgpu_vm *vm) if (vm->use_cpu_for_update) { ret = amdgpu_bo_kmap(pd, NULL); if (ret) { - pr_err("amdgpu: failed to kmap PD, ret=%d\n", ret); + pr_err("failed to kmap PD, ret=%d\n", ret); return ret; } } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index b8975857d..0a8c4a266 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1092,7 +1092,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero return; if (state == VGA_SWITCHEROO_ON) { - pr_info("amdgpu: switched on\n"); + pr_info("switched on\n"); /* don't suspend or resume card normally */ dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; @@ -1106,7 +1106,7 @@ static void amdgpu_switcheroo_set_state(struct pci_dev *pdev, enum vga_switchero dev->switch_power_state = DRM_SWITCH_POWER_ON; drm_kms_helper_poll_enable(dev); } else { - pr_info("amdgpu: switched off\n"); + pr_info("switched off\n"); drm_kms_helper_poll_disable(dev); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; amdgpu_device_suspend(dev, true); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c index 5ed4227f3..0cc4c67f9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c @@ -260,7 +260,7 @@ int amdgpu_irq_init(struct amdgpu_device *adev) nvec = pci_alloc_irq_vectors(adev->pdev, 1, 1, flags); if (nvec > 0) { adev->irq.msi_enabled = true; - dev_dbg(adev->dev, "amdgpu: using MSI/MSI-X.\n"); + dev_dbg(adev->dev, "using MSI/MSI-X.\n"); } } diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c index b20503935..c1a530dbe 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c @@ -858,7 +858,7 @@ static int gmc_v6_0_sw_init(void *handle) r = dma_set_mask_and_coherent(adev->dev, DMA_BIT_MASK(44)); if (r) { - dev_warn(adev->dev, "amdgpu: No suitable DMA available.\n"); + dev_warn(adev->dev, "No suitable DMA available.\n"); return r; } adev->need_swiotlb = drm_need_swiotlb(44); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index 9da9596a3..e8529e244 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c @@ -1019,7 +1019,7 @@ static int gmc_v7_0_sw_init(void *handle) r = dma_set_mask_and_coherent(adev->dev, DMA_BIT_MASK(40)); if (r) { - pr_warn("amdgpu: No suitable DMA available\n"); + pr_warn("No suitable DMA available\n"); return r; } adev->need_swiotlb = drm_need_swiotlb(40); diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 27d83204f..0aa5b8280 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c @@ -1144,7 +1144,7 @@ static int gmc_v8_0_sw_init(void *handle) r = dma_set_mask_and_coherent(adev->dev, DMA_BIT_MASK(40)); if (r) { - pr_warn("amdgpu: No suitable DMA available\n"); + pr_warn("No suitable DMA available\n"); return r; } adev->need_swiotlb = drm_need_swiotlb(40);