Skip to contentSkip to conversation

drm/i915/DMC/KBL: Load DMC on KBL using the no_stepping_info array

PATCH In review Anusha Srivatsa 4 participants 6 messages Oct 25, 2016 – Oct 26, 2016

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

PATCH 1/1 drm/i915/DMC/KBL: Load DMC on KBL using the no_stepping_info array

Currently, for display there is only one DMC image for KBL. Remove the stepping_info table for KBL and use the no_stepping_info array for loading the firmware.

v2: Removed the block of code as pointed out by Rodrigo to make the loads as generic as possible.

---
 drivers/gpu/drm/i915/intel_csr.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +1 -10
index 1ea0e1f..d7a04bc 100644
@@ -168,12 +168,6 @@ struct stepping_info {
 	char substepping;
 };
 
-static const struct stepping_info kbl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-};
-
 static const struct stepping_info skl_stepping_info[] = {
 	{'A', '0'}, {'B', '0'}, {'C', '0'},
 	{'D', '0'}, {'E', '0'}, {'F', '0'},
@@ -194,10 +188,7 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)
 	const struct stepping_info *si;
 	unsigned int size;
 
-	if (IS_KABYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(kbl_stepping_info);
-		si = kbl_stepping_info;
-	} else if (IS_SKYLAKE(dev_priv)) {
+	if (IS_SKYLAKE(dev_priv)) {
 		size = ARRAY_SIZE(skl_stepping_info);
 		si = skl_stepping_info;
 	} else if (IS_BROXTON(dev_priv)) {
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: warning for drm/i915/DMC/KBL: Load DMC on KBL using the no_stepping_info array

== Series Details ==

== Series Details ==

Series: drm/i915/DMC/KBL: Load DMC on KBL using the no_stepping_info array
URL : https://patchwork.freedesktop.org/series/14311/
State : warning

== Summary ==

Series 14311v1 drm/i915/DMC/KBL: Load DMC on KBL using the no_stepping_info array
https://patchwork.freedesktop.org/api/1.0/series/14311/revisions/1/mbox/

Test drv_module_reload_basic:

                skip       -> PASS       (fi-skl-6770hq)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-a-frame-sequence:
                pass       -> DMESG-WARN (fi-ivb-3770)
fi-bdw-5557u     total:246  pass:231  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:246  pass:204  dwarn:0   dfail:0   fail:0   skip:42 
fi-bxt-t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 
fi-byt-j1900     total:246  pass:215  dwarn:0   dfail:0   fail:0   skip:31 
fi-byt-n2820     total:246  pass:211  dwarn:0   dfail:0   fail:0   skip:35 
fi-hsw-4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-ilk-650       total:246  pass:185  dwarn:0   dfail:0   fail:1   skip:60 
fi-ivb-3520m     total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 
fi-ivb-3770      total:246  pass:220  dwarn:1   dfail:0   fail:0   skip:25 
fi-skl-6260u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:246  pass:219  dwarn:4   dfail:0   fail:0   skip:23 
fi-skl-6700k     total:246  pass:222  dwarn:1   dfail:0   fail:0   skip:23 
fi-skl-6770hq    total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:246  pass:209  dwarn:0   dfail:0   fail:0   skip:37 

Results at /Patchwork_2802/

194359e4a31ff988c7a290093820c5ef28d3752b drm-intel-nightly: 2016y-10m-24d-19h-42m-14s UTC integration manifest 5382799 drm/i915/DMC/KBL: Load DMC on KBL using the no_stepping_info array

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Anusha Srivatsa
Quoted 32 lines · Anusha Srivatsa

Currently, for display there is only one DMC image for KBL. Remove the stepping_info table for KBL and use the no_stepping_info array for loading the firmware.

v2: Removed the block of code as pointed out by Rodrigo to make the loads as generic as possible.

---
 drivers/gpu/drm/i915/intel_csr.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +0 -6
index 1ea0e1f..d7a04bc 100644
@@ -168,12 +168,6 @@ struct stepping_info {
 	char substepping;
 };
 
-static const struct stepping_info kbl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-};
-
 static const struct stepping_info skl_stepping_info[] = {
 	{'A', '0'}, {'B', '0'}, {'C', '0'},
 	{'D', '0'}, {'E', '0'}, {'F', '0'},
@@ -194,10 +188,7 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)
 	const struct stepping_info *si;

drivers/gpu/drm/i915/intel_csr.c intel_get_stepping_info(struct drm_i915_private *dev_priv) · line 194

Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +1 -4
 	unsigned int size;
 
-	if (IS_KABYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(kbl_stepping_info);
-		si = kbl_stepping_info;
-	} else if (IS_SKYLAKE(dev_priv)) {
+	if (IS_SKYLAKE(dev_priv)) {
 		size = ARRAY_SIZE(skl_stepping_info);
 		si = skl_stepping_info;
 	} else if (IS_BROXTON(dev_priv)) {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by
#3 lore raw
Quoted 12 lines · Rodrigo
Quoted 9 lines · Anusha Srivatsa

Currently, for display there is only one DMC image for KBL. Remove the stepping_info table for KBL and use the no_stepping_info array for loading the firmware.

v2: Removed the block of code as pointed out by Rodrigo to make the loads as generic as possible.

I assume the goal is to simplify the code. kbl_dmc_ver1_01.bin has indeed only a single *,* entry and I assume it was confirmed that there is no plan to release KBL firmware images in the future with multiple stepping entries. With that this looks ok:

I think it would be good to also emit a warn from the driver if we use no_stepping_info and there are stepping entries in the firmware image other than *,* since then we may end up loading the wrong firmware version.

Quoted 32 lines
Quoted 32 lines

---
 drivers/gpu/drm/i915/intel_csr.c | 11 +----------

 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +0 -0
index 1ea0e1f..d7a04bc 100644
@@ -168,12 +168,6 @@ struct stepping_info {
  	char substepping;
  };

drivers/gpu/drm/i915/intel_csr.c +0 -6
-static const struct stepping_info kbl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-};
-

 static const struct stepping_info skl_stepping_info[] = { {'A', '0'}, {'B', '0'}, {'C', '0'},
  {'D', '0'}, {'E', '0'}, {'F', '0'},

drivers/gpu/drm/i915/intel_csr.c +0 -0
@@ -194,10 +188,7 @@ intel_get_stepping_info(struct
 drm_i915_private *dev_priv)
  	const struct stepping_info *si;
  	unsigned int size;

drivers/gpu/drm/i915/intel_csr.c +1 -4
-	if (IS_KABYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(kbl_stepping_info);
-		si = kbl_stepping_info;
-	} else if (IS_SKYLAKE(dev_priv)) {
+	if (IS_SKYLAKE(dev_priv)) {
Quoted 8 lines
Quoted 3 lines

  size = ARRAY_SIZE(skl_stepping_info); si = skl_stepping_info;
  } else if (IS_BROXTON(dev_priv)) {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#4 lore raw
Quoted 11 lines · Imre Deak
Quoted 10 lines · Rodrigo
Quoted 7 lines · Anusha Srivatsa

Currently, for display there is only one DMC image for KBL. Remove the stepping_info table for KBL and use the no_stepping_info array for loading the firmware.

v2: Removed the block of code as pointed out by Rodrigo to make the loads as generic as possible.

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines

I assume the goal is to simplify the code. kbl_dmc_ver1_01.bin has indeed only a single *,* entry and I assume it was confirmed that there is no plan to release KBL firmware images in the future with multiple stepping entries. With that this looks ok:

That is the case.

Quoted 1 line

Thanks.

Quoted 5 lines

I think it would be good to also emit a warn from the driver if we use no_stepping_info and there are stepping entries in the firmware image other than *,* since then we may end up loading the wrong firmware version.

yeap, this seems a good idea. a conservative approach. although, along with the confirmation we got the promise that this kind of information would be now on in the official release notes we receive along with the binary images.

Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
---
 drivers/gpu/drm/i915/intel_csr.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +0 -6
index 1ea0e1f..d7a04bc 100644
@@ -168,12 +168,6 @@ struct stepping_info {
 	char substepping;
 };
 
-static const struct stepping_info kbl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-};
-
 static const struct stepping_info skl_stepping_info[] = {
 	{'A', '0'}, {'B', '0'}, {'C', '0'},
 	{'D', '0'}, {'E', '0'}, {'F', '0'},
@@ -194,10 +188,7 @@ intel_get_stepping_info(struct
 drm_i915_private *dev_priv)
 	const struct stepping_info *si;
 	unsigned int size;
 
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_csr.c +1 -4
-	if (IS_KABYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(kbl_stepping_info);
-		si = kbl_stepping_info;
-	} else if (IS_SKYLAKE(dev_priv)) {
+	if (IS_SKYLAKE(dev_priv)) {
Quoted 8 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_csr.c +0 -0
 		size = ARRAY_SIZE(skl_stepping_info);
 		si = skl_stepping_info;

} else if (IS_BROXTON(dev_priv)) {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#5 lore raw

Patch merged to dinq. Thanks for the patch and thanks for the ack.

Quoted 32 lines · Rodrigo Vivi
Quoted 11 lines · Imre Deak
Quoted 10 lines · Rodrigo
Quoted 7 lines · Anusha Srivatsa

Currently, for display there is only one DMC image for KBL. Remove the stepping_info table for KBL and use the no_stepping_info array for loading the firmware.

v2: Removed the block of code as pointed out by Rodrigo to make the loads as generic as possible.

Quoted 7 lines
Quoted 2 lines
Quoted 2 lines

I assume the goal is to simplify the code. kbl_dmc_ver1_01.bin has indeed only a single *,* entry and I assume it was confirmed that there is no plan to release KBL firmware images in the future with multiple stepping entries. With that this looks ok:

That is the case.

Quoted 1 line

Thanks.

Quoted 5 lines

I think it would be good to also emit a warn from the driver if we use no_stepping_info and there are stepping entries in the firmware image other than *,* since then we may end up loading the wrong firmware version.

Quoted 48 lines

yeap, this seems a good idea. a conservative approach. although, along with the confirmation we got the promise that this kind of information would be now on in the official release notes we receive along with the binary images.

Quoted 41 lines
Quoted 41 lines
Quoted 35 lines
---
 drivers/gpu/drm/i915/intel_csr.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +1 -10
index 1ea0e1f..d7a04bc 100644
@@ -168,12 +168,6 @@ struct stepping_info {
 	char substepping;
 };
 
-static const struct stepping_info kbl_stepping_info[] = {
-	{'A', '0'}, {'B', '0'}, {'C', '0'},
-	{'D', '0'}, {'E', '0'}, {'F', '0'},
-	{'G', '0'}, {'H', '0'}, {'I', '0'},
-};
-
 static const struct stepping_info skl_stepping_info[] = {
 	{'A', '0'}, {'B', '0'}, {'C', '0'},
 	{'D', '0'}, {'E', '0'}, {'F', '0'},
@@ -194,10 +188,7 @@ intel_get_stepping_info(struct
 drm_i915_private *dev_priv)
 	const struct stepping_info *si;
 	unsigned int size;
 
-	if (IS_KABYLAKE(dev_priv)) {
-		size = ARRAY_SIZE(kbl_stepping_info);
-		si = kbl_stepping_info;
-	} else if (IS_SKYLAKE(dev_priv)) {
+	if (IS_SKYLAKE(dev_priv)) {
 		size = ARRAY_SIZE(skl_stepping_info);
 		si = skl_stepping_info;
Quoted 1 line

} else if (IS_BROXTON(dev_priv)) {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx