Hi

just a small update, added debug in the vendor-specific functions for page_flip and vblank and it seems they never get called

--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -87,21 +87,25 @@ static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc) { struct drm_crtc *crtc = &mtk_crtc->base; unsigned long flags; - +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); spin_lock_irqsave(&crtc->dev->event_lock, flags); drm_crtc_send_vblank_event(crtc, mtk_crtc->event); drm_crtc_vblank_put(crtc); mtk_crtc->event = NULL; spin_unlock_irqrestore(&crtc->dev->event_lock, flags); +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); }

static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc) { +printk(KERN_ALERT "DEBUG: Passed %s %d update:%d,needsvblank:%d\n",__FUNCTION__,__LINE__,mtk_crtc->config_updating,mtk_crtc->pending_needs_vblank); drm_crtc_handle_vblank(&mtk_crtc->base); if (!mtk_crtc->config_updating && mtk_crtc->pending_needs_vblank) { +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); mtk_drm_crtc_finish_page_flip(mtk_crtc); mtk_crtc->pending_needs_vblank = false; } +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); }

static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)

finish_page_flip is called by mtk_crtc_ddp_irq. this seems to be set in mtk_drm_crtc_enable_vblank with mtk_ddp_comp_enable_vblank. this is called correctly

113 static inline void mtk_ddp_comp_enable_vblank(struct mtk_ddp_comp *comp, 114 void (*vblank_cb)(void *), 115 void *vblank_cb_data) 116 { 117 printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); 118 if (comp->funcs && comp->funcs->enable_vblank) 119 { 120 comp->funcs->enable_vblank(comp->dev, vblank_cb, vblank_cb_data); 121 printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); 122 } 123 }

i see both messages, but mtk_crtc_ddp_irq is never called and so the other 2 not.

root@bpi-r2:~# dmesg | grep -i DEBUG [ 6.433509] DEBUG: Passed mtk_drm_crtc_enable_vblank 510 [ 6.433530] DEBUG: Passed mtk_ddp_comp_enable_vblank 117 [ 6.433537] DEBUG: Passed mtk_ddp_comp_enable_vblank 121 <<<

comp->funcs->enable_vblank should be mtk_drm_crtc_enable_vblank, right?

641 static const struct drm_crtc_funcs mtk_crtc_funcs = { 642 .set_config = drm_atomic_helper_set_config, 643 .page_flip = drm_atomic_helper_page_flip, 644 .destroy = mtk_drm_crtc_destroy, 645 .reset = mtk_drm_crtc_reset, 646 .atomic_duplicate_state = mtk_drm_crtc_duplicate_state, 647 .atomic_destroy_state = mtk_drm_crtc_destroy_state, 648 .enable_vblank = mtk_drm_crtc_enable_vblank, <<<<<<< 649 .disable_vblank = mtk_drm_crtc_disable_vblank, 650 };

but it looks like a recursion: mtk_drm_crtc_enable_vblank calls mtk_ddp_comp_enable_vblank => enable_vblank (=mtk_drm_crtc_enable_vblank), but i see the messages not repeating

mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc) 511 mtk_ddp_comp_enable_vblank(comp, mtk_crtc_ddp_irq, &mtk_crtc->base);

