| Message ID | 20220406135920.129589-1-jonathanh@nvidia.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | ARM: tegra_defconfig: Fix enabling of the Tegra VDE driver | expand |
On 4/6/22 16:59, Jon Hunter wrote: > Commit 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") moved > the Tegra VDE driver out of staging and updated the Kconfig symbol for > enabling the driver from CONFIG_TEGRA_VDE to CONFIG_VIDEO_TEGRA_VDE. > However, the tegra_defconfig was not updated and so the driver is no > longer enabled by default. Furthermore, now that the Tegra VDE driver > has been moved under the Kconfig symbol CONFIG_V4L_MEM2MEM_DRIVERS, it > is now also necessary to enable CONFIG_V4L_MEM2MEM_DRIVERS in order to > enable CONFIG_VIDEO_TEGRA_VDE. Fix this by ensuring that > CONFIG_V4L_MEM2MEM_DRIVERS and CONFIG_VIDEO_TEGRA_VDE are both enabled > in the tegra_defconfig. > > Fixes: 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- > arch/arm/configs/tegra_defconfig | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig > index 289d022acc4b..c209722399d7 100644 > --- a/arch/arm/configs/tegra_defconfig > +++ b/arch/arm/configs/tegra_defconfig > @@ -286,7 +286,8 @@ CONFIG_SERIO_NVEC_PS2=y > CONFIG_NVEC_POWER=y > CONFIG_NVEC_PAZ00=y > CONFIG_STAGING_MEDIA=y > -CONFIG_TEGRA_VDE=y > +CONFIG_V4L_MEM2MEM_DRIVERS=y > +CONFIG_VIDEO_TEGRA_VDE=y > CONFIG_CHROME_PLATFORMS=y > CONFIG_CROS_EC=y > CONFIG_CROS_EC_I2C=m There are per-existing patches updating the defconfigs, unfortunately they were not applied together with the driver patches. https://patchwork.ozlabs.org/project/linux-tegra/patch/20220220204623.30107-8-digetx@gmail.com/ https://patchwork.ozlabs.org/project/linux-tegra/patch/20220220204623.30107-9-digetx@gmail.com/
On 06/04/2022 15:37, Dmitry Osipenko wrote: > On 4/6/22 16:59, Jon Hunter wrote: >> Commit 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") moved >> the Tegra VDE driver out of staging and updated the Kconfig symbol for >> enabling the driver from CONFIG_TEGRA_VDE to CONFIG_VIDEO_TEGRA_VDE. >> However, the tegra_defconfig was not updated and so the driver is no >> longer enabled by default. Furthermore, now that the Tegra VDE driver >> has been moved under the Kconfig symbol CONFIG_V4L_MEM2MEM_DRIVERS, it >> is now also necessary to enable CONFIG_V4L_MEM2MEM_DRIVERS in order to >> enable CONFIG_VIDEO_TEGRA_VDE. Fix this by ensuring that >> CONFIG_V4L_MEM2MEM_DRIVERS and CONFIG_VIDEO_TEGRA_VDE are both enabled >> in the tegra_defconfig. >> >> Fixes: 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> >> --- >> arch/arm/configs/tegra_defconfig | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig >> index 289d022acc4b..c209722399d7 100644 >> --- a/arch/arm/configs/tegra_defconfig >> +++ b/arch/arm/configs/tegra_defconfig >> @@ -286,7 +286,8 @@ CONFIG_SERIO_NVEC_PS2=y >> CONFIG_NVEC_POWER=y >> CONFIG_NVEC_PAZ00=y >> CONFIG_STAGING_MEDIA=y >> -CONFIG_TEGRA_VDE=y >> +CONFIG_V4L_MEM2MEM_DRIVERS=y >> +CONFIG_VIDEO_TEGRA_VDE=y >> CONFIG_CHROME_PLATFORMS=y >> CONFIG_CROS_EC=y >> CONFIG_CROS_EC_I2C=m > > There are per-existing patches updating the defconfigs, unfortunately > they were not applied together with the driver patches. > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Flinux-tegra%2Fpatch%2F20220220204623.30107-8-digetx%40gmail.com%2F&data=04%7C01%7Cjonathanh%40nvidia.com%7C98f0277ce8b74700664508da17daf665%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637848526453449366%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=BsHhvVKHeDSg%2BAyGIswF0CMay0vcgucnaDD8D%2FUwLRU%3D&reserved=0 > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Flinux-tegra%2Fpatch%2F20220220204623.30107-9-digetx%40gmail.com%2F&data=04%7C01%7Cjonathanh%40nvidia.com%7C98f0277ce8b74700664508da17daf665%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637848526453449366%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=mjA88k40mPaX6V2TCDKd4S8AQTUBC6rwq9VKwyIntPw%3D&reserved=0 Thanks. Thierry, can we get these applied for v5.18-rc? This is triggering some test failures. Jon
On Wed, Apr 06, 2022 at 03:58:25PM +0100, Jon Hunter wrote: > > On 06/04/2022 15:37, Dmitry Osipenko wrote: > > On 4/6/22 16:59, Jon Hunter wrote: > > > Commit 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") moved > > > the Tegra VDE driver out of staging and updated the Kconfig symbol for > > > enabling the driver from CONFIG_TEGRA_VDE to CONFIG_VIDEO_TEGRA_VDE. > > > However, the tegra_defconfig was not updated and so the driver is no > > > longer enabled by default. Furthermore, now that the Tegra VDE driver > > > has been moved under the Kconfig symbol CONFIG_V4L_MEM2MEM_DRIVERS, it > > > is now also necessary to enable CONFIG_V4L_MEM2MEM_DRIVERS in order to > > > enable CONFIG_VIDEO_TEGRA_VDE. Fix this by ensuring that > > > CONFIG_V4L_MEM2MEM_DRIVERS and CONFIG_VIDEO_TEGRA_VDE are both enabled > > > in the tegra_defconfig. > > > > > > Fixes: 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") > > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > > > --- > > > arch/arm/configs/tegra_defconfig | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig > > > index 289d022acc4b..c209722399d7 100644 > > > --- a/arch/arm/configs/tegra_defconfig > > > +++ b/arch/arm/configs/tegra_defconfig > > > @@ -286,7 +286,8 @@ CONFIG_SERIO_NVEC_PS2=y > > > CONFIG_NVEC_POWER=y > > > CONFIG_NVEC_PAZ00=y > > > CONFIG_STAGING_MEDIA=y > > > -CONFIG_TEGRA_VDE=y > > > +CONFIG_V4L_MEM2MEM_DRIVERS=y > > > +CONFIG_VIDEO_TEGRA_VDE=y > > > CONFIG_CHROME_PLATFORMS=y > > > CONFIG_CROS_EC=y > > > CONFIG_CROS_EC_I2C=m > > > > There are per-existing patches updating the defconfigs, unfortunately > > they were not applied together with the driver patches. > > > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Flinux-tegra%2Fpatch%2F20220220204623.30107-8-digetx%40gmail.com%2F&data=04%7C01%7Cjonathanh%40nvidia.com%7C98f0277ce8b74700664508da17daf665%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637848526453449366%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=BsHhvVKHeDSg%2BAyGIswF0CMay0vcgucnaDD8D%2FUwLRU%3D&reserved=0 > > > > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fproject%2Flinux-tegra%2Fpatch%2F20220220204623.30107-9-digetx%40gmail.com%2F&data=04%7C01%7Cjonathanh%40nvidia.com%7C98f0277ce8b74700664508da17daf665%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637848526453449366%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=mjA88k40mPaX6V2TCDKd4S8AQTUBC6rwq9VKwyIntPw%3D&reserved=0 > > Thanks. > > Thierry, can we get these applied for v5.18-rc? This is triggering some test > failures. Yes, I've applied Dmitry's patches to the Tegra tree now and will let it cook in linux-next for a couple of days and send a PR for v5.18-rc2 or 3 later this week or early next week. Thierry
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index 289d022acc4b..c209722399d7 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -286,7 +286,8 @@ CONFIG_SERIO_NVEC_PS2=y CONFIG_NVEC_POWER=y CONFIG_NVEC_PAZ00=y CONFIG_STAGING_MEDIA=y -CONFIG_TEGRA_VDE=y +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_TEGRA_VDE=y CONFIG_CHROME_PLATFORMS=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=m
Commit 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") moved the Tegra VDE driver out of staging and updated the Kconfig symbol for enabling the driver from CONFIG_TEGRA_VDE to CONFIG_VIDEO_TEGRA_VDE. However, the tegra_defconfig was not updated and so the driver is no longer enabled by default. Furthermore, now that the Tegra VDE driver has been moved under the Kconfig symbol CONFIG_V4L_MEM2MEM_DRIVERS, it is now also necessary to enable CONFIG_V4L_MEM2MEM_DRIVERS in order to enable CONFIG_VIDEO_TEGRA_VDE. Fix this by ensuring that CONFIG_V4L_MEM2MEM_DRIVERS and CONFIG_VIDEO_TEGRA_VDE are both enabled in the tegra_defconfig. Fixes: 8bd4aaf438e3 ("media: staging: tegra-vde: De-stage driver") Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- arch/arm/configs/tegra_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)