drm/mediatek: Fix mtk_cec_mask()

[ Upstream commit 2c5d69b0a1 ]

In current implementation, mtk_cec_mask() writes val into target register
and ignores the mask. After talking to our hdmi experts, mtk_cec_mask()
should read a register, clean only mask bits, and update (val | mask) bits
to the register.

Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20220315232301.2434-1-miles.chen@mediatek.com/
Fixes: 8f83f26891 ("drm/mediatek: Add HDMI support")
Signed-off-by: Miles Chen <miles.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Zhiqiang Lin <zhiqiang.lin@mediatek.com>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Miles Chen 2022-03-16 07:23:00 +08:00 коммит произвёл Greg Kroah-Hartman
Родитель 08465a1889
Коммит fdb3da70ad
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -85,7 +85,7 @@ static void mtk_cec_mask(struct mtk_cec *cec, unsigned int offset,
u32 tmp = readl(cec->regs + offset) & ~mask; u32 tmp = readl(cec->regs + offset) & ~mask;
tmp |= val & mask; tmp |= val & mask;
writel(val, cec->regs + offset); writel(tmp, cec->regs + offset);
} }
void mtk_cec_set_hpd_event(struct device *dev, void mtk_cec_set_hpd_event(struct device *dev,