[PATCH 2/2] drm/amd/display: Read resource_straps from registers for DCE12
sunpeng.li at amd.com
sunpeng.li at amd.com
Tue Oct 31 20:28:58 UTC 2017
From: "Leo (Sunpeng) Li" <sunpeng.li at amd.com>
Now that the registers exist, assign them to the resource_straps struct.
Signed-off-by: Leo (Sunpeng) Li <sunpeng.li at amd.com>
---
drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c | 15 +++++++++------
1 file changed, 9 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 3ed28a8..5023a03 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,15 @@ 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
More information about the amd-gfx
mailing list