* [PATCH] accel/ivpu: Use firmware names from upstream repo
@ 2025-05-06 9:20 Jacek Lawrynowicz
2025-05-06 15:41 ` Lizhi Hou
2025-05-28 9:52 ` Jacek Lawrynowicz
0 siblings, 2 replies; 6+ messages in thread
From: Jacek Lawrynowicz @ 2025-05-06 9:20 UTC (permalink / raw)
To: dri-devel; +Cc: jeff.hugo, lizhi.hou, Jacek Lawrynowicz, stable
Use FW names from linux-firmware repo instead of deprecated ones.
Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
Cc: <stable@vger.kernel.org> # v6.13+
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
---
drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
index ccaaf6c100c02..9db741695401e 100644
--- a/drivers/accel/ivpu/ivpu_fw.c
+++ b/drivers/accel/ivpu/ivpu_fw.c
@@ -55,18 +55,18 @@ static struct {
int gen;
const char *name;
} fw_names[] = {
- { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
+ { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
{ IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
- { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
+ { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
{ IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
- { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
+ { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
{ IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
};
/* Production fw_names from the table above */
-MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
-MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
-MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
+MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
+MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
+MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");
static int ivpu_fw_request(struct ivpu_device *vdev)
{
--
2.45.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] accel/ivpu: Use firmware names from upstream repo
2025-05-06 9:20 [PATCH] accel/ivpu: Use firmware names from upstream repo Jacek Lawrynowicz
@ 2025-05-06 15:41 ` Lizhi Hou
2025-05-07 6:59 ` Jacek Lawrynowicz
2025-05-28 9:52 ` Jacek Lawrynowicz
1 sibling, 1 reply; 6+ messages in thread
From: Lizhi Hou @ 2025-05-06 15:41 UTC (permalink / raw)
To: Jacek Lawrynowicz, dri-devel; +Cc: jeff.hugo, stable
On 5/6/25 02:20, Jacek Lawrynowicz wrote:
> Use FW names from linux-firmware repo instead of deprecated ones.
>
> Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
> Cc: <stable@vger.kernel.org> # v6.13+
> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> ---
> drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
> index ccaaf6c100c02..9db741695401e 100644
> --- a/drivers/accel/ivpu/ivpu_fw.c
> +++ b/drivers/accel/ivpu/ivpu_fw.c
> @@ -55,18 +55,18 @@ static struct {
> int gen;
> const char *name;
> } fw_names[] = {
> - { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
> + { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
What if old only vpu_37xx.bin is installed but not intel/vpu/vpu_37xx_v1?
Maybe just put *_v1 line in front without removing { ..., "vpu_37xx.bin"} ?
Thanks,
Lizhi
> { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
> - { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
> + { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
> { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
> - { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
> + { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
> { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
> };
>
> /* Production fw_names from the table above */
> -MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
> -MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
> -MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
> +MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
> +MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
> +MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");
>
> static int ivpu_fw_request(struct ivpu_device *vdev)
> {
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] accel/ivpu: Use firmware names from upstream repo
2025-05-06 15:41 ` Lizhi Hou
@ 2025-05-07 6:59 ` Jacek Lawrynowicz
2025-05-07 15:24 ` Lizhi Hou
0 siblings, 1 reply; 6+ messages in thread
From: Jacek Lawrynowicz @ 2025-05-07 6:59 UTC (permalink / raw)
To: Lizhi Hou, dri-devel; +Cc: jeff.hugo, stable
Hi,
On 5/6/2025 5:41 PM, Lizhi Hou wrote:
>
> On 5/6/25 02:20, Jacek Lawrynowicz wrote:
>> Use FW names from linux-firmware repo instead of deprecated ones.
>>
>> Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
>> Cc: <stable@vger.kernel.org> # v6.13+
>> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>> ---
>> drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
>> index ccaaf6c100c02..9db741695401e 100644
>> --- a/drivers/accel/ivpu/ivpu_fw.c
>> +++ b/drivers/accel/ivpu/ivpu_fw.c
>> @@ -55,18 +55,18 @@ static struct {
>> int gen;
>> const char *name;
>> } fw_names[] = {
>> - { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
>> + { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
>
> What if old only vpu_37xx.bin is installed but not intel/vpu/vpu_37xx_v1?
>
> Maybe just put *_v1 line in front without removing { ..., "vpu_37xx.bin"} ?
>
The vpu_37xx.bin style names were never released. This was only for developer convenience but it turns out that developers don't use this anymore, so it is safe to remove. Maybe it make sense to mention this in commit message :)
>
>> { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
>> - { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
>> + { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
>> { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
>> - { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
>> + { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
>> { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
>> };
>> /* Production fw_names from the table above */
>> -MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
>> -MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
>> -MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
>> +MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
>> +MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
>> +MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");
>> static int ivpu_fw_request(struct ivpu_device *vdev)
>> {
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] accel/ivpu: Use firmware names from upstream repo
2025-05-07 6:59 ` Jacek Lawrynowicz
@ 2025-05-07 15:24 ` Lizhi Hou
2025-05-12 18:36 ` Jeff Hugo
0 siblings, 1 reply; 6+ messages in thread
From: Lizhi Hou @ 2025-05-07 15:24 UTC (permalink / raw)
To: Jacek Lawrynowicz, dri-devel; +Cc: jeff.hugo, stable
On 5/6/25 23:59, Jacek Lawrynowicz wrote:
> Hi,
>
> On 5/6/2025 5:41 PM, Lizhi Hou wrote:
>> On 5/6/25 02:20, Jacek Lawrynowicz wrote:
>>> Use FW names from linux-firmware repo instead of deprecated ones.
>>>
>>> Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
>>> Cc: <stable@vger.kernel.org> # v6.13+
>>> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>>> ---
>>> drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
>>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
>>> index ccaaf6c100c02..9db741695401e 100644
>>> --- a/drivers/accel/ivpu/ivpu_fw.c
>>> +++ b/drivers/accel/ivpu/ivpu_fw.c
>>> @@ -55,18 +55,18 @@ static struct {
>>> int gen;
>>> const char *name;
>>> } fw_names[] = {
>>> - { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
>>> + { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
>> What if old only vpu_37xx.bin is installed but not intel/vpu/vpu_37xx_v1?
>>
>> Maybe just put *_v1 line in front without removing { ..., "vpu_37xx.bin"} ?
>>
> The vpu_37xx.bin style names were never released. This was only for developer convenience but it turns out that developers don't use this anymore, so it is safe to remove. Maybe it make sense to mention this in commit message :)
Sounds great.
Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
>
>>> { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
>>> - { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
>>> + { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
>>> { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
>>> - { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
>>> + { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
>>> { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
>>> };
>>> /* Production fw_names from the table above */
>>> -MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
>>> -MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
>>> -MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
>>> +MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
>>> +MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
>>> +MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");
>>> static int ivpu_fw_request(struct ivpu_device *vdev)
>>> {
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] accel/ivpu: Use firmware names from upstream repo
2025-05-07 15:24 ` Lizhi Hou
@ 2025-05-12 18:36 ` Jeff Hugo
0 siblings, 0 replies; 6+ messages in thread
From: Jeff Hugo @ 2025-05-12 18:36 UTC (permalink / raw)
To: Lizhi Hou, Jacek Lawrynowicz, dri-devel; +Cc: stable
On 5/7/2025 9:24 AM, Lizhi Hou wrote:
>
> On 5/6/25 23:59, Jacek Lawrynowicz wrote:
>> Hi,
>>
>> On 5/6/2025 5:41 PM, Lizhi Hou wrote:
>>> On 5/6/25 02:20, Jacek Lawrynowicz wrote:
>>>> Use FW names from linux-firmware repo instead of deprecated ones.
>>>>
>>>> Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
>>>> Cc: <stable@vger.kernel.org> # v6.13+
>>>> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>>>> ---
>>>> drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
>>>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/
>>>> ivpu_fw.c
>>>> index ccaaf6c100c02..9db741695401e 100644
>>>> --- a/drivers/accel/ivpu/ivpu_fw.c
>>>> +++ b/drivers/accel/ivpu/ivpu_fw.c
>>>> @@ -55,18 +55,18 @@ static struct {
>>>> int gen;
>>>> const char *name;
>>>> } fw_names[] = {
>>>> - { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
>>>> + { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
>>> What if old only vpu_37xx.bin is installed but not intel/vpu/
>>> vpu_37xx_v1?
>>>
>>> Maybe just put *_v1 line in front without removing { ...,
>>> "vpu_37xx.bin"} ?
>>>
>> The vpu_37xx.bin style names were never released. This was only for
>> developer convenience but it turns out that developers don't use this
>> anymore, so it is safe to remove. Maybe it make sense to mention this
>> in commit message :)
>
> Sounds great.
>
> Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] accel/ivpu: Use firmware names from upstream repo
2025-05-06 9:20 [PATCH] accel/ivpu: Use firmware names from upstream repo Jacek Lawrynowicz
2025-05-06 15:41 ` Lizhi Hou
@ 2025-05-28 9:52 ` Jacek Lawrynowicz
1 sibling, 0 replies; 6+ messages in thread
From: Jacek Lawrynowicz @ 2025-05-28 9:52 UTC (permalink / raw)
To: dri-devel; +Cc: jeff.hugo, lizhi.hou, stable
Applied to drm-misc-fixes
On 5/6/2025 11:20 AM, Jacek Lawrynowicz wrote:
> Use FW names from linux-firmware repo instead of deprecated ones.
>
> Fixes: c140244f0cfb ("accel/ivpu: Add initial Panther Lake support")
> Cc: <stable@vger.kernel.org> # v6.13+
> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> ---
> drivers/accel/ivpu/ivpu_fw.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c
> index ccaaf6c100c02..9db741695401e 100644
> --- a/drivers/accel/ivpu/ivpu_fw.c
> +++ b/drivers/accel/ivpu/ivpu_fw.c
> @@ -55,18 +55,18 @@ static struct {
> int gen;
> const char *name;
> } fw_names[] = {
> - { IVPU_HW_IP_37XX, "vpu_37xx.bin" },
> + { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v1.bin" },
> { IVPU_HW_IP_37XX, "intel/vpu/vpu_37xx_v0.0.bin" },
> - { IVPU_HW_IP_40XX, "vpu_40xx.bin" },
> + { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v1.bin" },
> { IVPU_HW_IP_40XX, "intel/vpu/vpu_40xx_v0.0.bin" },
> - { IVPU_HW_IP_50XX, "vpu_50xx.bin" },
> + { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v1.bin" },
> { IVPU_HW_IP_50XX, "intel/vpu/vpu_50xx_v0.0.bin" },
> };
>
> /* Production fw_names from the table above */
> -MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin");
> -MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin");
> -MODULE_FIRMWARE("intel/vpu/vpu_50xx_v0.0.bin");
> +MODULE_FIRMWARE("intel/vpu/vpu_37xx_v1.bin");
> +MODULE_FIRMWARE("intel/vpu/vpu_40xx_v1.bin");
> +MODULE_FIRMWARE("intel/vpu/vpu_50xx_v1.bin");
>
> static int ivpu_fw_request(struct ivpu_device *vdev)
> {
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-05-28 9:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-06 9:20 [PATCH] accel/ivpu: Use firmware names from upstream repo Jacek Lawrynowicz
2025-05-06 15:41 ` Lizhi Hou
2025-05-07 6:59 ` Jacek Lawrynowicz
2025-05-07 15:24 ` Lizhi Hou
2025-05-12 18:36 ` Jeff Hugo
2025-05-28 9:52 ` Jacek Lawrynowicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).