diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2637-drm-amd-display-Read-resource_straps-from-registers-.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2637-drm-amd-display-Read-resource_straps-from-registers-.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2637-drm-amd-display-Read-resource_straps-from-registers-.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2637-drm-amd-display-Read-resource_straps-from-registers-.patch new file mode 100644 index 00000000..8d4971c2 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2637-drm-amd-display-Read-resource_straps-from-registers-.patch @@ -0,0 +1,52 @@ +From d703b10cc018df28cdacf058dfb0c0d7fdb31b54 Mon Sep 17 00:00:00 2001 +From: "Leo (Sunpeng) Li" <sunpeng.li@amd.com> +Date: Wed, 1 Nov 2017 10:24:51 -0400 +Subject: [PATCH 2637/4131] drm/amd/display: Read resource_straps from + registers for DCE12 + +Now that the registers exist, assign them to the resource_straps struct. + +v2: Fix indentation +v3: Fix trailing whitespace and checkpatch warnings. + +bug: https://bugs.freedesktop.org/show_bug.cgi?id=103404 +Reviewed-by: Harry Wentland <harry.wentland@amd.com> +Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + .../gpu/drm/amd/display/dc/dce120/dce120_resource.c | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +index e93ad74..57cd673 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +@@ -501,12 +501,19 @@ static void read_dce_straps( + struct dc_context *ctx, + struct resource_straps *straps) + { +- /* TODO: Registers are missing */ +- /*REG_GET_2(CC_DC_HDMI_STRAPS, +- HDMI_DISABLE, &straps->hdmi_disable, +- AUDIO_STREAM_NUMBER, &straps->audio_stream_number); +- +- REG_GET(DC_PINSTRAPS, DC_PINSTRAPS_AUDIO, &straps->dc_pinstraps_audio);*/ ++ uint32_t reg_val = dm_read_reg_soc15(ctx, mmCC_DC_MISC_STRAPS, 0); ++ ++ straps->audio_stream_number = get_reg_field_value(reg_val, ++ CC_DC_MISC_STRAPS, ++ AUDIO_STREAM_NUMBER); ++ straps->hdmi_disable = get_reg_field_value(reg_val, ++ CC_DC_MISC_STRAPS, ++ HDMI_DISABLE); ++ ++ reg_val = dm_read_reg_soc15(ctx, mmDC_PINSTRAPS, 0); ++ straps->dc_pinstraps_audio = get_reg_field_value(reg_val, ++ DC_PINSTRAPS, ++ DC_PINSTRAPS_AUDIO); + } + + static struct audio *create_audio( +-- +2.7.4 + |