113 static inline void mtk_ddp_comp_enable_vblank(struct mtk_ddp_comp *comp, 114 void (*vblank_cb)(void *), 115 void *vblank_cb_data) 116 { 118 if (comp->funcs && comp->funcs->enable_vblank) 120 comp->funcs->enable_vblank(comp->dev, vblank_cb, vblank_cb_data);

but params do not match...comp->funcs->enable_vblank takes 3 arguments but comp->funcs->enable_vblank has only one.something i miss here...

i guess not, but is watchdog somehow involved? i ask because i see this on reboot/poweroff:

"watchdog: watchdog0: watchdog did not stop!"

i see this with my 5.13, 5.12-drm (5.12.0+mtk/core drm-patches) and 5.12.14 too (hdmi is working there), but not 5.12.0! that means something in drm-patches (mtk/core) breaks watchdog. maybe the recursion mentioned above?

regards Frank

Gesendet: Donnerstag, 08. Juli 2021 um 09:22 Uhr Von: "Dafna Hirschfeld" dafna.hirschfeld@collabora.com

Hi Frank,

On 06.07.21 11:54, Frank Wunderlich wrote:

...

Hi,

i've noticed that HDMI is broken at least on my board (Bananapi-r2,mt7623) on 5.13.

after some research i noticed that it is working till

commit 2e477391522354e763aa62ee3e281c1ad9e8eb1b Author: Dafna Hirschfeld dafna.hirschfeld@collabora.com

We also encountered that warning on mt8173 device - Acer Chromebook R13. It happen after resuming from suspend to ram. We could not find a version that works and we were not able to find the fix of the bug. It seems like the irq isr is not called after resuming from suspend. Please share if you have new findings regarding that bug.

Thanks, Dafna

Gesendet: Donnerstag, 08. Juli 2021 um 14:30 Uhr Von: "Dafna Hirschfeld" dafna.hirschfeld@collabora.com

...

i see both messages, but mtk_crtc_ddp_irq is never called and so the other 2 not.

Yes, In my case the irq isr is also not called after resume which cause the warning even though "enable_vblank" do get called. Don't know why is that.

...

comp->funcs->enable_vblank should be mtk_drm_crtc_enable_vblank, right?

No, this is a bit confusing , there are also the funcs of the components, see in file mtk_drm_ddp_comp.c so for mt7623 it is mtk_ovl_enable_vblank.

thanks for pointing to this. in this function another struct is filled with the callback+data, and this callback seems to be called mtk_disp_ovl_irq_handler which name suggests also a irq as trigger

412 ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, 413 IRQF_TRIGGER_NONE, dev_name(dev), priv); 414 if (ret < 0) { 415 dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); 416 return ret; 417 }

as i don't see this error in dmesg, i guess the registration was successful. added again some debug and it looks like the interrupt callback (mtk_disp_ovl_irq_handler) is not called

[ 5.125002] DEBUG: Passed mtk_disp_ovl_probe 416 int reg:0 [ 6.344029] DEBUG: Passed mtk_drm_crtc_enable_vblank 510 [ 6.344051] DEBUG: Passed mtk_ddp_comp_enable_vblank 117 [ 6.344057] DEBUG: Passed mtk_ovl_enable_vblank 107 [ 6.344062] DEBUG: Passed mtk_ovl_enable_vblank 112 [ 6.344066] DEBUG: Passed mtk_ddp_comp_enable_vblank 121

--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -86,6 +86,7 @@ static irqreturn_t mtk_disp_ovl_irq_handler(int irq, void *dev_id) { struct mtk_disp_ovl *priv = dev_id;

+printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); /* Clear frame completion interrupt */ writel(0x0, priv->regs + DISP_REG_OVL_INTSTA);

@@ -93,6 +94,7 @@ static irqreturn_t mtk_disp_ovl_irq_handler(int irq, void *dev_id) return IRQ_NONE;

priv->vblank_cb(priv->vblank_cb_data); +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__);

return IRQ_HANDLED; } @@ -102,11 +104,12 @@ void mtk_ovl_enable_vblank(struct device *dev, void *vblank_cb_data) { struct mtk_disp_ovl *ovl = dev_get_drvdata(dev); - +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); ovl->vblank_cb = vblank_cb; ovl->vblank_cb_data = vblank_cb_data; writel(0x0, ovl->regs + DISP_REG_OVL_INTSTA); writel_relaxed(OVL_FME_CPL_INT, ovl->regs + DISP_REG_OVL_INTEN); +printk(KERN_ALERT "DEBUG: Passed %s %d \n",__FUNCTION__,__LINE__); }

