Add callbacks for atomic_destroy_state, atomic_duplicate_state and
atomic_reset to restore functionality of the DSI driver: this solves
vblank timeouts when another bridge is present in the chain.
Tested bridge chain: DSI <=> ANX7625 => aux-bus panel
Fixes: 7f6335c6a258 ("drm/mediatek: Modify dsi funcs to atomic operations")
Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
---
Note: The commit that has been mentioned in the Fixes tag should
*not* have my Reviewed-by tag, as the author changed it but
erroneously retained the tag that I had released for an
earlier version of that commit (which was fine, but the new
version broke mtk_dsi!).
drivers/gpu/drm/mediatek/mtk_dsi.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 9cc406e1eee1..5b624e0f5b0a 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -808,10 +808,13 @@ static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,
static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = {
.attach = mtk_dsi_bridge_attach,
+ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
.atomic_disable = mtk_dsi_bridge_atomic_disable,
+ .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
.atomic_enable = mtk_dsi_bridge_atomic_enable,
.atomic_pre_enable = mtk_dsi_bridge_atomic_pre_enable,
.atomic_post_disable = mtk_dsi_bridge_atomic_post_disable,
+ .atomic_reset = drm_atomic_helper_bridge_reset,
.mode_set = mtk_dsi_bridge_mode_set,
};
--
2.35.1
On Fri, Jul 22, 2022 at 1:27 AM AngeloGioacchino Del Regno
<[email protected]> wrote:
>
> Add callbacks for atomic_destroy_state, atomic_duplicate_state and
> atomic_reset to restore functionality of the DSI driver: this solves
> vblank timeouts when another bridge is present in the chain.
>
> Tested bridge chain: DSI <=> ANX7625 => aux-bus panel
>
> Fixes: 7f6335c6a258 ("drm/mediatek: Modify dsi funcs to atomic operations")
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
Tested-by: Chen-Yu Tsai <[email protected]>
on top of next-20220722 with additional DTSI changes for display related
device nodes [1] and modification to mt8192-asurada.dtsi to enable internal
display.
[1] https://lore.kernel.org/linux-mediatek/[email protected]/
On Thu, Jul 21, 2022 at 07:27:27PM +0200, AngeloGioacchino Del Regno wrote:
> Add callbacks for atomic_destroy_state, atomic_duplicate_state and
> atomic_reset to restore functionality of the DSI driver: this solves
> vblank timeouts when another bridge is present in the chain.
>
> Tested bridge chain: DSI <=> ANX7625 => aux-bus panel
>
> Fixes: 7f6335c6a258 ("drm/mediatek: Modify dsi funcs to atomic operations")
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
Tested-by: N?colas F. R. A. Prado <[email protected]>
Tested on mt8183-jacuzzi-juniper. As part of enabling IGT tests on that machine
in KernelCI, this regression needs to be fixed. [1]
Thanks,
N?colas
[1] https://github.com/kernelci/kernelci-core/pull/1059
> ---
>
> Note: The commit that has been mentioned in the Fixes tag should
> *not* have my Reviewed-by tag, as the author changed it but
> erroneously retained the tag that I had released for an
> earlier version of that commit (which was fine, but the new
> version broke mtk_dsi!).
>
> drivers/gpu/drm/mediatek/mtk_dsi.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index 9cc406e1eee1..5b624e0f5b0a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -808,10 +808,13 @@ static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,
>
> static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = {
> .attach = mtk_dsi_bridge_attach,
> + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> .atomic_disable = mtk_dsi_bridge_atomic_disable,
> + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
> .atomic_enable = mtk_dsi_bridge_atomic_enable,
> .atomic_pre_enable = mtk_dsi_bridge_atomic_pre_enable,
> .atomic_post_disable = mtk_dsi_bridge_atomic_post_disable,
> + .atomic_reset = drm_atomic_helper_bridge_reset,
> .mode_set = mtk_dsi_bridge_mode_set,
> };
>
> --
> 2.35.1
>
>
On Fri, Jul 22, 2022 at 1:27 AM AngeloGioacchino Del Regno
<[email protected]> wrote:
>
> Add callbacks for atomic_destroy_state, atomic_duplicate_state and
> atomic_reset to restore functionality of the DSI driver: this solves
> vblank timeouts when another bridge is present in the chain.
>
> Tested bridge chain: DSI <=> ANX7625 => aux-bus panel
>
> Fixes: 7f6335c6a258 ("drm/mediatek: Modify dsi funcs to atomic operations")
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
This patch is now needed on top of v6.0-rc1, otherwise booting will
stall for a while waiting for display vblank, which never happens
because the DSI pipeline is not configured correctly.
ChenYu
> ---
>
> Note: The commit that has been mentioned in the Fixes tag should
> *not* have my Reviewed-by tag, as the author changed it but
> erroneously retained the tag that I had released for an
> earlier version of that commit (which was fine, but the new
> version broke mtk_dsi!).
>
> drivers/gpu/drm/mediatek/mtk_dsi.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index 9cc406e1eee1..5b624e0f5b0a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -808,10 +808,13 @@ static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,
>
> static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = {
> .attach = mtk_dsi_bridge_attach,
> + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> .atomic_disable = mtk_dsi_bridge_atomic_disable,
> + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
> .atomic_enable = mtk_dsi_bridge_atomic_enable,
> .atomic_pre_enable = mtk_dsi_bridge_atomic_pre_enable,
> .atomic_post_disable = mtk_dsi_bridge_atomic_post_disable,
> + .atomic_reset = drm_atomic_helper_bridge_reset,
> .mode_set = mtk_dsi_bridge_mode_set,
> };
>
> --
> 2.35.1
>
Chen-Yu Tsai <[email protected]> 於 2022年8月19日 週五 晚上9:29寫道：
>
> On Fri, Jul 22, 2022 at 1:27 AM AngeloGioacchino Del Regno
> <[email protected]> wrote:
> >
> > Add callbacks for atomic_destroy_state, atomic_duplicate_state and
> > atomic_reset to restore functionality of the DSI driver: this solves
> > vblank timeouts when another bridge is present in the chain.
> >
> > Tested bridge chain: DSI <=> ANX7625 => aux-bus panel
> >
Applied to mediatek-drm-fixes [1], thanks.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-fixes
Regards,
Chun-Kuang.
> > Fixes: 7f6335c6a258 ("drm/mediatek: Modify dsi funcs to atomic operations")
> > Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
>
> This patch is now needed on top of v6.0-rc1, otherwise booting will
> stall for a while waiting for display vblank, which never happens
> because the DSI pipeline is not configured correctly.
>
> ChenYu
>
> > ---
> >
> > Note: The commit that has been mentioned in the Fixes tag should
> > *not* have my Reviewed-by tag, as the author changed it but
> > erroneously retained the tag that I had released for an
> > earlier version of that commit (which was fine, but the new
> > version broke mtk_dsi!).
> >
> > drivers/gpu/drm/mediatek/mtk_dsi.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> > index 9cc406e1eee1..5b624e0f5b0a 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> > @@ -808,10 +808,13 @@ static void mtk_dsi_bridge_atomic_post_disable(struct drm_bridge *bridge,
> >
> > static const struct drm_bridge_funcs mtk_dsi_bridge_funcs = {
> > .attach = mtk_dsi_bridge_attach,
> > + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
> > .atomic_disable = mtk_dsi_bridge_atomic_disable,
> > + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
> > .atomic_enable = mtk_dsi_bridge_atomic_enable,
> > .atomic_pre_enable = mtk_dsi_bridge_atomic_pre_enable,
> > .atomic_post_disable = mtk_dsi_bridge_atomic_post_disable,
> > + .atomic_reset = drm_atomic_helper_bridge_reset,
> > .mode_set = mtk_dsi_bridge_mode_set,
> > };
> >
> > --
> > 2.35.1
> >