On 2017-11-01 10:24 AM, sunpeng.li at amd.com wrote: > From: "Leo (Sunpeng) Li" <sunpeng.li at amd.com> > > Now that the registers exist, assign them to the resource_straps struct. > > v2: Fix indentation > v3: Fix trailing whitespace and checkpatch warnings. > > Signed-off-by: Leo (Sunpeng) Li <sunpeng.li at amd.com> Series is Reviewed-by: Harry Wentland <harry.wentland at amd.com> Harry > --- > .../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 3ed28a8..5c48c22 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( >