From patchwork Fri Oct 30 23:16:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adi Ratiu X-Patchwork-Id: 7529931 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E32C9BF90C for ; Fri, 30 Oct 2015 23:15:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 279572075F for ; Fri, 30 Oct 2015 23:15:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A9A5C20783 for ; Fri, 30 Oct 2015 23:15:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E060C6E37D; Fri, 30 Oct 2015 16:15:14 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id A57966E37D for ; Fri, 30 Oct 2015 16:15:10 -0700 (PDT) Received: by wicfx6 with SMTP id fx6so19468849wic.1 for ; Fri, 30 Oct 2015 16:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adirat_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=pmI9wSZigOjn9lKPjQvH3/MLs0beM1SnakZqfm8bSJc=; b=xxy0fjaO4X5aK4bImLf4PNSX3ye8XaOx9NaCdUMvWXci86ZNitcbAx9vy3DG/vqwrB Nyv9SV921YMt+DB3mFFGyscASI6CAd+mLXcwWYzdlhVWMieKuifGywV8VnCO3OiLB0MU WeTsIRUfrxLxi26HkpaeAEyPIIhL6Y2qhbR+WcImMJzDRybLYRt2X/FucFJCgBpVNek4 cCViGEjcjJKrkGz3vviYKX6mS2aYbMmARcUts+Engy/yCFgOit4ccX6TlrS3V01UIxRC AY7LQLuBvugMIue2vT1tNSD6PyCmHRUVOI4VhT1Z3fFMbtgMQIcTUltcDED7GyhNJOnU Y3wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pmI9wSZigOjn9lKPjQvH3/MLs0beM1SnakZqfm8bSJc=; b=m8Orm3WCxLHCjsnQlwdwfwnAuNuyNuBtHaDtBn3vb5S8LajnxIzowm8wzeEOdv1Ouu qYL2Cm8ubInhegQ0/s/a8CdCN6dHJiVbo8ifJUh4V74NDnTr4mBkyq0S7CzOWgIyDbcP f1bH7pFXumfPZWrlg9FWJKt5Z5kK1G/zmN/F5yC6wjexmC6XvseEf7aIw+04GsZ4Ggl9 l5BsoHomMguUTXHXaBihpocWJZVMrw2cN3NZ3SLnqq6x9jKLxUETNxXxnjGDwt7Lvl4t 4Kq7b7uCmhl0ESZUONlb5ahyiEKdXx+Ar2z5coJNO3Ck6D6hA9PfHZZFB4FgXc4XTKP2 +gsg== X-Gm-Message-State: ALoCoQlf9zJ7fLapa8TA5WR7wMW3dX9ZG1dz4uCmvN6vttOZ1264P10kAMKtE4GBCW1VGUxeuHO3 X-Received: by 10.194.203.101 with SMTP id kp5mr10750974wjc.64.1446246909257; Fri, 30 Oct 2015 16:15:09 -0700 (PDT) Received: from adipc.lan ([79.116.55.239]) by smtp.gmail.com with ESMTPSA id bf8sm9247424wjc.22.2015.10.30.16.15.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Oct 2015 16:15:08 -0700 (PDT) From: Ioan-Adrian Ratiu To: airlied@linux.ie, daniel.vetter@intel.com Date: Sat, 31 Oct 2015 01:16:00 +0200 Message-Id: <1446246960-22620-1-git-send-email-adi@adirat.com> X-Mailer: git-send-email 2.6.2 Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 1/1] drm/i915/dma: enforce pr_ consistency X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP One branch of the if clause uses pr_info, the other pr_err; change the 'false' branch to also use pr_info. This minor oversight has gone unfixed since the initial vga_switcheroo implementation in 6a9ee8af. Signed-off-by: Ioan-Adrian Ratiu --- drivers/gpu/drm/i915/i915_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 2336af9..b23f465 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -338,7 +338,7 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ i915_resume_switcheroo(dev); dev->switch_power_state = DRM_SWITCH_POWER_ON; } else { - pr_err("switched off\n"); + pr_info("switched off\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; i915_suspend_switcheroo(dev, pmm); dev->switch_power_state = DRM_SWITCH_POWER_OFF;