From patchwork Thu May 4 17:01:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9712347 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DA0D6020B for ; Thu, 4 May 2017 17:01:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 001BC286B9 for ; Thu, 4 May 2017 17:01:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E858E286D7; Thu, 4 May 2017 17:01:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7F06D286D2 for ; Thu, 4 May 2017 17:01:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDBBB6E583; Thu, 4 May 2017 17:01:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 433 seconds by postgrey-1.35 at gabe; Thu, 04 May 2017 17:01:51 UTC Received: from mout.web.de (mout.web.de [217.72.192.78]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0857C6E583; Thu, 4 May 2017 17:01:50 +0000 (UTC) Received: from [192.168.1.2] ([92.228.166.245]) by smtp.web.de (mrweb101 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M6E6g-1dyoMh13zG-00y6j2; Thu, 04 May 2017 19:01:33 +0200 Subject: [PATCH 9/9] drm/i915: Combine substrings for two messages in i915_ggtt_probe_hw() From: SF Markus Elfring To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Chris Wilson , Daniel Vetter , David Airlie , Jani Nikula References: <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net> Message-ID: Date: Thu, 4 May 2017 19:01:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.0.1 MIME-Version: 1.0 In-Reply-To: <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net> Content-Language: en-US X-Provags-ID: V03:K0:qeoe8ldtHTwPaZNY88GptUKxUICBsyNi6oNatdIRJAJlt5U2IKi 80GPdP+0Qo5jQRypmPR2B409+xNjz0uNCeaWYB3+HHYexaKYf78dXQvbxM+joJOjsf4yaq7 CW6Jt781B21T/y4RISq9s02dZ/8/i7VFDi34EjcPGOHYAf54gs5TAe1xooRF/s4cJfCvxqw JkD6Jeen3ye/5rq6V75ew== X-UI-Out-Filterresults: notjunk:1; V01:K0:b+I78bcPXbk=:7SArFlu0G++HHJGAQO1sdk X/CRLdXq/h/jvp31VUQBInDROD4s6/879d7u492QzVJ+kO7fU0ViGxbfULDtkz3QGhYW+5t/p 0tnOosoPcELeqO+HoisAjLHXSzca/cT5IwpY5YJMvID/TqFs8jfvkWprW9I4QP0tYs5mCtiEt gJUzkWPxjVEL1QZdpib7fTzrqorTXXOdAWaha4vTjUNfPAFJBy3DMYMLLigHOZV10eZX2+tJn 2YIXLsQupCUWmod6pph/Fs7HHs1xx9O5Opdbi/E/BV6YO7ODYpBGaoHH4QrrR9R8MsmSqmxzn 0oJWwrDgd5UZtEAN9e7VcIhyz2QnKzCsrecrBCdeQpg0ndVC0uFsx4Ft2WPB55E9MQFC0m1M7 ArmxaqmRxRgu/Bk3+xrZv2OVqPwkRm3NiqTbgFKyOy23pBh6LWsM31sJZjv+eDtLhmbQL+MWs P7vyv9LcFhlxwS0CGdS694EoE3c/97ou5KTtBMF8Q06o1gZttrekHccot9tvZL7C8rzCooipu G7gecq2uPmm0OV8Q8rXKxvGAK49i7QXNeZPYjKv2NIsCZT0dnm2fQCq9l6xYY3M/seVzkw9nD 62hT75crMo08IDPP1ZyB3TJsuJ6dpmhgVzuOotqL3yt49AEZABKrW4kcqDlul8XjLDs1uEd+A rLZAPH0arG52vWNXKZ/orI8TMnc/pCE2Ly0Gv1izcJwtKgYC33uPIG5WS4uAv/XrTi4t2DJme qDBJn/cxsgPjYdolisJ1a4wPVrkjbeaBVN5JUTPwR7jK/ayoxLU3rV6kokZech+pquv8PBUuL trGZjZAd+BDQR8xu6mLR6GbRBpAAg== Cc: kernel-janitors@vger.kernel.org, LKML X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Thu, 4 May 2017 14:30:37 +0200 The script "checkpatch.pl" pointed information out like the following. WARNING: quoted string split across lines Thus fix the affected source code place. Signed-off-by: Markus Elfring --- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 9f64dc3f2d05..508431f42b65 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -2905,16 +2905,14 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv) } if ((ggtt->base.total - 1) >> 32) { - DRM_ERROR("We never expected a Global GTT with more than 32bits" - " of address space! Found %lldM!\n", + DRM_ERROR("We never expected a Global GTT with more than 32bits of address space! Found %lldM!\n", ggtt->base.total >> 20); ggtt->base.total = 1ULL << 32; ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total); } if (ggtt->mappable_end > ggtt->base.total) { - DRM_ERROR("mappable aperture extends past end of GGTT," - " aperture=%llx, total=%llx\n", + DRM_ERROR("mappable aperture extends past end of GGTT, aperture=%llx, total=%llx\n", ggtt->mappable_end, ggtt->base.total); ggtt->mappable_end = ggtt->base.total; }