void mtk_ovl_disable_vblank(struct device *dev) @@ -410,6 +413,7 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev)

ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, IRQF_TRIGGER_NONE, dev_name(dev), priv); +printk(KERN_ALERT "DEBUG: Passed %s %d int reg:%d\n",__FUNCTION__,__LINE__,ret); if (ret < 0) { dev_err(dev, "Failed to request irq %d: %d\n", irq, ret); return ret;

how can we trace this further? maybe watchdog related?

...

"watchdog: watchdog0: watchdog did not stop!"

i see this with my 5.13, 5.12-drm (5.12.0+mtk/core drm-patches) and 5.12.14 too (hdmi is working there), but not 5.12.0! that means something in drm-patches (mtk/core) breaks watchdog. maybe the recursion mentioned above?

Hi, Frank:

Frank Wunderlich frank-w@public-files.de 於 2021年7月9日 週五 下午7:28寫道：

...

Gesendet: Freitag, 09. Juli 2021 um 12:38 Uhr Von: "Frank Wunderlich" frank-w@public-files.de An: "Enric Balletbo Serra" eballetbo@gmail.com Cc: "CK Hu" ck.hu@mediatek.com, "Dafna Hirschfeld" dafna.hirschfeld@collabora.com, "chunkuang Hu" chunkuang.hu@kernel.org, "Thomas Zimmermann" tzimmermann@suse.de, "David Airlie" airlied@linux.ie, "linux-kernel" linux-kernel@vger.kernel.org, "Enric Balletbo i Serra" enric.balletbo@collabora.com, "moderated list:ARM/Mediatek SoC support" linux-mediatek@lists.infradead.org, "dri-devel" dri-devel@lists.freedesktop.org, "Matthias Brugger" matthias.bgg@gmail.com, "Collabora Kernel ML" kernel@collabora.com Betreff: Aw: Re: Re: BUG: MTK DRM/HDMI broken on 5.13 (mt7623/bpi-r2)

...

Gesendet: Freitag, 09. Juli 2021 um 12:24 Uhr Von: "Enric Balletbo Serra" eballetbo@gmail.com If this is the offending commit, could you try if the following patch fixes the issue for you?

https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/commi...

If not, and that patch is the offending commit, it probably means that the default routing table doesn't work for mt7623. Needs a specific soc table.

Hi Eric,

thanks for response, but it does not fix the issue for me. hdmi on mt7623 is DPI not DSI. There is already a mt7623 specific routing-table defined (one for DPI/HDMI and one for external=DSI/MIPI):

https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/mediatek/mtk_...

maybe it can be included or compared with the "default" route?

regards Frank

Hi

i tried to convert the old routing table into the new format

diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index 080660ef11bf..134dae13382f 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -20,6 +20,12 @@ static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_default_routing_table), };

+static const struct mtk_mmsys_driver_data mt7623_mmsys_driver_data = {

•   .clk_driver = "clk-mt2701-mm",
  

•   .routes = mmsys_mt7623_routing_table,
  

•   .num_routes = ARRAY_SIZE(mmsys_mt7623_routing_table),
  

+};

