From patchwork Fri Apr 13 21:01:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 898105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40N9Dv75kfz9ryk; Sat, 14 Apr 2018 07:01:35 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1f75oz-0003m5-KP; Fri, 13 Apr 2018 21:01:25 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1f75oy-0003lo-Jc for kernel-team@lists.ubuntu.com; Fri, 13 Apr 2018 21:01:24 +0000 Received: from mail-io0-f200.google.com ([209.85.223.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1f75oy-0000Nn-8i for kernel-team@lists.ubuntu.com; Fri, 13 Apr 2018 21:01:24 +0000 Received: by mail-io0-f200.google.com with SMTP id x7so8602729iob.21 for ; Fri, 13 Apr 2018 14:01:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=m5EuJDNyzLbgX1eOGkqiP32Nf9B7UNWSAuEb4cZPxts=; b=OGZKuauhpUki8ses7y94SdRrh43j5dp8ZBbpgAmICPMiwDUyJneJm0VyR3ienNI8K8 9hK8KIgu8VmzC5BvQFqrMIAhnEJmu8dUkh3gU18PMwHwHJ/uSGBRzp3OYj1j2unmOi2P lPE0CbbX9WZAiZcp+q5gXcG0jIp6AFhu8cxc5QnVS0JejYieZ4UdtFRSMneQd/TKJYp7 wnru8NX3eugRFH5+gMxh5cWBFk/Gia90Yndcvf/QRICWpDnKO5VpY1o3TTTxW+yOYT7y YLpw8lIS5+eAAwbOSb1Wm6bfz2GKcBg0RpUbRnW50LbkCUoCZa1jCUwO8z0ybULprU4k JguA== X-Gm-Message-State: ALQs6tBgRASFOxrrAZE5w2/uEIAQOo/U1ZLL7PnEjhYjewjj8XqAaFZw zh8Ggc921HoLvo0EJ3tF1ptu/vcvheJ+yYTLSDgfUemQkXNh8MP+tqhDjcnR3IUe1kqDfC8rKDM JK+IgdL+p6kuSM32Iq1rIMvxXYgyqw8W4Il4Yr9/tXQ== X-Received: by 2002:a24:11:: with SMTP id 17-v6mr7018036ita.111.1523653281897; Fri, 13 Apr 2018 14:01:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx486U11uehMci9VxxCwrNFBLhDUAJAcQZmUVU9MjPga/qDpCgycgvk4voTu6ty13p8/V0x+3lA== X-Received: by 2002:a24:11:: with SMTP id 17-v6mr7018014ita.111.1523653281663; Fri, 13 Apr 2018 14:01:21 -0700 (PDT) Received: from localhost ([2605:a601:ac6:1720:e547:b48d:257f:7b61]) by smtp.gmail.com with ESMTPSA id l16-v6sm1442385iti.18.2018.04.13.14.01.20 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Apr 2018 14:01:20 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH] UBUNTU: SAUCE: drm/i915/glk: Add MODULE_FIRMWARE for Geminilake's DMC Date: Fri, 13 Apr 2018 16:01:19 -0500 Message-Id: <20180413210119.27661-1-seth.forshee@canonical.com> X-Mailer: git-send-email 2.15.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: http://bugs.launchpad.net/bugs/1760545 The firmware is available in linux-firmware now, so add back the MODULE_FIRMWARE statement. Signed-off-by: Seth Forshee --- Will also submit this patch upstream. 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 da9de47562b8..f9ee56fdf3ab 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_04.bin"