Add DMCU fw loading on raven
Subsystems (3)
v2 cover Add DMCU fw loading on raven
v2: measure intv offset in bytes instead of words
David Francis (3):
drm/amd: Add ucode DMCU support
drm/amd: Add PSP DMCU support
drm/amd: Add DM DMCU support
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 21 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 10 ++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 91 ++++++++++++++++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + 5 files changed, 127 insertions(+), 3 deletions(-)
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): 20180912143445.10610-1-David.Francis-5C7GfCeVMHo@public.gmane.org
PATCH v2 1/3 drm/amd: Add ucode DMCU support
DMCU (Display Microcontroller Unit) is a GPU chip involved in eDP features like Adaptive Backlight Modulation and Panel Self Refresh.
DMCU has two pieces of firmware: the ERAM and the interrupt vectors, which must be loaded seperately.
To this end, the DMCU firmware has a custom header and parsing logic similar to MEC, to extract the two ucodes from a single struct firmware.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 21 +++++++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 10 ++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +19 -2
@@ -322,6 +322,7 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev, {const struct common_firmware_header *header =NULL ;const struct gfx_firmware_header_v1_0 *cp_hdr =NULL ; +const struct dmcu_firmware_header_v1_0 *dmcu_hdr =NULL ;if (NULL == ucode->fw)return 0 ;
@@ -333,8 +334,8 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,return 0 ; header = (const struct common_firmware_header *)ucode->fw->data; - cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data; + dmcu_hdr = (const struct dmcu_firmware_header_v1_0 *)ucode->fw->data; if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP || (ucode->ucode_id != AMDGPU_UCODE_ID_CP_MEC1 &&
@@ -343,7 +344,9 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev, ucode->ucode_id !=AMDGPU_UCODE_ID_CP_MEC2_JT && ucode->ucode_id !=AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL && ucode->ucode_id !=AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM && - ucode->ucode_id != AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM)) { + ucode->ucode_id !=AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM && + ucode->ucode_id !=AMDGPU_UCODE_ID_DMCU_ERAM && + ucode->ucode_id != AMDGPU_UCODE_ID_DMCU_INTV)) { ucode->ucode_size = le32_to_cpu(header->ucode_size_bytes); memcpy(ucode->kaddr, (void *)((uint8_t *)ucode->fw->data +
@@ -365,6 +368,20 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,le32_to_cpu (header->ucode_array_offset_bytes) + le32_to_cpu(cp_hdr->jt_offset) * 4), ucode->ucode_size); + }else if (ucode->ucode_id ==AMDGPU_UCODE_ID_DMCU_ERAM ) { + ucode->ucode_size =le32_to_cpu (header->ucode_size_bytes) - +le32_to_cpu (dmcu_hdr->intv_size_bytes); + +memcpy (ucode->kaddr, (void *)((uint8_t *)ucode->fw->data + +le32_to_cpu (header->ucode_array_offset_bytes)), + ucode->ucode_size); + }else if (ucode->ucode_id ==AMDGPU_UCODE_ID_DMCU_INTV ) { + ucode->ucode_size =le32_to_cpu (dmcu_hdr->intv_size_bytes); + +memcpy (ucode->kaddr, (void *)((uint8_t *)ucode->fw->data + +le32_to_cpu (header->ucode_array_offset_bytes) + +le32_to_cpu (dmcu_hdr->intv_offset_bytes)), + ucode->ucode_size); }else if (ucode->ucode_id ==AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL ) { ucode->ucode_size = adev->gfx.rlc.save_restore_list_cntl_size_bytes; memcpy(ucode->kaddr, adev->gfx.rlc.save_restore_list_cntl,
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +10 -0
@@ -157,6 +157,13 @@ struct gpu_info_firmware_header_v1_0 {uint16_t version_minor;/* version */ }; +/* version_major=1, version_minor=0 */ +struct dmcu_firmware_header_v1_0 { +struct common_firmware_header header; +uint32_t intv_offset_bytes;/* interrupt vectors offset from end of header, in bytes */ +uint32_t intv_size_bytes;/* size of interrupt vectors, in bytes */ +}; +/* header is fixed size */ union amdgpu_firmware_header {struct common_firmware_header common;
@@ -170,6 +177,7 @@ union amdgpu_firmware_header {struct sdma_firmware_header_v1_0 sdma;struct sdma_firmware_header_v1_1 sdma_v1_1;struct gpu_info_firmware_header_v1_0 gpu_info; +struct dmcu_firmware_header_v1_0 dmcu;uint8_t raw[0x100 ]; };
@@ -196,6 +204,8 @@ enum AMDGPU_UCODE_ID {AMDGPU_UCODE_ID_UVD1 ,AMDGPU_UCODE_ID_VCE ,AMDGPU_UCODE_ID_VCN , +AMDGPU_UCODE_ID_DMCU_ERAM , +AMDGPU_UCODE_ID_DMCU_INTV , AMDGPU_UCODE_ID_MAXIMUM, };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/3 drm/amd: Add PSP DMCU support
In reply to a message not in the archiveDMCU (Display Microcontroller Unit) is a GPU chip involved in eDP features like Adaptive Backlight Modulation and Panel Self Refresh.
PSP is already equipped to handle DMCU firmware loading, all that is needed is to translate between the new DMCU ucode ID and the equivalent psp_gfx_fw_type.
--- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +6 -0
@@ -91,6 +91,12 @@ psp_v10_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *case AMDGPU_UCODE_ID_VCN : *type =GFX_FW_TYPE_VCN ;break ; +case AMDGPU_UCODE_ID_DMCU_ERAM : + *type =GFX_FW_TYPE_DMCU_ERAM ; +break ; +case AMDGPU_UCODE_ID_DMCU_INTV : + *type =GFX_FW_TYPE_DMCU_ISR ; +break ;case AMDGPU_UCODE_ID_MAXIMUM :default :return -EINVAL ;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/3 drm/amd: Add DM DMCU support
In reply to a message not in the archiveDMCU (Display Microcontroller Unit) is a GPU chip involved in eDP features like Adaptive Backlight Modulation and Panel Self Refresh.
DC is already fully equipped to initialize DMCU as long as the firmware is loaded.
At the moment only the raven firmware is available.
A single .bin file is loaded by the kernel's loading mechanism and split into two ucodes according to the header.
DMCU is optional, so if the firmware is not found, no error or warning is raised.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 91 ++++++++++++++++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + 2 files changed, 92 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +90 -1
@@ -30,6 +30,7 @@#include "vid.h" #include "amdgpu.h" #include "amdgpu_display.h" +#include "amdgpu_ucode.h" #include "atom.h" #include "amdgpu_dm.h" #include "amdgpu_pm.h"
@@ -50,6 +51,7 @@#include <linux/version.h> #include <linux/types.h> #include <linux/pm_runtime.h> +#include <linux/firmware.h> #include <drm/drmP.h> #include <drm/drm_atomic.h>
@@ -71,6 +73,9 @@#include "modules/inc/mod_freesync.h" +#define FIRMWARE_RAVEN_DMCU "amdgpu/raven_dmcue.bin" +MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU ); +/* basic init/fini API */ static int amdgpu_dm_init (struct amdgpu_device *adev);static void amdgpu_dm_fini (struct amdgpu_device *adev);
@@ -514,13 +519,97 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)return ; } -static int dm_sw_init (void *handle) +static int load_dmcu_fw (struct amdgpu_device *adev) { +const char *fw_name_dmcu; +int r; +const struct dmcu_firmware_header_v1_0 *hdr; + +switch (adev->asic_type) { +case CHIP_BONAIRE : +case CHIP_HAWAII : +case CHIP_KAVERI : +case CHIP_KABINI : +case CHIP_MULLINS : +case CHIP_TONGA : +case CHIP_FIJI : +case CHIP_CARRIZO : +case CHIP_STONEY : +case CHIP_POLARIS11 : +case CHIP_POLARIS10 : +case CHIP_POLARIS12 : +case CHIP_VEGAM : +case CHIP_VEGA10 : +case CHIP_VEGA12 : +case CHIP_VEGA20 : +return 0 ; +case CHIP_RAVEN : + fw_name_dmcu =FIRMWARE_RAVEN_DMCU ; +break ; +default : +DRM_ERROR ("Unsupported ASIC type: 0x%X\n" , adev->asic_type); +return -1 ; + } + +if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) { +DRM_DEBUG_KMS ("dm: DMCU firmware not supported on direct or SMU loading\n" ); +return 0 ; + } + + r =request_firmware_direct (&adev->dm.fw_dmcu, fw_name_dmcu, adev->dev); +if (r == -ENOENT ) { +/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */ +DRM_DEBUG_KMS ("dm: DMCU firmware not found\n" ); + adev->dm.fw_dmcu =NULL ; +return 0 ; + } +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't load firmware \"%s\"\n" , + fw_name_dmcu); +return r; + } + + r =amdgpu_ucode_validate (adev->dm.fw_dmcu); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't validate firmware \"%s\"\n" , + fw_name_dmcu); +release_firmware (adev->dm.fw_dmcu); + adev->dm.fw_dmcu =NULL ; +return r; + } + + hdr = (const struct dmcu_firmware_header_v1_0 *)adev->dm.fw_dmcu->data; + adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_ERAM ].ucode_id =AMDGPU_UCODE_ID_DMCU_ERAM ; + adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_ERAM ].fw = adev->dm.fw_dmcu; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->header.ucode_size_bytes) -le32_to_cpu (hdr->intv_size_bytes),PAGE_SIZE ); + + adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_INTV ].ucode_id =AMDGPU_UCODE_ID_DMCU_INTV ; + adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_INTV ].fw = adev->dm.fw_dmcu; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->intv_size_bytes),PAGE_SIZE ); + +DRM_DEBUG_KMS ("PSP loading DMCU firmware\n" ); +return 0 ; } +static int dm_sw_init (void *handle) +{ +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +return load_dmcu_fw (adev); +} +static int dm_sw_fini (void *handle) { +struct amdgpu_device *adev = (struct amdgpu_device *)handle; + +if (adev->dm.fw_dmcu) { +release_firmware (adev->dm.fw_dmcu); + adev->dm.fw_dmcu =NULL ; + } +return 0 ; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +2 -0
@@ -129,6 +129,8 @@ struct amdgpu_display_manager {struct drm_atomic_state *cached_state;struct dm_comressor_info compressor; + +const struct firmware *fw_dmcu; };struct amdgpu_dm_connector {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-bySeries is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of David Francis <[email protected]>
Sent: Wednesday, September 12, 2018 10:34:42 AM
To: [email protected]
Cc: Francis, David
Subject: [PATCH v2 0/3] Add DMCU fw loading on raven
v2: measure intv offset in bytes instead of words
David Francis (3):
drm/amd: Add ucode DMCU support
drm/amd: Add PSP DMCU support
drm/amd: Add DM DMCU support
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 21 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 10 ++ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 91 ++++++++++++++++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 + 5 files changed, 127 insertions(+), 3 deletions(-)
--
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