static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { .clk_driver = "clk-mt2712-mm", .routes = mmsys_default_routing_table, @@ -133,6 +139,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = { .compatible = "mediatek,mt2701-mmsys", .data = &mt2701_mmsys_driver_data, },

•   {
  

•           .compatible = "mediatek,mt7623-mmsys",
  

•           .data = &mt7623_mmsys_driver_data,
  

•   },
    {
            .compatible = "mediatek,mt2712-mmsys",
            .data = &mt2712_mmsys_driver_data,
  

diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h index 11388961dded..fd397f68339c 100644 --- a/drivers/soc/mediatek/mtk-mmsys.h +++ b/drivers/soc/mediatek/mtk-mmsys.h @@ -214,5 +214,14 @@ static const struct mtk_mmsys_routes mmsys_default_routing_table[] = { DISP_REG_CONFIG_DISP_UFOE_MOUT_EN, UFOE_MOUT_EN_DSI0, } };

+static const struct mtk_mmsys_routes mmsys_mt7623_routing_table[] = {

•   //HDMI
  

•   {
  

•           DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0,
  

•           DISP_REG_CONFIG_DISP_OVL_MOUT_EN, OVL_MOUT_EN_RDMA
  

•   }, {
  

•           DDP_COMPONENT_RDMA0, DDP_COMPONENT_DPI0,
  

•           DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN, RDMA0_SOUT_DPI0
  

•   }
  

+}; #endif /* __SOC_MEDIATEK_MTK_MMSYS_H */ :...skipping... diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c index 080660ef11bf..134dae13382f 100644 --- a/drivers/soc/mediatek/mtk-mmsys.c +++ b/drivers/soc/mediatek/mtk-mmsys.c @@ -20,6 +20,12 @@ static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { .num_routes = ARRAY_SIZE(mmsys_default_routing_table), };

+static const struct mtk_mmsys_driver_data mt7623_mmsys_driver_data = {

•   .clk_driver = "clk-mt2701-mm",//leave clock as mt7623 is based on mt2701
  

•   .routes = mmsys_mt7623_routing_table,
  

•   .num_routes = ARRAY_SIZE(mmsys_mt7623_routing_table),
  

+};

static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { .clk_driver = "clk-mt2712-mm", .routes = mmsys_default_routing_table, @@ -133,6 +139,10 @@ static const struct of_device_id of_match_mtk_mmsys[] = { .compatible = "mediatek,mt2701-mmsys", .data = &mt2701_mmsys_driver_data, },

•   {
  

•           .compatible = "mediatek,mt7623-mmsys",
  

•           .data = &mt7623_mmsys_driver_data,
  

•   },
    {
            .compatible = "mediatek,mt2712-mmsys",
            .data = &mt2712_mmsys_driver_data,
  

diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h index 11388961dded..fd397f68339c 100644 --- a/drivers/soc/mediatek/mtk-mmsys.h +++ b/drivers/soc/mediatek/mtk-mmsys.h @@ -214,5 +214,14 @@ static const struct mtk_mmsys_routes mmsys_default_routing_table[] = { DISP_REG_CONFIG_DISP_UFOE_MOUT_EN, UFOE_MOUT_EN_DSI0, } };

+static const struct mtk_mmsys_routes mmsys_mt7623_routing_table[] = {

•   //HDMI
  

•   {
  

•           DDP_COMPONENT_OVL0, DDP_COMPONENT_RDMA0,
  

•           DISP_REG_CONFIG_DISP_OVL_MOUT_EN, OVL_MOUT_EN_RDMA
  

•   }, {
  

•           DDP_COMPONENT_RDMA0, DDP_COMPONENT_DPI0,
  

•           DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN, RDMA0_SOUT_DPI0
  

•   }
  

+};

here i've left out COLOR0 and BLS because i have not found the 3rd (address) and 4th params (value) for the routing between them and edging components

this is the old route:

    DDP_COMPONENT_OVL0,
    DDP_COMPONENT_RDMA0,
    DDP_COMPONENT_COLOR0,
    DDP_COMPONENT_BLS,
    DDP_COMPONENT_DPI0,

so i guess i need:

DISP_REG_CONFIG_DISP_RDMA0_MOUT_EN, RDMA0_MOUT_EN_COLOR0 DISP_REG_CONFIG_DISP_COLOR0_MOUT_EN, COLOR0_MOUT_EN_BLS DISP_REG_CONFIG_DISP_BLS_MOUT_EN, BLS_MOUT_EN_DPI0

thinking OUT is right for display...it's no HDMI-in but i'm unsure whats the difference between MOUT and SOUT

compatible for mmsys is already set to mediatek,mt7623-mmsys in arch/arm/boot/dts/mt7623n.dtsi but it's not working, i guess because color0 and bls are missing in route

any hint how to add them?

SOUT means even though data could output to multiple sink, but could only output to single sink at one moment. MOUT means data could output to multiple sink at one moment. For SOUT with 4 sink output, the value for each sink would be 0, 1, 2, 3. For MOUT with 4 sink output, the value for each sink would be BIT(0), BIT(1), BIT(2), BIT(3). [1] is my original design, and it has 'mask' in struct mtk_mmsys_conn_cfg. For SOUT with 4 sink output, the mask would be 0x3. For MOUT with 4 sink output, the mask would be 0xf. You could try to add back the mask.

[1] https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2...

Regards, Chun-Kuang.

regards Frank