Skip to contentSkip to conversation

drm/mediatek: Fix mtk_cec_mask()

PATCH RESEND Applied Miles Chen 2 participants 2 messages Mar 15, 2022 – Apr 7, 2022

Subsystems (3)
lore
Share & tools
lore

Miles Chen

author
#0 lore raw

PATCH RESEND v4 1/1 drm/mediatek: Fix mtk_cec_mask()

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.

Fixes 8f83f26891e1 ("drm/mediatek: Add HDMI support")
Cc Zhiqiang Lin <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <[email protected]>

---

Change since v1:
add Fixes tag

Change since v2:
add explanation of mtk_cec_mask()

Change since v3:
change misleading subject and modify the commit message since this is a bug fix patch

---
 drivers/gpu/drm/mediatek/mtk_cec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_cec.c +1 -1
index e9cef5c0c8f7..cdfa648910b2 100644
@@ -85,7 +85,7 @@ static void mtk_cec_mask(struct mtk_cec *cec, unsigned int offset,
 	u32 tmp = readl(cec->regs + offset) & ~mask;
 
 	tmp |= val & mask;
-	writel(val, cec->regs + offset);
+	writel(tmp, cec->regs + offset);
 }
 
 void mtk_cec_set_hpd_event(struct device *dev,
Signature · 1 line
2.18.0
Applied
#1 lore raw

Hi, Miles:

Quoted 7 lines · Miles Chen

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.

Applied to mediatek-drm-next [1], thanks.

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

Regards,
CK

Quoted 44 lines
Fixes 8f83f26891e1 ("drm/mediatek: Add HDMI support")
Reviewed-by AngeloGioacchino Del Regno <

[email protected]>

Cc Zhiqiang Lin <[email protected]>
Cc Matthias Brugger <[email protected]>
Cc AngeloGioacchino Del Regno <

[email protected]>

---

Change since v1:
add Fixes tag

Change since v2:
add explanation of mtk_cec_mask()

Change since v3:
change misleading subject and modify the commit message since this is a bug fix patch

---
 drivers/gpu/drm/mediatek/mtk_cec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/mediatek/mtk_cec.c +1 -1
index e9cef5c0c8f7..cdfa648910b2 100644
@@ -85,7 +85,7 @@ static void mtk_cec_mask(struct mtk_cec *cec,
 unsigned int offset,
 	u32 tmp = readl(cec->regs + offset) & ~mask;
 
 	tmp |= val & mask;
-	writel(val, cec->regs + offset);
+	writel(tmp, cec->regs + offset);
 }
 

void mtk_cec_set_hpd_event(struct device *dev,