| Message ID | 20221216132404.1173254-1-wenst@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: hantro: Use core-generated bus_info value | expand |
On Fri, Dec 16, 2022 at 7:46 AM Chen-Yu Tsai <wenst@chromium.org> wrote: > > The Hantro driver uses a hardcoded value for the bus_info field in the > media device and |struct v4l2_capability|. This worked well when there > was just one device. However with the iMX.8 series we are now seeing > two Hantro blocks on the same chip. The static bus_info is no longer > sufficient for differentiating devices. > > Since commit f2d8b6917f3b ("media: v4l: ioctl: Set bus_info in > v4l_querycap()"), the V4L2 core provides a default value for the > bus_info field for platform and PCI devices. This value will match > the default value for media devices added by commit cef699749f37 > ("media: mc: Set bus_info in media_device_init()"). These defaults > are stable and device-specific. > > Drop the static bus_info values from the hantro driver and use the > defaults. > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > --- > arch/arm64/boot/dts/freescale/Makefile | 1 + > drivers/media/platform/verisilicon/hantro_drv.c | 2 -- > drivers/media/platform/verisilicon/hantro_v4l2.c | 2 -- > 3 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > index ef6f364eaa18..ef815442c78b 100644 > --- a/arch/arm64/boot/dts/freescale/Makefile > +++ b/arch/arm64/boot/dts/freescale/Makefile > @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-data-modul-edm-sbc.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-emcon-avari.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-hummingboard-pulse.dtb I think the makefile was edited by mistake. > dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-ctouch2.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-edimm2.2.dtb > dtb-$(CONFIG_ARCH_MXC) += imx8mm-innocomm-wb15-evk.dtb > diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c > index 8cb4a68c9119..b0aeedae7b65 100644 > --- a/drivers/media/platform/verisilicon/hantro_drv.c > +++ b/drivers/media/platform/verisilicon/hantro_drv.c > @@ -1050,8 +1050,6 @@ static int hantro_probe(struct platform_device *pdev) > > vpu->mdev.dev = vpu->dev; > strscpy(vpu->mdev.model, DRIVER_NAME, sizeof(vpu->mdev.model)); > - strscpy(vpu->mdev.bus_info, "platform: " DRIVER_NAME, > - sizeof(vpu->mdev.bus_info)); > media_device_init(&vpu->mdev); > vpu->mdev.ops = &hantro_m2m_media_ops; > vpu->v4l2_dev.mdev = &vpu->mdev; > diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c > index 2c7a805289e7..c1a116031013 100644 > --- a/drivers/media/platform/verisilicon/hantro_v4l2.c > +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c > @@ -142,8 +142,6 @@ static int vidioc_querycap(struct file *file, void *priv, > > strscpy(cap->driver, vpu->dev->driver->name, sizeof(cap->driver)); > strscpy(cap->card, vdev->name, sizeof(cap->card)); > - snprintf(cap->bus_info, sizeof(cap->bus_info), "platform: %s", > - vpu->dev->driver->name); > return 0; > } > > -- > 2.39.0.314.g84b9a713c41-goog >
On Wed, Dec 21, 2022 at 3:39 AM Adam Ford <aford173@gmail.com> wrote: > > On Fri, Dec 16, 2022 at 7:46 AM Chen-Yu Tsai <wenst@chromium.org> wrote: > > > > The Hantro driver uses a hardcoded value for the bus_info field in the > > media device and |struct v4l2_capability|. This worked well when there > > was just one device. However with the iMX.8 series we are now seeing > > two Hantro blocks on the same chip. The static bus_info is no longer > > sufficient for differentiating devices. > > > > Since commit f2d8b6917f3b ("media: v4l: ioctl: Set bus_info in > > v4l_querycap()"), the V4L2 core provides a default value for the > > bus_info field for platform and PCI devices. This value will match > > the default value for media devices added by commit cef699749f37 > > ("media: mc: Set bus_info in media_device_init()"). These defaults > > are stable and device-specific. > > > > Drop the static bus_info values from the hantro driver and use the > > defaults. > > > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > > --- > > arch/arm64/boot/dts/freescale/Makefile | 1 + > > drivers/media/platform/verisilicon/hantro_drv.c | 2 -- > > drivers/media/platform/verisilicon/hantro_v4l2.c | 2 -- > > 3 files changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > > index ef6f364eaa18..ef815442c78b 100644 > > --- a/arch/arm64/boot/dts/freescale/Makefile > > +++ b/arch/arm64/boot/dts/freescale/Makefile > > @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-data-modul-edm-sbc.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-emcon-avari.dtb > > dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb > > +dtb-$(CONFIG_ARCH_MXC) += imx8mm-hummingboard-pulse.dtb > > I think the makefile was edited by mistake. It was. I'll send a v2. On this topic though, has anyone else tried the i.MX8 Mini variant of the Hummingboard Pulse? I forward-ported the DT from SolidRun's 5.4 kernel and got it running and correct to a certain degree, but if the PMIC regulator driver is enabled, the board cuts out as soon as it is probed. ChenYu
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index ef6f364eaa18..ef815442c78b 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-data-modul-edm-sbc.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-ddr4-evk.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-emcon-avari.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-evk.dtb +dtb-$(CONFIG_ARCH_MXC) += imx8mm-hummingboard-pulse.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-ctouch2.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-icore-mx8mm-edimm2.2.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mm-innocomm-wb15-evk.dtb diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c index 8cb4a68c9119..b0aeedae7b65 100644 --- a/drivers/media/platform/verisilicon/hantro_drv.c +++ b/drivers/media/platform/verisilicon/hantro_drv.c @@ -1050,8 +1050,6 @@ static int hantro_probe(struct platform_device *pdev) vpu->mdev.dev = vpu->dev; strscpy(vpu->mdev.model, DRIVER_NAME, sizeof(vpu->mdev.model)); - strscpy(vpu->mdev.bus_info, "platform: " DRIVER_NAME, - sizeof(vpu->mdev.bus_info)); media_device_init(&vpu->mdev); vpu->mdev.ops = &hantro_m2m_media_ops; vpu->v4l2_dev.mdev = &vpu->mdev; diff --git a/drivers/media/platform/verisilicon/hantro_v4l2.c b/drivers/media/platform/verisilicon/hantro_v4l2.c index 2c7a805289e7..c1a116031013 100644 --- a/drivers/media/platform/verisilicon/hantro_v4l2.c +++ b/drivers/media/platform/verisilicon/hantro_v4l2.c @@ -142,8 +142,6 @@ static int vidioc_querycap(struct file *file, void *priv, strscpy(cap->driver, vpu->dev->driver->name, sizeof(cap->driver)); strscpy(cap->card, vdev->name, sizeof(cap->card)); - snprintf(cap->bus_info, sizeof(cap->bus_info), "platform: %s", - vpu->dev->driver->name); return 0; }
The Hantro driver uses a hardcoded value for the bus_info field in the media device and |struct v4l2_capability|. This worked well when there was just one device. However with the iMX.8 series we are now seeing two Hantro blocks on the same chip. The static bus_info is no longer sufficient for differentiating devices. Since commit f2d8b6917f3b ("media: v4l: ioctl: Set bus_info in v4l_querycap()"), the V4L2 core provides a default value for the bus_info field for platform and PCI devices. This value will match the default value for media devices added by commit cef699749f37 ("media: mc: Set bus_info in media_device_init()"). These defaults are stable and device-specific. Drop the static bus_info values from the hantro driver and use the defaults. Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> --- arch/arm64/boot/dts/freescale/Makefile | 1 + drivers/media/platform/verisilicon/hantro_drv.c | 2 -- drivers/media/platform/verisilicon/hantro_v4l2.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-)