From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mikko Perttunen Subject: Re: [PATCH] arm: drm: tegra: Set MODULE_FIRMWARE for the VIC Date: Mon, 10 Jul 2017 11:57:47 +0300 Message-ID: <1a36594d-bb0a-87ef-c348-d05d64a100d2@kapsi.fi> References: <20170705211523.17542-1-kwizart@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170705211523.17542-1-kwizart-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Nicolas Chauvet , amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-tegra@vger.kernel.org On 06.07.2017 00:15, Nicolas Chauvet wrote: > The define is set anyway to prevent an empty string. > The test for the soc is same as nouveau for the tegra gpu firmware > (see drivers/gpu/drm/nouveau/nouveau_platform.c) > > Fixes: 0ae797a8ba05 ("drm/tegra: Add VIC support") > > Signed-off-by: Nicolas Chauvet > --- > drivers/gpu/drm/tegra/vic.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/vic.c b/drivers/gpu/drm/tegra/vic.c > index cd804e404a11..b329c9368b74 100644 > --- a/drivers/gpu/drm/tegra/vic.c > +++ b/drivers/gpu/drm/tegra/vic.c > @@ -23,6 +23,17 @@ > #include "falcon.h" > #include "vic.h" > > +#define NVIDIA_TEGRA_124_VIC_FIRMWARE "nvidia/tegra124/vic03_ucode.bin" > +#define NVIDIA_TEGRA_210_VIC_FIRMWARE "nvidia/tegra210/vic04_ucode.bin" > + > +#if IS_ENABLED(CONFIG_ARCH_TEGRA_124_SOC) > +MODULE_FIRMWARE(NVIDIA_TEGRA_124_VIC_FIRMWARE); > +#endif > +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) > +MODULE_FIRMWARE(NVIDIA_TEGRA_210_VIC_FIRMWARE); > +#endif > + > + I'd prefer to have the defines above each chip's vic_config struct definition, and the MODULE_FIRMWARE() part at the end of the file, like MODULE_* macros usually are. With that, Reviewed-by: Mikko Perttunen > struct vic_config { > const char *firmware; > }; > @@ -259,11 +270,11 @@ static const struct tegra_drm_client_ops vic_ops = { > }; > > static const struct vic_config vic_t124_config = { > - .firmware = "nvidia/tegra124/vic03_ucode.bin", > + .firmware = NVIDIA_TEGRA_124_VIC_FIRMWARE, > }; > > static const struct vic_config vic_t210_config = { > - .firmware = "nvidia/tegra210/vic04_ucode.bin", > + .firmware = NVIDIA_TEGRA_210_VIC_FIRMWARE, > }; > > static const struct of_device_id vic_match[] = { >