Skip to contentSkip to conversation

drm/i915/skl: Fix DMC load on Skylake J0 and K0

stable backport request Jani Nikula 3 participants 5 messages Apr 25, 2016 – May 8, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Stable team, please backport

commit a41c8882592fb80458959b10e37632ce030b68ca

Author: Mat Martineau <[email protected]>
Date:   Thu Jan 28 15:19:23 2016 -0800

drm/i915/skl: Fix DMC load on Skylake J0 and K0

to v4.3 and later.

BR,
Jani.

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
maintainer
#1 lore raw
Quoted 10 lines · Jani Nikula

Stable team, please backport

commit a41c8882592fb80458959b10e37632ce030b68ca

Author: Mat Martineau <[email protected]>
Date:   Thu Jan 28 15:19:23 2016 -0800

drm/i915/skl: Fix DMC load on Skylake J0 and K0

to v4.3 and later.

Does not apply to 4.4-stable, can you provide a backported version?

thanks,

greg k-h

Reviewed-by Rodrigo Vivi
#2 lore raw

Re: [stable backport request] drm/i915/skl: Fix DMC load on Skylake J0 and K0 [v4.4]

Quoted 8 lines · Greg KH
Quoted 7 lines · Jani Nikula

Stable team, please backport

commit a41c8882592fb80458959b10e37632ce030b68ca

Author: Mat Martineau <[email protected]>
Date:   Thu Jan 28 15:19:23 2016 -0800
Quoted 5 lines
Quoted 3 lines

drm/i915/skl: Fix DMC load on Skylake J0 and K0

to v4.3 and later.

Does not apply to 4.4-stable, can you provide a backported version?

Here's a backported patch for 4.4-stable. It will not apply to 4.3-stable, I will send a 4.3 backport in a separate email.

------------------

From: Mat Martineau <[email protected]>

commit a41c8882592fb80458959b10e37632ce030b68ca upstream.

The driver does not load firmware for unknown steppings, so these new steppings must be added to the list.

---
 drivers/gpu/drm/i915/intel_csr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_csr.c +2 -1
index 9e530a7..fc28c51 100644
@@ -180,7 +180,8 @@ struct stepping_info {
 static const struct stepping_info skl_stepping_info[] = {
 		{'A', '0'}, {'B', '0'}, {'C', '0'},
 		{'D', '0'}, {'E', '0'}, {'F', '0'},
-		{'G', '0'}, {'H', '0'}, {'I', '0'}
+		{'G', '0'}, {'H', '0'}, {'I', '0'},
+		{'J', '0'}, {'K', '0'}
 };
 
 static struct stepping_info bxt_stepping_info[] = {
maintainer
#3 lore raw

Re: [stable backport request] drm/i915/skl: Fix DMC load on Skylake J0 and K0 [v4.4]

Quoted 11 lines · Mat Martineau
Quoted 8 lines · Greg KH
Quoted 7 lines · Jani Nikula

Stable team, please backport

commit a41c8882592fb80458959b10e37632ce030b68ca

Author: Mat Martineau <[email protected]>
Date:   Thu Jan 28 15:19:23 2016 -0800
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

drm/i915/skl: Fix DMC load on Skylake J0 and K0

to v4.3 and later.

Does not apply to 4.4-stable, can you provide a backported version?

Here's a backported patch for 4.4-stable. It will not apply to 4.3-stable, I will send a 4.3 backport in a separate email.

Thanks, now applied.

greg k-h

Reviewed-by Rodrigo Vivi
#4 lore raw

Re: [stable backport request] drm/i915/skl: Fix DMC load on Skylake J0 and K0 [v4.3]

In reply to Greg KH
Quoted 8 lines · Greg KH
Quoted 7 lines · Jani Nikula

Stable team, please backport

commit a41c8882592fb80458959b10e37632ce030b68ca

Author: Mat Martineau <[email protected]>
Date:   Thu Jan 28 15:19:23 2016 -0800
Quoted 5 lines
Quoted 3 lines

drm/i915/skl: Fix DMC load on Skylake J0 and K0

to v4.3 and later.

Does not apply to 4.4-stable, can you provide a backported version?

v4.3 backport

------------------

From: Mat Martineau <[email protected]>

commit a41c8882592fb80458959b10e37632ce030b68ca upstream.

The driver does not load firmware for unknown steppings, so these new steppings must be added to the list.

---
 drivers/gpu/drm/i915/intel_csr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_csr.c +2 -1
index d0f1b8d..de1349d 100644
@@ -178,7 +178,8 @@ struct stepping_info {
 static const struct stepping_info skl_stepping_info[] = {
 		{'A', '0'}, {'B', '0'}, {'C', '0'},
 		{'D', '0'}, {'E', '0'}, {'F', '0'},
-		{'G', '0'}, {'H', '0'}, {'I', '0'}
+		{'G', '0'}, {'H', '0'}, {'I', '0'},
+		{'J', '0'}, {'K', '0'}
 };
 
 static char intel_get_stepping(struct drm_device *dev)