[SRU][Bionic][PATCH 0/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][Bionic][PATCH 0/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

Joseph Salisbury-3
BugLink: http://bugs.launchpad.net/bugs/1728238

== SRU Justification ==
This firmware was optional when the MODULE_FIRMWARE statements were
removed in bug 1626740 by Bionic commit dc0f16f9b50.  The firmware is now
available and in use, so these statements need to be added back.

Without these statements, The i915 Kabylake GuC firmware is failing to load
on boot, and generating dmesg errors.

== Fix ==
Revert Bionic commit dc0f16f9b5084e6be2b8c79f8c6cd499a3451791.

== Regression Potential ==
Low.  Adding a statement back that was removed by a SAUCE patch.

== Test Case ==
A test kernel was built with this patch and tested by the original bug reporter.
The bug reporter states the test kernel resolved the bug.

Joseph Salisbury (1):
  Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements
    for unreleased firmware"

 drivers/gpu/drm/i915/intel_guc_fw.c | 2 ++
 1 file changed, 2 insertions(+)

--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[SRU][Bionic][PATCH 1/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

Joseph Salisbury-3
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 <[hidden email]>
---
 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
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][Bionic][PATCH 1/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

Kleber Souza
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 <[hidden email]>

Acked-by: Kleber Sacilotto de Souza <[hidden email]>

> ---
>  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
>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [SRU][Bionic][PATCH 0/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

Khalid Elmously
In reply to this post by Joseph Salisbury-3
On 2018-05-11 12:20:11 , Joseph Salisbury wrote:

> BugLink: http://bugs.launchpad.net/bugs/1728238
>
> == SRU Justification ==
> This firmware was optional when the MODULE_FIRMWARE statements were
> removed in bug 1626740 by Bionic commit dc0f16f9b50.  The firmware is now
> available and in use, so these statements need to be added back.
>
> Without these statements, The i915 Kabylake GuC firmware is failing to load
> on boot, and generating dmesg errors.
>
> == Fix ==
> Revert Bionic commit dc0f16f9b5084e6be2b8c79f8c6cd499a3451791.
>
> == Regression Potential ==
> Low.  Adding a statement back that was removed by a SAUCE patch.
>
> == Test Case ==
> A test kernel was built with this patch and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.
>
> Joseph Salisbury (1):
>   Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements
>     for unreleased firmware"
>
>  drivers/gpu/drm/i915/intel_guc_fw.c | 2 ++
>  1 file changed, 2 insertions(+)
>
Acked-by: Khalid Elmously <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [SRU][Bionic][PATCH 0/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

Khalid Elmously
In reply to this post by Joseph Salisbury-3
Applied to B

On 2018-05-11 12:20:11 , Joseph Salisbury wrote:

> BugLink: http://bugs.launchpad.net/bugs/1728238
>
> == SRU Justification ==
> This firmware was optional when the MODULE_FIRMWARE statements were
> removed in bug 1626740 by Bionic commit dc0f16f9b50.  The firmware is now
> available and in use, so these statements need to be added back.
>
> Without these statements, The i915 Kabylake GuC firmware is failing to load
> on boot, and generating dmesg errors.
>
> == Fix ==
> Revert Bionic commit dc0f16f9b5084e6be2b8c79f8c6cd499a3451791.
>
> == Regression Potential ==
> Low.  Adding a statement back that was removed by a SAUCE patch.
>
> == Test Case ==
> A test kernel was built with this patch and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.
>
> Joseph Salisbury (1):
>   Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements
>     for unreleased firmware"
>
>  drivers/gpu/drm/i915/intel_guc_fw.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> --
> 2.7.4
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED[unstable]: [SRU][Bionic][PATCH 0/1] Revert "UBUNTU: SAUCE: (no-up) i915: Remove MODULE_FIRMWARE statements for unreleased firmware"

Seth Forshee
In reply to this post by Joseph Salisbury-3
On Fri, May 11, 2018 at 12:20:11PM -0400, Joseph Salisbury wrote:

> BugLink: http://bugs.launchpad.net/bugs/1728238
>
> == SRU Justification ==
> This firmware was optional when the MODULE_FIRMWARE statements were
> removed in bug 1626740 by Bionic commit dc0f16f9b50.  The firmware is now
> available and in use, so these statements need to be added back.
>
> Without these statements, The i915 Kabylake GuC firmware is failing to load
> on boot, and generating dmesg errors.
>
> == Fix ==
> Revert Bionic commit dc0f16f9b5084e6be2b8c79f8c6cd499a3451791.
>
> == Regression Potential ==
> Low.  Adding a statement back that was removed by a SAUCE patch.
>
> == Test Case ==
> A test kernel was built with this patch and tested by the original bug reporter.
> The bug reporter states the test kernel resolved the bug.

Applied to unstable/master, thanks!

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team