amd-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
@ 2019-11-08 21:57 Bhawanpreet Lakha
  2019-11-08 21:57 ` Bhawanpreet Lakha
       [not found] ` <20191108215721.13316-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 2 replies; 8+ messages in thread
From: Bhawanpreet Lakha @ 2019-11-08 21:57 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Bhawanpreet Lakha

load the ta firmware for navi10/12/14.
This is already being done for raven/picasso and
is needed for supporting hdcp on navi

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index ffeaa2f5588d..daf11be5416f 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
 	case CHIP_NAVI10:
 	case CHIP_NAVI14:
 	case CHIP_NAVI12:
+		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
+		err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
+		if (err) {
+			release_firmware(adev->psp.ta_fw);
+			adev->psp.ta_fw = NULL;
+			dev_info(adev->dev,
+				 "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
+		} else {
+			err = amdgpu_ucode_validate(adev->psp.ta_fw);
+			if (err)
+				goto out2;
+
+			ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
+			adev->psp.ta_hdcp_ucode_version = le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
+			adev->psp.ta_hdcp_ucode_size = le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
+			adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
+				le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
+
+			adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
+
+			adev->psp.ta_dtm_ucode_version = le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
+			adev->psp.ta_dtm_ucode_size = le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
+			adev->psp.ta_dtm_start_addr = (uint8_t *)adev->psp.ta_hdcp_start_addr +
+				le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
+		}
 		break;
 	default:
 		BUG();
-- 
2.17.1

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
  2019-11-08 21:57 [PATCH] drm/amd/display: Load TA firmware for navi10/12/14 Bhawanpreet Lakha
@ 2019-11-08 21:57 ` Bhawanpreet Lakha
       [not found] ` <20191108215721.13316-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
  1 sibling, 0 replies; 8+ messages in thread
From: Bhawanpreet Lakha @ 2019-11-08 21:57 UTC (permalink / raw)
  To: amd-gfx; +Cc: Bhawanpreet Lakha

load the ta firmware for navi10/12/14.
This is already being done for raven/picasso and
is needed for supporting hdcp on navi

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index ffeaa2f5588d..daf11be5416f 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
 	case CHIP_NAVI10:
 	case CHIP_NAVI14:
 	case CHIP_NAVI12:
+		snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
+		err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
+		if (err) {
+			release_firmware(adev->psp.ta_fw);
+			adev->psp.ta_fw = NULL;
+			dev_info(adev->dev,
+				 "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
+		} else {
+			err = amdgpu_ucode_validate(adev->psp.ta_fw);
+			if (err)
+				goto out2;
+
+			ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
+			adev->psp.ta_hdcp_ucode_version = le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
+			adev->psp.ta_hdcp_ucode_size = le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
+			adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
+				le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
+
+			adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
+
+			adev->psp.ta_dtm_ucode_version = le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
+			adev->psp.ta_dtm_ucode_size = le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
+			adev->psp.ta_dtm_start_addr = (uint8_t *)adev->psp.ta_hdcp_start_addr +
+				le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
+		}
 		break;
 	default:
 		BUG();
-- 
2.17.1

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
       [not found] ` <20191108215721.13316-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
@ 2019-11-08 22:01   ` Deucher, Alexander
  2019-11-08 22:01     ` Deucher, Alexander
       [not found]     ` <DM5PR12MB1820C10A42B4FFC83A093710F77B0-2J9CzHegvk8qWyLXlBb1HgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
  0 siblings, 2 replies; 8+ messages in thread
From: Deucher, Alexander @ 2019-11-08 22:01 UTC (permalink / raw)
  To: Lakha, Bhawanpreet, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW


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

Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
Sent: Friday, November 8, 2019 4:57 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org <amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Cc: Lakha, Bhawanpreet <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14

load the ta firmware for navi10/12/14.
This is already being done for raven/picasso and
is needed for supporting hdcp on navi

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index ffeaa2f5588d..daf11be5416f 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
         case CHIP_NAVI10:
         case CHIP_NAVI14:
         case CHIP_NAVI12:
+               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
+               err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
+               if (err) {
+                       release_firmware(adev->psp.ta_fw);
+                       adev->psp.ta_fw = NULL;
+                       dev_info(adev->dev,
+                                "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
+               } else {
+                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
+                       if (err)
+                               goto out2;
+
+                       ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
+                       adev->psp.ta_hdcp_ucode_version = le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
+                       adev->psp.ta_hdcp_ucode_size = le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
+                       adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
+                               le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
+
+                       adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
+
+                       adev->psp.ta_dtm_ucode_version = le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
+                       adev->psp.ta_dtm_ucode_size = le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
+                       adev->psp.ta_dtm_start_addr = (uint8_t *)adev->psp.ta_hdcp_start_addr +
+                               le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
+               }
                 break;
         default:
                 BUG();
--
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: 7194 bytes --]

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

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
  2019-11-08 22:01   ` Deucher, Alexander
@ 2019-11-08 22:01     ` Deucher, Alexander
       [not found]     ` <DM5PR12MB1820C10A42B4FFC83A093710F77B0-2J9CzHegvk8qWyLXlBb1HgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
  1 sibling, 0 replies; 8+ messages in thread
From: Deucher, Alexander @ 2019-11-08 22:01 UTC (permalink / raw)
  To: Lakha, Bhawanpreet, amd-gfx


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

Acked-by: Alex Deucher <alexander.deucher@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Sent: Friday, November 8, 2019 4:57 PM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>
Subject: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14

load the ta firmware for navi10/12/14.
This is already being done for raven/picasso and
is needed for supporting hdcp on navi

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index ffeaa2f5588d..daf11be5416f 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
         case CHIP_NAVI10:
         case CHIP_NAVI14:
         case CHIP_NAVI12:
+               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
+               err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
+               if (err) {
+                       release_firmware(adev->psp.ta_fw);
+                       adev->psp.ta_fw = NULL;
+                       dev_info(adev->dev,
+                                "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
+               } else {
+                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
+                       if (err)
+                               goto out2;
+
+                       ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
+                       adev->psp.ta_hdcp_ucode_version = le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
+                       adev->psp.ta_hdcp_ucode_size = le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
+                       adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
+                               le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
+
+                       adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
+
+                       adev->psp.ta_dtm_ucode_version = le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
+                       adev->psp.ta_dtm_ucode_size = le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
+                       adev->psp.ta_dtm_start_addr = (uint8_t *)adev->psp.ta_hdcp_start_addr +
+                               le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
+               }
                 break;
         default:
                 BUG();
--
2.17.1

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

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

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

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
       [not found]     ` <DM5PR12MB1820C10A42B4FFC83A093710F77B0-2J9CzHegvk8qWyLXlBb1HgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
@ 2019-11-28 20:20       ` Bhawanpreet Lakha
  2019-11-28 20:20         ` Bhawanpreet Lakha
       [not found]         ` <e883aa84-0a91-d562-3501-927cba50f61d-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 2 replies; 8+ messages in thread
From: Bhawanpreet Lakha @ 2019-11-28 20:20 UTC (permalink / raw)
  To: Deucher, Alexander, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
	Wentland, Harry


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

Hey Harry can you please take a look thanks

On 2019-11-08 5:01 p.m., Deucher, Alexander wrote:
> Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
> ------------------------------------------------------------------------
> *From:* amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of 
> Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
> *Sent:* Friday, November 8, 2019 4:57 PM
> *To:* amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org <amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
> *Cc:* Lakha, Bhawanpreet <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
> *Subject:* [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
> load the ta firmware for navi10/12/14.
> This is already being done for raven/picasso and
> is needed for supporting hdcp on navi
>
> Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
> ---
>  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c 
> b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index ffeaa2f5588d..daf11be5416f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct 
> psp_context *psp)
>          case CHIP_NAVI10:
>          case CHIP_NAVI14:
>          case CHIP_NAVI12:
> +               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", 
> chip_name);
> +               err = request_firmware(&adev->psp.ta_fw, fw_name, 
> adev->dev);
> +               if (err) {
> + release_firmware(adev->psp.ta_fw);
> +                       adev->psp.ta_fw = NULL;
> +                       dev_info(adev->dev,
> +                                "psp v11.0: Failed to load firmware 
> \"%s\"\n", fw_name);
> +               } else {
> +                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
> +                       if (err)
> +                               goto out2;
> +
> +                       ta_hdr = (const struct ta_firmware_header_v1_0 
> *)adev->psp.ta_fw->data;
> +                       adev->psp.ta_hdcp_ucode_version = 
> le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
> +                       adev->psp.ta_hdcp_ucode_size = 
> le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
> +                       adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
> + le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
> +
> +                       adev->psp.ta_fw_version = 
> le32_to_cpu(ta_hdr->header.ucode_version);
> +
> +                       adev->psp.ta_dtm_ucode_version = 
> le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
> +                       adev->psp.ta_dtm_ucode_size = 
> le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
> +                       adev->psp.ta_dtm_start_addr = (uint8_t 
> *)adev->psp.ta_hdcp_start_addr +
> + le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
> +               }
>                  break;
>          default:
>                  BUG();
> -- 
> 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: 9561 bytes --]

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

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
  2019-11-28 20:20       ` Bhawanpreet Lakha
@ 2019-11-28 20:20         ` Bhawanpreet Lakha
       [not found]         ` <e883aa84-0a91-d562-3501-927cba50f61d-5C7GfCeVMHo@public.gmane.org>
  1 sibling, 0 replies; 8+ messages in thread
From: Bhawanpreet Lakha @ 2019-11-28 20:20 UTC (permalink / raw)
  To: Deucher, Alexander, amd-gfx, Wentland, Harry


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

Hey Harry can you please take a look thanks

On 2019-11-08 5:01 p.m., Deucher, Alexander wrote:
> Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ------------------------------------------------------------------------
> *From:* amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of 
> Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
> *Sent:* Friday, November 8, 2019 4:57 PM
> *To:* amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
> *Cc:* Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>
> *Subject:* [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
> load the ta firmware for navi10/12/14.
> This is already being done for raven/picasso and
> is needed for supporting hdcp on navi
>
> Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c 
> b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index ffeaa2f5588d..daf11be5416f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct 
> psp_context *psp)
>          case CHIP_NAVI10:
>          case CHIP_NAVI14:
>          case CHIP_NAVI12:
> +               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", 
> chip_name);
> +               err = request_firmware(&adev->psp.ta_fw, fw_name, 
> adev->dev);
> +               if (err) {
> + release_firmware(adev->psp.ta_fw);
> +                       adev->psp.ta_fw = NULL;
> +                       dev_info(adev->dev,
> +                                "psp v11.0: Failed to load firmware 
> \"%s\"\n", fw_name);
> +               } else {
> +                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
> +                       if (err)
> +                               goto out2;
> +
> +                       ta_hdr = (const struct ta_firmware_header_v1_0 
> *)adev->psp.ta_fw->data;
> +                       adev->psp.ta_hdcp_ucode_version = 
> le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
> +                       adev->psp.ta_hdcp_ucode_size = 
> le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
> +                       adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
> + le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
> +
> +                       adev->psp.ta_fw_version = 
> le32_to_cpu(ta_hdr->header.ucode_version);
> +
> +                       adev->psp.ta_dtm_ucode_version = 
> le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
> +                       adev->psp.ta_dtm_ucode_size = 
> le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
> +                       adev->psp.ta_dtm_start_addr = (uint8_t 
> *)adev->psp.ta_hdcp_start_addr +
> + le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
> +               }
>                  break;
>          default:
>                  BUG();
> -- 
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

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

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

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
       [not found]         ` <e883aa84-0a91-d562-3501-927cba50f61d-5C7GfCeVMHo@public.gmane.org>
@ 2019-11-28 20:23           ` Harry Wentland
  2019-11-28 20:23             ` Harry Wentland
  0 siblings, 1 reply; 8+ messages in thread
From: Harry Wentland @ 2019-11-28 20:23 UTC (permalink / raw)
  To: Bhawanpreet Lakha, Deucher, Alexander,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Wentland, Harry



On 2019-11-28 3:20 p.m., Bhawanpreet Lakha wrote:
> Hey Harry can you please take a look thanks
> 
> On 2019-11-08 5:01 p.m., Deucher, Alexander wrote:
>> Acked-by: Alex Deucher <alexander.deucher@amd.com>
>> ------------------------------------------------------------------------
>> *From:* amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of
>> Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
>> *Sent:* Friday, November 8, 2019 4:57 PM
>> *To:* amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
>> *Cc:* Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>
>> *Subject:* [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
>>  
>> load the ta firmware for navi10/12/14.
>> This is already being done for raven/picasso and
>> is needed for supporting hdcp on navi
>>
>> Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

>> ---
>>  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
>>  1 file changed, 25 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> index ffeaa2f5588d..daf11be5416f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> @@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct
>> psp_context *psp)
>>          case CHIP_NAVI10:
>>          case CHIP_NAVI14:
>>          case CHIP_NAVI12:
>> +               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin",
>> chip_name);
>> +               err = request_firmware(&adev->psp.ta_fw, fw_name,
>> adev->dev);
>> +               if (err) {
>> +                       release_firmware(adev->psp.ta_fw);
>> +                       adev->psp.ta_fw = NULL;
>> +                       dev_info(adev->dev,
>> +                                "psp v11.0: Failed to load firmware
>> \"%s\"\n", fw_name);
>> +               } else {
>> +                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
>> +                       if (err)
>> +                               goto out2;
>> +
>> +                       ta_hdr = (const struct ta_firmware_header_v1_0
>> *)adev->psp.ta_fw->data;
>> +                       adev->psp.ta_hdcp_ucode_version =
>> le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
>> +                       adev->psp.ta_hdcp_ucode_size =
>> le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
>> +                       adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
>> +                              
>> le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
>> +
>> +                       adev->psp.ta_fw_version =
>> le32_to_cpu(ta_hdr->header.ucode_version);
>> +
>> +                       adev->psp.ta_dtm_ucode_version =
>> le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
>> +                       adev->psp.ta_dtm_ucode_size =
>> le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
>> +                       adev->psp.ta_dtm_start_addr = (uint8_t
>> *)adev->psp.ta_hdcp_start_addr +
>> +                               le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
>> +               }
>>                  break;
>>          default:
>>                  BUG();
>> -- 
>> 2.17.1
>>
>> _______________________________________________
>> 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
  2019-11-28 20:23           ` Harry Wentland
@ 2019-11-28 20:23             ` Harry Wentland
  0 siblings, 0 replies; 8+ messages in thread
From: Harry Wentland @ 2019-11-28 20:23 UTC (permalink / raw)
  To: Bhawanpreet Lakha, Deucher, Alexander, amd-gfx, Wentland, Harry



On 2019-11-28 3:20 p.m., Bhawanpreet Lakha wrote:
> Hey Harry can you please take a look thanks
> 
> On 2019-11-08 5:01 p.m., Deucher, Alexander wrote:
>> Acked-by: Alex Deucher <alexander.deucher@amd.com>
>> ------------------------------------------------------------------------
>> *From:* amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of
>> Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
>> *Sent:* Friday, November 8, 2019 4:57 PM
>> *To:* amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
>> *Cc:* Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>
>> *Subject:* [PATCH] drm/amd/display: Load TA firmware for navi10/12/14
>>  
>> load the ta firmware for navi10/12/14.
>> This is already being done for raven/picasso and
>> is needed for supporting hdcp on navi
>>
>> Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

>> ---
>>  drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 25 +++++++++++++++++++++++++
>>  1 file changed, 25 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> index ffeaa2f5588d..daf11be5416f 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
>> @@ -186,6 +186,31 @@ static int psp_v11_0_init_microcode(struct
>> psp_context *psp)
>>          case CHIP_NAVI10:
>>          case CHIP_NAVI14:
>>          case CHIP_NAVI12:
>> +               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin",
>> chip_name);
>> +               err = request_firmware(&adev->psp.ta_fw, fw_name,
>> adev->dev);
>> +               if (err) {
>> +                       release_firmware(adev->psp.ta_fw);
>> +                       adev->psp.ta_fw = NULL;
>> +                       dev_info(adev->dev,
>> +                                "psp v11.0: Failed to load firmware
>> \"%s\"\n", fw_name);
>> +               } else {
>> +                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
>> +                       if (err)
>> +                               goto out2;
>> +
>> +                       ta_hdr = (const struct ta_firmware_header_v1_0
>> *)adev->psp.ta_fw->data;
>> +                       adev->psp.ta_hdcp_ucode_version =
>> le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
>> +                       adev->psp.ta_hdcp_ucode_size =
>> le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
>> +                       adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
>> +                              
>> le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
>> +
>> +                       adev->psp.ta_fw_version =
>> le32_to_cpu(ta_hdr->header.ucode_version);
>> +
>> +                       adev->psp.ta_dtm_ucode_version =
>> le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
>> +                       adev->psp.ta_dtm_ucode_size =
>> le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
>> +                       adev->psp.ta_dtm_start_addr = (uint8_t
>> *)adev->psp.ta_hdcp_start_addr +
>> +                               le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
>> +               }
>>                  break;
>>          default:
>>                  BUG();
>> -- 
>> 2.17.1
>>
>> _______________________________________________
>> 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

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-11-28 20:23 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-08 21:57 [PATCH] drm/amd/display: Load TA firmware for navi10/12/14 Bhawanpreet Lakha
2019-11-08 21:57 ` Bhawanpreet Lakha
     [not found] ` <20191108215721.13316-1-Bhawanpreet.Lakha-5C7GfCeVMHo@public.gmane.org>
2019-11-08 22:01   ` Deucher, Alexander
2019-11-08 22:01     ` Deucher, Alexander
     [not found]     ` <DM5PR12MB1820C10A42B4FFC83A093710F77B0-2J9CzHegvk8qWyLXlBb1HgdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2019-11-28 20:20       ` Bhawanpreet Lakha
2019-11-28 20:20         ` Bhawanpreet Lakha
     [not found]         ` <e883aa84-0a91-d562-3501-927cba50f61d-5C7GfCeVMHo@public.gmane.org>
2019-11-28 20:23           ` Harry Wentland
2019-11-28 20:23             ` Harry Wentland

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).