drm/amd: Add DMCU firmware loading on raven
Subsystems (3)
PATCH 1/1 drm/amd: Add DMCU firmware loading on raven
[Why]
DMCU (Display MicroController Unit) is an on-GPU microcontroller in AMD graphics cards that is used in features for embedded displays such as Panel Self-Refresh
DMCU is part of the DM IP block
[How]
DMCU is added as an option in the enum AMDGPU_UCODE_ID
DMCU needs two pieces of firmware - the initial eram and the interrupt vectors. These are treated as seperate pieces of firmware and loaded by PSP
The loading occurs in the sw_init hook of DM
If the firmware is not found, the sw_init hook returns without error. DMCU is not a requirement for DM to run.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 98 +++++++++++++++++++ 3 files changed, 106 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2 -0
@@ -196,6 +196,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, };
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 ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +98 -0
122 lines not on this page · raw message
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): 20180907174942.10007-1-David.Francis-5C7GfCeVMHo@public.gmane.org
Quoted 90 lines · David Francis
[Why]
DMCU (Display MicroController Unit) is an on-GPU microcontroller in AMD graphics cards that is used in features for embedded displays such as Panel Self-RefreshDMCU is part of the DM IP block
[How]
DMCU is added as an option in the enumAMDGPU_UCODE_IDDMCU needs two pieces of firmware - the initial eram and the interrupt vectors. These are treated as seperate pieces of firmware and loaded by PSP
The loading occurs in the
sw_inithook of DMIf the firmware is not found, the
sw_inithook returns without error. DMCU is not a requirement for DM to run.Signed-off-by David Francis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 98 +++++++++++++++++++ 3 files changed, 106 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2
-0@@ -196,6 +196,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, };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 ;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8
-0@@ -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,12 @@#include "modules/inc/mod_freesync.h" +#define FIRMWARE_RAVEN_DMCU_ERAM "amdgpu/raven_dmcu_eram.bin" +MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU_ERAM ); + +#define FIRMWARE_RAVEN_DMCU_INTV "amdgpu/raven_dmcu_intv.bin" +MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU_INTV ); +/* basic init/fini API */ static int amdgpu_dm_init (struct amdgpu_device *adev);static void amdgpu_dm_fini (struct amdgpu_device *adev);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void amdgpu_dm_fini(struct amdgpu_device *adev) · line 526
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +0
-0@@ -516,6 +524,96 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)static int dm_sw_init (void *handle) {
Move the DMCU loading code into a separate function, even though it's the only one called here.
Quoted 27 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +27
-0+const struct firmware *fw; +const char *fw_name_dmcu_eram; +const char *fw_name_dmcu_intv; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int r; + +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_eram =FIRMWARE_RAVEN_DMCU_ERAM ; + fw_name_dmcu_intv =FIRMWARE_RAVEN_DMCU_INTV ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void amdgpu_dm_fini(struct amdgpu_device *adev) · line 563
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+break ; +default : +DRM_ERROR ("Unsupported ASIC type: 0x%X\n" , adev->asic_type); +return -1 ; + } + + r =request_firmware (&fw, fw_name_dmcu_eram, adev->dev); +if (r == -ENOENT ) + { +/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */
Maybe add a DRM_DEBUG_KMS here. For debug purposes we might still want to know whether firmware is available or not when testing features supported by DMCU.
Quoted 15 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +15
-0+return 0 ; + } +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't load firmware \"%s\"\n" , + fw_name_dmcu_eram); +return r; + } + + r =amdgpu_ucode_validate (fw); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't validate firmware \"%s\"\n" , + fw_name_dmcu_eram); +release_firmware (fw); + fw =NULL ; +return r;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void amdgpu_dm_fini(struct amdgpu_device *adev) · line 588
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +10
-0+ } + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +const struct common_firmware_header *hdr; + hdr = (const struct common_firmware_header *)fw->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 = fw; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); +DRM_INFO ("PSP loading DMCU_ERAM firmware\n" );
DRM_DEBUG_KMS should suffice here, rather than DRM_INFO, since DC doesn't need DMCU.
Harry
Quoted 22 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +21
-0+ } + + r =request_firmware (&fw, fw_name_dmcu_intv, adev->dev); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't load firmware \"%s\"\n" , + fw_name_dmcu_intv); +return r; + } + + r =amdgpu_ucode_validate (fw); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't validate firmware \"%s\"\n" , + fw_name_dmcu_intv); +release_firmware (fw); + fw =NULL ; +return r; + } + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +const struct common_firmware_header *hdr; + hdr = (const struct common_firmware_header *)fw->data;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void amdgpu_dm_fini(struct amdgpu_device *adev) · line 619
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-0+ adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_INTV ].ucode_id =AMDGPU_UCODE_ID_DMCU_INTV ; + adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_INTV ].fw = fw; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); +DRM_INFO ("PSP loading DMCU_INTV firmware\n" ); + } +return 0 ; }
_______________________________________________
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): 767d6c2a-8d72-6806-6ce2-7fd8e69a7215-5C7GfCeVMHo@public.gmane.org
PATCH v2 1/1 drm/amd: Add DMCU firmware loading on raven
[Why]
DMCU (Display MicroController Unit) is an on-GPU microcontroller in AMD graphics cards that is used in features for embedded displays such as Panel Self-Refresh
DMCU is part of the DM IP block
[How]
DMCU is added as an option in the enum AMDGPU_UCODE_ID
DMCU needs two pieces of firmware - the initial eram and the interrupt vectors. These are treated as seperate pieces of firmware and loaded by PSP
The loading occurs in the sw_init hook of DM
If the firmware is not found, the sw_init hook returns without error. DMCU is not a requirement for DM to run.
v2: Move dmcu firmware loading into its own function, properly release firmware, add debug messages
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 114 +++++++++++++++++- 3 files changed, 121 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2 -0
@@ -196,6 +196,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, };
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 ;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +113 -1
142 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 10 lines · David Francis
[Why]
DMCU (Display MicroController Unit) is an on-GPU microcontroller in AMD graphics cards that is used in features for embedded displays such as Panel Self-RefreshDMCU is part of the DM IP block
[How]
DMCU is added as an option in the enumAMDGPU_UCODE_ID
Quoted 8 lines
DMCU needs two pieces of firmware - the initial eram and the interrupt vectors. These are treated as seperate pieces of firmware and loaded by PSP
The loading occurs in the
sw_inithook of DMIf the firmware is not found, the
sw_inithook returns without error. DMCU is not a requirement for DM to run.
Doesn't request_fw have a one-minute timeout? So if the "optional" firmware is not found during boot, you'll sit there with a blank screen for a minute and lead many users to believe that their system is hanging.
Regards,
Felix
Quoted 158 lines
Signed-off-by David Francis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 6 ++ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 98 +++++++++++++++++++ 3 files changed, 106 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2
-0@@ -196,6 +196,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, };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 ;drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +91
-0@@ -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,12 @@#include "modules/inc/mod_freesync.h" +#define FIRMWARE_RAVEN_DMCU_ERAM "amdgpu/raven_dmcu_eram.bin" +MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU_ERAM ); + +#define FIRMWARE_RAVEN_DMCU_INTV "amdgpu/raven_dmcu_intv.bin" +MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU_INTV ); +/* basic init/fini API */ static int amdgpu_dm_init (struct amdgpu_device *adev);static void amdgpu_dm_fini (struct amdgpu_device *adev);@@ -516,6 +524,96 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev)static int dm_sw_init (void *handle) { +const struct firmware *fw; +const char *fw_name_dmcu_eram; +const char *fw_name_dmcu_intv; +struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int r; + +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_eram =FIRMWARE_RAVEN_DMCU_ERAM ; + fw_name_dmcu_intv =FIRMWARE_RAVEN_DMCU_INTV ; +break ; +default : +DRM_ERROR ("Unsupported ASIC type: 0x%X\n" , adev->asic_type); +return -1 ; + } + + r =request_firmware (&fw, fw_name_dmcu_eram, adev->dev); +if (r == -ENOENT ) + { +/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */ +return 0 ; + } +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't load firmware \"%s\"\n" , + fw_name_dmcu_eram); +return r; + } + + r =amdgpu_ucode_validate (fw); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't validate firmware \"%s\"\n" , + fw_name_dmcu_eram); +release_firmware (fw); + fw =NULL ; +return r; + } + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +const struct common_firmware_header *hdr; + hdr = (const struct common_firmware_header *)fw->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 = fw; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); +DRM_INFO ("PSP loading DMCU_ERAM firmware\n" ); + } + + r =request_firmware (&fw, fw_name_dmcu_intv, adev->dev); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't load firmware \"%s\"\n" , + fw_name_dmcu_intv); +return r; + } + + r =amdgpu_ucode_validate (fw); +if (r) { +dev_err (adev->dev,"amdgpu_dm: Can't validate firmware \"%s\"\n" , + fw_name_dmcu_intv); +release_firmware (fw); + fw =NULL ; +return r; + } + +if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { +const struct common_firmware_header *hdr; + hdr = (const struct common_firmware_header *)fw->data;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void amdgpu_dm_fini(struct amdgpu_device *adev) · line 619
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +7
-0+ adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_INTV ].ucode_id =AMDGPU_UCODE_ID_DMCU_INTV ; + adev->firmware.ucode[AMDGPU_UCODE_ID_DMCU_INTV ].fw = fw; + adev->firmware.fw_size += +ALIGN (le32_to_cpu (hdr->ucode_size_bytes),PAGE_SIZE ); +DRM_INFO ("PSP loading DMCU_INTV firmware\n" ); + } +return 0 ; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx