From: Tim Harvey Date: Tue, 5 Feb 2019 16:23:36 +0000 (-0500) Subject: media: tda1997x: fix get_edid X-Git-Tag: Ubuntu-5.2.0-15.16~2398^2~64 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0806bc0afbb4157b6e1c8d91cbe8e536b292996c;p=mirror_ubuntu-eoan-kernel.git media: tda1997x: fix get_edid set_edid never wrote the new EDID to state->edid.edid, it was only written to the hardware. Since get_edid returned state->edid.edid, it was never returning the right EDID. Signed-off-by: Tim Harvey Signed-off-by: Hans Verkuil [hverkuil-cisco@xs4all.nl: added missing commit log] Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index e8613e364403..a62ede096636 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -1884,6 +1884,10 @@ static int tda1997x_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid) for (i = 0; i < 128; i++) io_write(sd, REG_EDID_IN_BYTE128 + i, edid->edid[i+128]); + /* store state */ + memcpy(state->edid.edid, edid->edid, 256); + state->edid.blocks = edid->blocks; + tda1997x_enable_edid(sd); return 0;