media: adv7604: when the EDID is cleared, unconfigure CEC as well
authorHans Verkuil <hans.verkuil@cisco.com>
Thu, 4 Oct 2018 07:57:06 +0000 (03:57 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2019 17:42:26 +0000 (19:42 +0200)
[ Upstream commit e7da89926f6dc6cf855f5ffdf79ef99a1b115ca7 ]

When there is no EDID the CEC adapter should be unconfigured as
well. So call cec_phys_addr_invalidate() when this happens.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org> # for v4.18 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/media/i2c/adv7604.c

index d2108aad3c65856ce0c7909e631e7f92de5233c8..26c3ec573a5659283e4c11792665cec8b45abe69 100644 (file)
@@ -2295,8 +2295,10 @@ static int adv76xx_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
                state->aspect_ratio.numerator = 16;
                state->aspect_ratio.denominator = 9;
 
-               if (!state->edid.present)
+               if (!state->edid.present) {
                        state->edid.blocks = 0;
+                       cec_phys_addr_invalidate(state->cec_adap);
+               }
 
                v4l2_dbg(2, debug, sd, "%s: clear EDID pad %d, edid.present = 0x%x\n",
                                __func__, edid->pad, state->edid.present);