Skip to contentSkip to conversation

drm/amdgpu: update SMC firmware image for polaris10 variants

PATCH In review Junwei Zhang 3 participants 6 messages Dec 7, 2018 – Dec 11, 2018 4 messages not in the archive

Subsystems (2)
DRM drivers Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Junwei Zhang

author
#0 lore raw

PATCH 1/2 drm/amdgpu: update SMC firmware image for polaris10 variants

Some new variants require different firmwares.

Signed-off-by Junwei Zhang <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +2 -1
index ceadeeadfa56..387f1cf1dc20 100644
@@ -381,7 +381,8 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
 					      (adev->pdev->revision == 0xe7) ||
 					      (adev->pdev->revision == 0xef))) ||
 					    ((adev->pdev->device == 0x6fdf) &&
-					     (adev->pdev->revision == 0xef))) {
+					     ((adev->pdev->revision == 0xef) ||
+					      (adev->pdev->revision == 0xff)))) {
 						info->is_kicker = true;
 						strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");
 					} else if ((adev->pdev->device == 0x67df) &&
Signature · 6 lines
2.17.1

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#2 lore raw

PATCH 2/2 drm/amdgpu: update MC firmware image for polaris10 variants

Some new variants require different firmwares.

Signed-off-by Junwei Zhang <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -1
index 1ad7e6b8ed1d..0edb8622f666 100644
@@ -244,7 +244,10 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
 	case CHIP_POLARIS10:
 		if ((adev->pdev->device == 0x67df) &&
 		    ((adev->pdev->revision == 0xe1) ||
-		     (adev->pdev->revision == 0xf7)))
+		     (adev->pdev->revision == 0xf7)) ||
+		    ((adev->pdev->device == 0x6fdf) &&
+		     ((adev->pdev->revision == 0xef) ||
+		      (adev->pdev->revision == 0xff))))
 			chip_name = "polaris10_k";
 		else
 			chip_name = "polaris10";
Signature · 6 lines
2.17.1

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

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#4 lore raw

Re: [PATCH 2/2] drm/amdgpu: update MC firmware image for polaris10 variants

we can drop MC update patch, since a new fw could fix that.

Regards,
Jerry

Quoted 13 lines · Junwei Zhang

Some new variants require different firmwares.

Signed-off-by Junwei Zhang <[email protected]>
---
  drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0 -0
index 1ad7e6b8ed1d..0edb8622f666 100644
@@ -244,7 +244,10 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
  	case CHIP_POLARIS10:

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) · line 253

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -1
  		if ((adev->pdev->device == 0x67df) &&
  		    ((adev->pdev->revision == 0xe1) ||
-		     (adev->pdev->revision == 0xf7)))
+		     (adev->pdev->revision == 0xf7)) ||
+		    ((adev->pdev->device == 0x6fdf) &&
+		     ((adev->pdev->revision == 0xef) ||
+		      (adev->pdev->revision == 0xff))))
  			chip_name = "polaris10_k";
  		else
  			chip_name = "polaris10";

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

A message that is not in the archive (sent off-list or not yet received): 4c84b377-2ec4-1470-90d9-2b642088c1db-5C7GfCeVMHo@public.gmane.org

#6 lore raw

Re: [PATCH 2/2] drm/amdgpu: update MC firmware image for polaris10 variants

Quoted 2 lines · Jerry(Junwei)

we can drop MC update patch, since a new fw could fix that.

Shouldn't we apply this as well for consistency?

Alex

Quoted 25 lines

Regards,
Jerry

Quoted 20 lines · Junwei Zhang

Some new variants require different firmwares.

Signed-off-by Junwei Zhang <[email protected]>
---
  drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -1
index 1ad7e6b8ed1d..0edb8622f666 100644
@@ -244,7 +244,10 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
      case CHIP_POLARIS10:
              if ((adev->pdev->device == 0x67df) &&
                  ((adev->pdev->revision == 0xe1) ||
-                  (adev->pdev->revision == 0xf7)))
+                  (adev->pdev->revision == 0xf7)) ||
+                 ((adev->pdev->device == 0x6fdf) &&
+                  ((adev->pdev->revision == 0xef) ||
+                   (adev->pdev->revision == 0xff))))
Quoted 8 lines

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) · line 253

Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0 -0
                      chip_name = "polaris10_k";
              else
                      chip_name = "polaris10";

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

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

A message that is not in the archive (sent off-list or not yet received): CADnq5_MuFn07Dw_2DFcMrVXj-N46vrnszqi3pzg1mYeBz6EJNw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

author
#8 lore raw

Re: [PATCH 2/2] drm/amdgpu: update MC firmware image for polaris10 variants

Quoted 3 lines · Alex Deucher
Quoted 1 line · Jerry(Junwei)

we can drop MC update patch, since a new fw could fix that.

Shouldn't we apply this as well for consistency?

I did apply it for simple test.
That looks no harm.

But confirmed the MC firmware version table, it shares the same MC as P10. So I drop this patch now.

That means not every variant uses a newer MC firmware, as I could see now.

Regards,
Jerry

Quoted 34 lines

Alex

Quoted 31 lines

Regards,
Jerry

Quoted 13 lines · Junwei Zhang

Some new variants require different firmwares.

Signed-off-by Junwei Zhang <[email protected]>
---
   drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
   1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0 -0
index 1ad7e6b8ed1d..0edb8622f666 100644
@@ -244,7 +244,10 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
       case CHIP_POLARIS10:

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int gmc_v8_0_init_microcode(struct amdgpu_device *adev) · line 253

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +4 -1
               if ((adev->pdev->device == 0x67df) &&
                   ((adev->pdev->revision == 0xe1) ||
-                  (adev->pdev->revision == 0xf7)))
+                  (adev->pdev->revision == 0xf7)) ||
+                 ((adev->pdev->device == 0x6fdf) &&
+                  ((adev->pdev->revision == 0xef) ||
+                   (adev->pdev->revision == 0xff))))
                       chip_name = "polaris10_k";
               else
                       chip_name = "polaris10";

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

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

Reviewed-by
#9 lore raw
In reply to a message not in the archive

Series is:

Reviewed-by Alex Deucher <[email protected]>

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Junwei Zhang <[email protected]>
Sent: Friday, December 7, 2018 2:19:51 AM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 1/2] drm/amdgpu: update SMC firmware image for polaris10 variants

Some new variants require different firmwares.

Signed-off-by Junwei Zhang <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +2 -1
index ceadeeadfa56..387f1cf1dc20 100644
@@ -381,7 +381,8 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                               (adev->pdev->revision == 0xe7) ||
                                               (adev->pdev->revision == 0xef))) ||
                                             ((adev->pdev->device == 0x6fdf) &&
-                                            (adev->pdev->revision == 0xef))) {
+                                            ((adev->pdev->revision == 0xef) ||
+                                             (adev->pdev->revision == 0xff)))) {
                                                 info->is_kicker = true;
                                                 strcpy(fw_name, "amdgpu/polaris10_k_smc.bin");
                                         } else if ((adev->pdev->device == 0x67df) &&

--
2.17.1

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

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