renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
Code

media: cec: allow any initiator for Ping and Image/Text View On

Browse Source 
Some displays pull down the HPD when in standby, but CEC is still
active and the display can be woken up by sending an Image View On
or Text View On CEC command. The CEC specification doesn't tell you
what the initiator should be for such a command (without a HPD it's
unclear if the CEC adapter can claim a logical address).

This patch allows any initiator value when there is no HPD for the
Image/Text View On commands and for the Ping command.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2019-04-23 08:14:01 -04:00 committed by Mauro Carvalho Chehab
parent 89db242aa3
commit b6c96e1568
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/cec/cec-adap.c
View File

@ -809,14 +809,23 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct cec_msg *msg,
__func__); __func__);
return -EINVAL; return -EINVAL;
} }
if (msg->len > 1 && adap->is_configured && if (adap->is_configured &&
!cec_has_log_addr(adap, cec_msg_initiator(msg))) { !cec_has_log_addr(adap, cec_msg_initiator(msg))) {
dprintk(1, "%s: initiator has unknown logical address %d\n", dprintk(1, "%s: initiator has unknown logical address %d\n",
__func__, cec_msg_initiator(msg)); __func__, cec_msg_initiator(msg));
return -EINVAL; return -EINVAL;
} }
/*
* Special case: allow Ping and IMAGE/TEXT_VIEW_ON to be
* transmitted to a TV, even if the adapter is unconfigured.
* This makes it possible to detect or wake up displays that
* pull down the HPD when in standby.
*/
if (!adap->is_configured && !adap->is_configuring && if (!adap->is_configured && !adap->is_configuring &&
msg->msg[0] != 0xf0) { (msg->len > 2 ||
cec_msg_destination(msg) != CEC_LOG_ADDR_TV ||
(msg->len == 2 && msg->msg[1] != CEC_MSG_IMAGE_VIEW_ON &&
msg->msg[1] != CEC_MSG_TEXT_VIEW_ON))) {
dprintk(1, "%s: adapter is unconfigured\n", __func__); dprintk(1, "%s: adapter is unconfigured\n", __func__);
return -ENONET; return -ENONET;
} }