| Message ID | bcfde15c062bdefa8b2425bf1c846016349d8b12.1525979107.git.joseph.salisbury@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,Bionic,1/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware" | expand |
On 05/11/18 18:20, Joseph Salisbury wrote: > BugLink: http://bugs.launchpad.net/bugs/1728238 > > This reverts commit dc0f16f9b5084e6be2b8c79f8c6cd499a3451791. > > This firmware was optional when the MODULE_FIRMWARE statements were > removed. The firmware is now available, so these statements need to be > added back. > > Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > drivers/gpu/drm/i915/intel_guc_fw.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c > index fdbe3de..cd05bde 100644 > --- a/drivers/gpu/drm/i915/intel_guc_fw.c > +++ b/drivers/gpu/drm/i915/intel_guc_fw.c > @@ -46,8 +46,10 @@ > MODULE_FIRMWARE(I915_SKL_GUC_UCODE); > > #define I915_BXT_GUC_UCODE GUC_FW_PATH(bxt, BXT_FW_MAJOR, BXT_FW_MINOR) > +MODULE_FIRMWARE(I915_BXT_GUC_UCODE); > > #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR) > +MODULE_FIRMWARE(I915_KBL_GUC_UCODE); > > /** > * intel_guc_fw_select() - selects GuC firmware for uploading >
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c index fdbe3de..cd05bde 100644 --- a/drivers/gpu/drm/i915/intel_guc_fw.c +++ b/drivers/gpu/drm/i915/intel_guc_fw.c @@ -46,8 +46,10 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE); #define I915_BXT_GUC_UCODE GUC_FW_PATH(bxt, BXT_FW_MAJOR, BXT_FW_MINOR) +MODULE_FIRMWARE(I915_BXT_GUC_UCODE); #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR) +MODULE_FIRMWARE(I915_KBL_GUC_UCODE); /** * intel_guc_fw_select() - selects GuC firmware for uploading
BugLink: http://bugs.launchpad.net/bugs/1728238 This reverts commit dc0f16f9b5084e6be2b8c79f8c6cd499a3451791. This firmware was optional when the MODULE_FIRMWARE statements were removed. The firmware is now available, so these statements need to be added back. Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com> --- drivers/gpu/drm/i915/intel_guc_fw.c | 2 ++ 1 file changed, 2 insertions(+)