diff options
| author | Tony Cheng <tony.cheng@amd.com> | 2017-01-05 11:29:27 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:08:51 -0400 |
| commit | e33a18f333e8b1abe892e5f5d516e89dffcb5cc3 (patch) | |
| tree | 83eb12cf0e8db72c273228c8f0885b2507e09d3d | |
| parent | 10bff005926af12aa7b1d97ea9bc948ccbaed1c9 (diff) | |
| download | linux-stable-e33a18f333e8b1abe892e5f5d516e89dffcb5cc3.tar.gz linux-stable-e33a18f333e8b1abe892e5f5d516e89dffcb5cc3.zip | |
drm/amd/display: fix Infoframe byte 28-31 doesn't get written out to register
Signed-off-by: Tony Cheng <tony.cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c index 8156c6a8ff5d..c510e95eb948 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c @@ -137,8 +137,8 @@ static void dce110_update_generic_info_packet( REG_WRITE(AFMT_GENERIC_3, *content++); REG_WRITE(AFMT_GENERIC_4, *content++); REG_WRITE(AFMT_GENERIC_5, *content++); - REG_WRITE(AFMT_GENERIC_6, *content); - REG_WRITE(AFMT_GENERIC_7, 0); + REG_WRITE(AFMT_GENERIC_6, *content++); + REG_WRITE(AFMT_GENERIC_7, *content); } if (!REG(AFMT_VBI_PACKET_CONTROL1)) { diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h index 8b4a30459eeb..cb369af29d69 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h @@ -19,7 +19,7 @@ struct encoder_info_packet { uint8_t hb1; uint8_t hb2; uint8_t hb3; - uint8_t sb[28]; + uint8_t sb[32]; }; struct encoder_info_frame { |