Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20200406051131.225748-1-hsinyi@chromium.org>
In-Reply-To: <20200406051131.225748-1-hsinyi@chromium.org>
From:   Chun-Kuang Hu <chunkuang.hu@kernel.org>
Date:   Tue, 7 Apr 2020 00:56:49 +0800
Message-ID: <CAAOTY_9zKbSsYmq7BrQdu3h1zTNYcX3WiFjGaiB1=x8eUA4ogg@mail.gmail.com>
Subject: Re: [PATCH] drm: mediatek: fix device passed to cmdq
To:     Hsin-Yi Wang <hsinyi@chromium.org>
Cc:     linux-arm-kernel@lists.infradead.org,
        Enric Balletbo i Serra <enric.balletbo@collabora.com>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        linux-kernel@vger.kernel.org,
        DRI Development <dri-devel@lists.freedesktop.org>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        linux-mediatek@lists.infradead.org,
        Daniel Vetter <daniel@ffwll.ch>, CK Hu <ck.hu@mediatek.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi, Hsin-Yi:

Hsin-Yi Wang <hsinyi@chromium.org> =E6=96=BC 2020=E5=B9=B44=E6=9C=886=E6=97=
=A5 =E9=80=B1=E4=B8=80 =E4=B8=8B=E5=8D=881:12=E5=AF=AB=E9=81=93=EF=BC=9A
>
> drm device is now probed from mmsys. We need to use mmsys device to get g=
ce
> nodes. Fix following errors:
>
> [    0.740068] mediatek-drm mediatek-drm.1.auto: error -2 can't parse gce=
-client-reg property (0)
> [    0.748721] mediatek-drm mediatek-drm.1.auto: error -2 can't parse gce=
-client-reg property (0)
> ...
> [    2.659645] mediatek-drm mediatek-drm.1.auto: failed to request channe=
l
> [    2.666270] mediatek-drm mediatek-drm.1.auto: failed to request channe=
l

Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

>
> Fixes: 1d367541aded ("soc / drm: mediatek: Fix mediatek-drm device probin=
g")
> Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 6 ++++--
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c  | 3 ++-
>  2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/me=
diatek/mtk_drm_crtc.c
> index 615a54e60fe2..8621f0289399 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -822,14 +822,16 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
>
>  #if IS_REACHABLE(CONFIG_MTK_CMDQ)
>         mtk_crtc->cmdq_client =3D
> -                       cmdq_mbox_create(dev, drm_crtc_index(&mtk_crtc->b=
ase),
> +                       cmdq_mbox_create(mtk_crtc->mmsys_dev,
> +                                        drm_crtc_index(&mtk_crtc->base),
>                                          2000);
>         if (IS_ERR(mtk_crtc->cmdq_client)) {
>                 dev_dbg(dev, "mtk_crtc %d failed to create mailbox client=
, writing register by CPU now\n",
>                         drm_crtc_index(&mtk_crtc->base));
>                 mtk_crtc->cmdq_client =3D NULL;
>         }
> -       ret =3D of_property_read_u32_index(dev->of_node, "mediatek,gce-ev=
ents",
> +       ret =3D of_property_read_u32_index(mtk_crtc->mmsys_dev->of_node,
> +                                        "mediatek,gce-events",
>                                          drm_crtc_index(&mtk_crtc->base),
>                                          &mtk_crtc->cmdq_event);
>         if (ret)
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/med=
iatek/mtk_drm_drv.c
> index e2bb0d19ef99..dc78e86bccc0 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -517,7 +517,8 @@ static int mtk_drm_probe(struct platform_device *pdev=
)
>                                 goto err_node;
>                         }
>
> -                       ret =3D mtk_ddp_comp_init(dev, node, comp, comp_i=
d, NULL);
> +                       ret =3D mtk_ddp_comp_init(dev->parent, node, comp=
,
> +                                               comp_id, NULL);
>                         if (ret) {
>                                 of_node_put(node);
>                                 goto err_node;
> --
> 2.26.0.292.g33ef6b2f38-goog
>
>
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek