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

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

[Junwei Zhang]

Some new variants require different firmwares.

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index ceadeeadfa56..387f1cf1dc20 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Junwei Zhang]

Some new variants require different firmwares.

Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
index 1ad7e6b8ed1d..0edb8622f666 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
@@ -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";
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Zhang, Jerry(Junwei)]

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

Regards,
Jerry

On 12/7/18 3:19 PM, Junwei Zhang wrote:
> Some new variants require different firmwares.
>
> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index 1ad7e6b8ed1d..0edb8622f666 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -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";

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Alex Deucher]

On Fri, Dec 7, 2018 at 3:40 AM Zhang, Jerry(Junwei) <Jerry.Zhang@amd.com> wrote:
>
> we can drop MC update patch, since a new fw could fix that.

Shouldn't we apply this as well for consistency?

Alex

>
> Regards,
> Jerry
>
> On 12/7/18 3:19 PM, Junwei Zhang wrote:
> > Some new variants require different firmwares.
> >
> > Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
> > ---
> >   drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
> >   1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> > index 1ad7e6b8ed1d..0edb8622f666 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> > @@ -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";
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Zhang, Jerry(Junwei)]

On 12/11/18 4:06 AM, Alex Deucher wrote:
> On Fri, Dec 7, 2018 at 3:40 AM Zhang, Jerry(Junwei) <Jerry.Zhang@amd.com> wrote:
>> 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

>
> Alex
>
>> Regards,
>> Jerry
>>
>> On 12/7/18 3:19 PM, Junwei Zhang wrote:
>>> Some new variants require different firmwares.
>>>
>>> Signed-off-by: Junwei Zhang <Jerry.Zhang@amd.com>
>>> ---
>>>    drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 5 ++++-
>>>    1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
>>> index 1ad7e6b8ed1d..0edb8622f666 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
>>> @@ -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";
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

[Deucher, Alexander]

[-- Attachment #1.1: Type: text/plain, Size: 1988 bytes --]

Series is:

Reviewed-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Junwei Zhang <Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
Sent: Friday, December 7, 2018 2:19:51 AM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
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 <Jerry.Zhang-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index ceadeeadfa56..387f1cf1dc20 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -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
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[-- Attachment #1.2: Type: text/html, Size: 5090 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx