diff mbox

[Yakkety,SRU] UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware

Message ID 1483535851-91489-1-git-send-email-seth.forshee@canonical.com
State New
Headers show

Commit Message

Seth Forshee Jan. 4, 2017, 1:17 p.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1626740

Intel has added MODULE_FIRMWARE statements to i915 which refer to
firmware files that they have not yet pushed out to upstream
linux-firmware. This causes the following warnings when
generating the initrd:

 W: Possible missing firmware /lib/firmware/i915/kbl_guc_ver9_14.bin for module i915
 W: Possible missing firmware /lib/firmware/i915/bxt_guc_ver8_7.bin for module i915

This firmware is clearly optional, and the warnings have been
generating a lot of confusion for users. Remove the offending
MODULE_FIRMWARE statements until Intel makes these files
available.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Tim Gardner Jan. 4, 2017, 1:33 p.m. UTC | #1

Thadeu Lima de Souza Cascardo Jan. 4, 2017, 1:58 p.m. UTC | #2
ACK.
Luis Henriques Jan. 6, 2017, 6:26 p.m. UTC | #3
Applied to yakkety master-next branch.

Cheers,
--
Luís
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 605c69658d2c..54a726fc5048 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -63,10 +63,8 @@ 
 MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 
 #define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"
-MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 
 #define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9_14.bin"
-MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
 /* User-friendly representation of an enum */
 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)