From patchwork Wed Apr 11 04:42:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian W MORRISON X-Patchwork-Id: 10335195 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 A67FA60365 for ; Wed, 11 Apr 2018 09:21:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94EA22881D for ; Wed, 11 Apr 2018 09:21:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 86F702880F; Wed, 11 Apr 2018 09:21:16 +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=-5.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable 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 3A34828826 for ; Wed, 11 Apr 2018 09:21:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1C5E6E42D; Wed, 11 Apr 2018 09:21:13 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED7546E520; Wed, 11 Apr 2018 04:42:27 +0000 (UTC) Received: by mail-pl0-x242.google.com with SMTP id 61-v6so467571plb.2; Tue, 10 Apr 2018 21:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=t41SIZ77TenOTSivCUBNZRO4XROInqe3IoobaTZ9I+Q=; b=qBK3GWwW9+RUu6YpiFvoU8DSf3wSNCXfQc7ylVMBHdWS12/FGCleNWwX4wdCjMUVIr 1uDFCCBbSRv+lfeGk+sutYRBOnWDVBseUSMihthGR6YA030d7J4sggAokLf7EpXAK1aD HsVyjcI8KGkreYKHJJl1GFQwgV75AdQCVnzJm7ZozkL4azudF0BLfuUSIplrAah2ks3k mlf41+SpKfpr+6pTeZMiBScvyhihsx/ZsaM8VLmRueYfH9J+9uFIF7EyFxsz7xDFWjl8 SSd3KjwJ3UdULYkmTeI3vNmutxLQ/HawZZyXzyZmn+SLTErm5OSjvjy41vNNYq55RzUl V6Rg== 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; bh=t41SIZ77TenOTSivCUBNZRO4XROInqe3IoobaTZ9I+Q=; b=DZ3PLsmYwCluc9/EazLR0El9XdvDMok1MyUXff14PDCt+YByec+xeN7g2EnXndmFgS iOEZvs3k4I5cD11ygySbCp87/zCKt5WEoUfkoN8zgilUQRX6ZofuXLfJQ/O/qlJqjQ1x KrYQoqohiJEuj/Exhjom0kZwPnSrZ9apUEkdHSg17o1pSqY/ioSvwpT3WGHkL6Hgmu3H 4KQRbw/cn9spOvhWGNoVspcBPTKxiNdbpufMN2/oo9Tz2RCetGqMqcmlvlSeJNnA5DF9 Op0rNEqu+cilNIavPfgZJAADgSsJ6BM477RJFYFJymQ9dV1Tng6sjFXRI30ZZq1iTsHf zaoQ== X-Gm-Message-State: ALQs6tD2u8yOEHP2+cF11hl1eqBqL8sz6SHzoXZthYbQLF7LnmNI6leh 68wrnUxFBRTT1CAJh8jdvmM= X-Google-Smtp-Source: AIpwx4/KY4WH3UMMujzrh+pZlwIWnhLlnRrE4AQs3VEuK57wTjgbmf57irf+dUo6AvbgWh3iDG3srg== X-Received: by 2002:a17:902:7201:: with SMTP id ba1-v6mr3323227plb.283.1523421747206; Tue, 10 Apr 2018 21:42:27 -0700 (PDT) Received: from localhost.localdomain (CPE-58-173-153-121.sicz2.woo.bigpond.net.au. [58.173.153.121]) by smtp.gmail.com with ESMTPSA id d83sm621910pfl.176.2018.04.10.21.42.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 21:42:26 -0700 (PDT) From: ianwmorrison@gmail.com To: rodrigo.vivi@intel.com, anusha.srivatsa@intel.com, michal.wajdeczko@intel.com, gregkh@linuxfoundation.org, airlied@linux.ie, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com Date: Wed, 11 Apr 2018 14:42:13 +1000 Message-Id: <20180411044213.383-1-ianwmorrison@gmail.com> X-Mailer: git-send-email 2.11.0 X-Mailman-Approved-At: Wed, 11 Apr 2018 09:21:12 +0000 Subject: [Intel-gfx] [RESEND PATCH 1/1] drm/i915/glk: Add MODULE_FIRMWARE for Geminilake X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, ianwmorrison@gmail.com, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Ian W MORRISON As the Geminilake firmware is now merged to linux-firmware.git use MODUE_FIRMWARE to load the firmware. This removes the error message in the dmesg log: i915 0000:00:02.0: Direct firmware load for i915/glk_dmc_ver1_04.bin failed with error -2 i915 0000:00:02.0: Failed to load DMC firmware i915/glk_dmc_ver1_04.bin. Disabling runtime power management. i915 0000:00:02.0: DMC firmware homepage: https://01.org/linuxgraphics/downloads/firmware and now shows that the firmware has correctly loaded: [drm] Finished loading DMC firmware i915/glk_dmc_ver1_04.bin (v1.4) Cc: stable@vger.kernel.org Signed-off-by: Ian W MORRISON --- drivers/gpu/drm/i915/intel_csr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index 41e6c75a7f3c..f9550ea46c26 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -35,6 +35,7 @@ */ #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin" +MODULE_FIRMWARE(I915_CSR_GLK); #define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4) #define I915_CSR_CNL "i915/cnl_dmc_ver1_07.bin"