diff options
| author | Per Persson <per.xb.persson@stericsson.com> | 2011-06-07 12:52:15 +0200 |
|---|---|---|
| committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-17 13:42:15 +0200 |
| commit | 631ad6fc447811627ef35073383d338f3641e21b (patch) | |
| tree | d923ffbe54f4de67a07cde2a86611b84dfe2289d /drivers | |
| parent | c8521b3ceae30f8edd33ff3427a464c025101c7e (diff) | |
video: hdmi: Correct hdcp acc to documentation
The hdcp management data sent to av8100 is synchronised
with the av8100 documentation.
ST-Ericsson ID: 344063
ST-Ericsson Linux next: Not tested, ER 282779
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I00f54abe266178be0141ee1c4a46cc9bd2de91d5
Signed-off-by: Per Persson <per.xb.persson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24522
Reviewed-by: QATOOLS
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Reviewed-by: QATEST
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/av8100/av8100.c | 5 | ||||
| -rw-r--r-- | drivers/video/av8100/hdmi.c | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/drivers/video/av8100/av8100.c b/drivers/video/av8100/av8100.c index 39d32ba5cb6..a6160e088eb 100644 --- a/drivers/video/av8100/av8100.c +++ b/drivers/video/av8100/av8100.c @@ -233,7 +233,7 @@ enum av8100_command_size { AV8100_COMMAND_DENC_SIZE = 0x6, AV8100_COMMAND_HDMI_SIZE = 0x4, AV8100_COMMAND_HDCP_SENDKEY_SIZE = 0xA, - AV8100_COMMAND_HDCP_MANAGEMENT_SIZE = 0x4, + AV8100_COMMAND_HDCP_MANAGEMENT_SIZE = 0x3, AV8100_COMMAND_INFOFRAMES_SIZE = 0x21, AV8100_COMMAND_EDID_SECTION_READBACK_SIZE = 0x3, AV8100_COMMAND_PATTERNGENERATOR_SIZE = 0x4, @@ -1523,8 +1523,7 @@ static int configuration_hdcp_management_get(char *buffer, return AV8100_FAIL; buffer[0] = av8100_config->hdmi_hdcp_management_format_cmd.req_type; - buffer[1] = av8100_config->hdmi_hdcp_management_format_cmd.req_encr; - buffer[2] = av8100_config->hdmi_hdcp_management_format_cmd.encr_use; + buffer[1] = av8100_config->hdmi_hdcp_management_format_cmd.encr_use; *length = AV8100_COMMAND_HDCP_MANAGEMENT_SIZE - 1; return 0; diff --git a/drivers/video/av8100/hdmi.c b/drivers/video/av8100/hdmi.c index 8b409c6e6a5..0cf85655b7f 100644 --- a/drivers/video/av8100/hdmi.c +++ b/drivers/video/av8100/hdmi.c @@ -561,23 +561,13 @@ static int hdcpauthencr(u8 auth_type, u8 encr_type, u8 *len, u8 *data) } switch (encr_type) { - case HDMI_HDCP_ENCR_OFF: - config.hdcp_management_format.req_encr = - AV8100_HDCP_ENCR_REQ_OFF; - config.hdcp_management_format.encr_use = - AV8100_HDCP_ENCR_USE_OESS; - break; - case HDMI_HDCP_ENCR_OESS: - config.hdcp_management_format.req_encr = - AV8100_HDCP_ENCR_REQ_ON; + default: config.hdcp_management_format.encr_use = AV8100_HDCP_ENCR_USE_OESS; break; case HDMI_HDCP_ENCR_EESS: - config.hdcp_management_format.req_encr = - AV8100_HDCP_ENCR_REQ_ON; config.hdcp_management_format.encr_use = AV8100_HDCP_ENCR_USE_EESS; break; |