diff options
| author | Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com> | 2011-08-26 21:31:10 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:04:01 +0200 |
| commit | e594659d746f9c403c5f3db4c51b2bbf82deb371 (patch) | |
| tree | 953314c5a3aa2d87795284fc1766bc680a326567 /include/video | |
| parent | 44e567d83a7baeb3d0021fd75f8b634ca52590d5 (diff) | |
av8100:Migration to kernel 3.0 patch
Add the following patches changes in av8100 driver
files.
1828f43 video: hdmi: Improve HDMI CEC
04ad4ac video: av8100: Add HDMI AVI Infoframe
577214f video: hdmi: Add return data for hdcp request
6d71d02 video: av8100: Add new firmware version
9c42120 video: av8100: Avoid HW access in power off mode
bc272e8 video: av8100: Reduce power consumption
ST-Ericsson ID: 352334
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I49914c2b8e733bf2802b7916bc1958364fe41118
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29569
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/av8100.h | 2 | ||||
| -rw-r--r-- | include/video/hdmi.h | 31 |
2 files changed, 31 insertions, 2 deletions
diff --git a/include/video/av8100.h b/include/video/av8100.h index b0dc7b7f1cb..dcc9d51992f 100644 --- a/include/video/av8100.h +++ b/include/video/av8100.h @@ -404,6 +404,7 @@ enum av8100_hdmi_event { AV8100_HDMI_EVENT_CEC = 0x4, AV8100_HDMI_EVENT_HDCP = 0x8, AV8100_HDMI_EVENT_CECTXERR = 0x10, + AV8100_HDMI_EVENT_CECTX = 0x20, /* Transm no error */ }; struct av8100_status { @@ -415,6 +416,7 @@ struct av8100_status { int av8100_init(void); void av8100_exit(void); +int av8100_powerscan(void); int av8100_powerup(void); int av8100_powerdown(void); int av8100_disable_interrupt(void); diff --git a/include/video/hdmi.h b/include/video/hdmi.h index d2ef87f910a..4ade6140e5b 100644 --- a/include/video/hdmi.h +++ b/include/video/hdmi.h @@ -33,7 +33,7 @@ #define HDMI_AES_KSVSIZE 5 #define HDMI_AES_KEYSIZE 288 #define HDMI_CRC32_SIZE 4 -#define HDMI_REVOC_LIST_SIZE 30 +#define HDMI_HDCPAUTHRESP_SIZE 126 #define HDMI_STOREASTEXT_TEXT_SIZE 2 #define HDMI_STOREASTEXT_BIN_SIZE 1 @@ -103,6 +103,7 @@ enum hdmi_event { HDMI_EVENT_HDCP = 0x8, HDMI_EVENT_CECTXERR = 0x10, HDMI_EVENT_WAKEUP = 0x20, + HDMI_EVENT_CECTX = 0x40, }; enum hdmi_hdcp_auth_type { @@ -158,11 +159,37 @@ struct hdcp_loadaesall { u8 result; }; + +/* hdcp_authencr resp coding + * + * When encr_type is 2 (request revoc list), the response is given by + * resp_size is != 0 and resp containing the folllowing: + * + * u8[5] Bksv from sink (not belonging to revocation list) + * u8 Device count + * Additional output if Nrofdevices > 0: + * u8[5 * Nrofdevices] Bksv per connected equipment + * u8[20] SHA signature + * + * Device count coding: + * 0 = a simple receiver is connected + * 0x80 = a repeater is connected without downstream equipment + * 0x81 = a repeater is connected with one downstream equipment + * up to 0x94 = (0x80 + 0x14) a repeater is connected with downstream + * equipment (thus up to 20 connected equipments) + * 1 = repeater without sink equipment connected + * >1 = number of connected equipment on the repeater + * Nrofdevices = Device count & 0x7F (max 20) + * + * Max resp_size is 5 + 1 + 5 * 20 + 20 = 126 bytes + * + */ struct hdcp_authencr { u8 auth_type; u8 encr_type; u8 result; - u8 revoc_list[HDMI_REVOC_LIST_SIZE]; + u8 resp_size; + u8 resp[HDMI_HDCPAUTHRESP_SIZE]; }; struct audio_cfg { |