[PATCH] drm/imagination: Fix missing pvr_power_fw_{en, dis}able() argument

[PATCH] drm/imagination: Fix missing pvr_power_fw_{en, dis}able() argument

[Javier Martinez Canillas]

Commit 42577ba79fbf ("drm/imagination: Rename FW booted to FW initialised")
dropped by mistake the last argument of the functions pvr_power_fw_enable()
and pvr_power_fw_disable(), leading to the following build error:

  CC [M]  drivers/gpu/drm/imagination/pvr_power.o
drivers/gpu/drm/imagination/pvr_power.c: In function ‘pvr_power_device_suspend’:
drivers/gpu/drm/imagination/pvr_power.c:382:23: error: too few arguments to function ‘pvr_power_fw_disable’; expected 3, have 2
  382 |                 err = pvr_power_fw_disable(pvr_dev, false);
      |                       ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imagination/pvr_power.c:93:1: note: declared here
   93 | pvr_power_fw_disable(struct pvr_device *pvr_dev, bool hard_reset, bool rpm_suspend)
      | ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imagination/pvr_power.c: In function ‘pvr_power_device_resume’:
drivers/gpu/drm/imagination/pvr_power.c:412:23: error: too few arguments to function ‘pvr_power_fw_enable’; expected 2, have 1
  412 |                 err = pvr_power_fw_enable(pvr_dev);
      |                       ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imagination/pvr_power.c:122:1: note: declared here
  122 | pvr_power_fw_enable(struct pvr_device *pvr_dev, bool rpm_resume)
      | ^~~~~~~~~~~~~~~~~~~
make[6]: *** [scripts/Makefile.build:289: drivers/gpu/drm/imagination/pvr_power.o] Error 1
make[5]: *** [scripts/Makefile.build:548: drivers/gpu/drm/imagination] Error 2
make[4]: *** [scripts/Makefile.build:548: drivers/gpu/drm] Error 2
make[3]: *** [scripts/Makefile.build:548: drivers/gpu] Error 2
make[2]: *** [scripts/Makefile.build:548: drivers] Error 2
make[1]: *** [/home/javier/devel/linux/Makefile:2141: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2

Fixes: 42577ba79fbf ("drm/imagination: Rename FW booted to FW initialised")
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---

 drivers/gpu/drm/imagination/pvr_power.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/imagination/pvr_power.c b/drivers/gpu/drm/imagination/pvr_power.c
index 0ed9e7be604b..a71d5b35601e 100644
--- a/drivers/gpu/drm/imagination/pvr_power.c
+++ b/drivers/gpu/drm/imagination/pvr_power.c
@@ -379,7 +379,7 @@ pvr_power_device_suspend(struct device *dev)
 		return -EIO;
 
 	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
-		err = pvr_power_fw_disable(pvr_dev, false);
+		err = pvr_power_fw_disable(pvr_dev, false, true);
 		if (err)
 			goto err_drm_dev_exit;
 	}
@@ -409,7 +409,7 @@ pvr_power_device_resume(struct device *dev)
 		goto err_drm_dev_exit;
 
 	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
-		err = pvr_power_fw_enable(pvr_dev);
+		err = pvr_power_fw_enable(pvr_dev, true);
 		if (err)
 			goto err_power_off;
 	}
-- 
2.54.0

base-commit: c1079aebb4de218caa86c44f9a53700d1a582683
branch: drm-misc-next

[PATCH] drm/imagination: Fix missing pvr_power_fw_{en, dis}able() argument

[Javier Martinez Canillas]

Commit 42577ba79fbf ("drm/imagination: Rename FW booted to FW initialised")
dropped by mistake the last argument of the functions pvr_power_fw_enable()
and pvr_power_fw_disable(), leading to the following compile error:

  CC [M]  drivers/gpu/drm/imagination/pvr_power.o
drivers/gpu/drm/imagination/pvr_power.c: In function ‘pvr_power_device_suspend’:
drivers/gpu/drm/imagination/pvr_power.c:382:23: error: too few arguments to function ‘pvr_power_fw_disable’; expected 3, have 2
  382 |                 err = pvr_power_fw_disable(pvr_dev, false);
      |                       ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imagination/pvr_power.c:93:1: note: declared here
   93 | pvr_power_fw_disable(struct pvr_device *pvr_dev, bool hard_reset, bool rpm_suspend)
      | ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imagination/pvr_power.c: In function ‘pvr_power_device_resume’:
drivers/gpu/drm/imagination/pvr_power.c:412:23: error: too few arguments to function ‘pvr_power_fw_enable’; expected 2, have 1
  412 |                 err = pvr_power_fw_enable(pvr_dev);
      |                       ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/imagination/pvr_power.c:122:1: note: declared here
  122 | pvr_power_fw_enable(struct pvr_device *pvr_dev, bool rpm_resume)
      | ^~~~~~~~~~~~~~~~~~~
make[6]: *** [scripts/Makefile.build:289: drivers/gpu/drm/imagination/pvr_power.o] Error 1
make[5]: *** [scripts/Makefile.build:548: drivers/gpu/drm/imagination] Error 2
make[4]: *** [scripts/Makefile.build:548: drivers/gpu/drm] Error 2
make[3]: *** [scripts/Makefile.build:548: drivers/gpu] Error 2
make[2]: *** [scripts/Makefile.build:548: drivers] Error 2
make[1]: *** [/home/javier/devel/linux/Makefile:2141: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2

Fixes: 42577ba79fbf ("drm/imagination: Rename FW booted to FW initialised")
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---


 drivers/gpu/drm/imagination/pvr_power.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/imagination/pvr_power.c b/drivers/gpu/drm/imagination/pvr_power.c
index 0ed9e7be604b..a71d5b35601e 100644
--- a/drivers/gpu/drm/imagination/pvr_power.c
+++ b/drivers/gpu/drm/imagination/pvr_power.c
@@ -379,7 +379,7 @@ pvr_power_device_suspend(struct device *dev)
 		return -EIO;
 
 	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
-		err = pvr_power_fw_disable(pvr_dev, false);
+		err = pvr_power_fw_disable(pvr_dev, false, true);
 		if (err)
 			goto err_drm_dev_exit;
 	}
@@ -409,7 +409,7 @@ pvr_power_device_resume(struct device *dev)
 		goto err_drm_dev_exit;
 
 	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
-		err = pvr_power_fw_enable(pvr_dev);
+		err = pvr_power_fw_enable(pvr_dev, true);
 		if (err)
 			goto err_power_off;
 	}
-- 
2.54.0

base-commit: c1079aebb4de218caa86c44f9a53700d1a582683
branch: drm-misc-next

Re: [EXTERNAL] [PATCH] drm/imagination: Fix missing pvr_power_fw_{en,dis}able() argument

[Brajesh Gupta]

On Tue, 2026-05-19 at 15:12 +0200, Javier Martinez Canillas wrote:
> *** CAUTION: This email originates from a source not known to Imagination Technologies. Think before you click a link or open an attachment ***
> 
> Commit 42577ba79fbf ("drm/imagination: Rename FW booted to FW initialised")
> dropped by mistake the last argument of the functions pvr_power_fw_enable()
> and pvr_power_fw_disable(), leading to the following compile error:
> 
>   CC [M]  drivers/gpu/drm/imagination/pvr_power.o
> drivers/gpu/drm/imagination/pvr_power.c: In function ‘pvr_power_device_suspend’:
> drivers/gpu/drm/imagination/pvr_power.c:382:23: error: too few arguments to function ‘pvr_power_fw_disable’; expected 3, have 2
>   382 |                 err = pvr_power_fw_disable(pvr_dev, false);
>       |                       ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/imagination/pvr_power.c:93:1: note: declared here
>    93 | pvr_power_fw_disable(struct pvr_device *pvr_dev, bool hard_reset, bool rpm_suspend)
>       | ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/imagination/pvr_power.c: In function ‘pvr_power_device_resume’:
> drivers/gpu/drm/imagination/pvr_power.c:412:23: error: too few arguments to function ‘pvr_power_fw_enable’; expected 2, have 1
>   412 |                 err = pvr_power_fw_enable(pvr_dev);
>       |                       ^~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/imagination/pvr_power.c:122:1: note: declared here
>   122 | pvr_power_fw_enable(struct pvr_device *pvr_dev, bool rpm_resume)
>       | ^~~~~~~~~~~~~~~~~~~
> make[6]: *** [scripts/Makefile.build:289: drivers/gpu/drm/imagination/pvr_power.o] Error 1
> make[5]: *** [scripts/Makefile.build:548: drivers/gpu/drm/imagination] Error 2
> make[4]: *** [scripts/Makefile.build:548: drivers/gpu/drm] Error 2
> make[3]: *** [scripts/Makefile.build:548: drivers/gpu] Error 2
> make[2]: *** [scripts/Makefile.build:548: drivers] Error 2
> make[1]: *** [/home/javier/devel/linux/Makefile:2141: .] Error 2
> make: *** [Makefile:248: __sub-make] Error 2
> 
> Fixes: 42577ba79fbf ("drm/imagination: Rename FW booted to FW initialised")
> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
> ---
> 
> 
>  drivers/gpu/drm/imagination/pvr_power.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/imagination/pvr_power.c b/drivers/gpu/drm/imagination/pvr_power.c
> index 0ed9e7be604b..a71d5b35601e 100644
> --- a/drivers/gpu/drm/imagination/pvr_power.c
> +++ b/drivers/gpu/drm/imagination/pvr_power.c
> @@ -379,7 +379,7 @@ pvr_power_device_suspend(struct device *dev)
>  		return -EIO;
>  
>  	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
> -		err = pvr_power_fw_disable(pvr_dev, false);
> +		err = pvr_power_fw_disable(pvr_dev, false, true);
>  		if (err)
>  			goto err_drm_dev_exit;
>  	}
> @@ -409,7 +409,7 @@ pvr_power_device_resume(struct device *dev)
>  		goto err_drm_dev_exit;
>  
>  	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
> -		err = pvr_power_fw_enable(pvr_dev);
> +		err = pvr_power_fw_enable(pvr_dev, true);
>  		if (err)
>  			goto err_power_off;
>  	}

Reviewed-by: Brajesh Gupta <brajesh.gupta@imgtec.com>

Re: [EXTERNAL] [PATCH] drm/imagination: Fix missing pvr_power_fw_{en,dis}able() argument

[Javier Martinez Canillas]

Brajesh Gupta <Brajesh.Gupta@imgtec.com> writes:

> On Tue, 2026-05-19 at 15:12 +0200, Javier Martinez Canillas wrote:

[...]

>>  	if (READ_ONCE(pvr_dev->fw_dev.initialised)) {
>> -		err = pvr_power_fw_enable(pvr_dev);
>> +		err = pvr_power_fw_enable(pvr_dev, true);
>>  		if (err)
>>  			goto err_power_off;
>>  	}
>
> Reviewed-by: Brajesh Gupta <brajesh.gupta@imgtec.com>

Pushed to drm-misc (drm-misc-next). Thanks!

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat

Claude review: drm/imagination: Fix missing pvr_power_fw_{en, dis}able() argument

[Claude Code Review Bot]

Overall Series Review

Subject: drm/imagination: Fix missing pvr_power_fw_{en, dis}able() argument
Author: Javier Martinez Canillas <javierm@redhat.com>
Patches: 3
Reviewed: 2026-05-25T22:55:10.151528

---

This is a single, straightforward build-fix patch. Commit `42577ba79fbf` ("drm/imagination: Rename FW booted to FW initialised") accidentally dropped arguments from two function calls in the suspend/resume paths, causing a compile failure. The fix correctly restores the missing arguments. The patch is correct, minimal, and properly tagged with a `Fixes:` line.

**Verdict: Looks good.** This should be merged promptly as the broken commit prevents building the imagination driver entirely.

---
Generated by Claude Code Patch Reviewer

Claude review: drm/imagination: Fix missing pvr_power_fw_{en, dis}able() argument

[Claude Code Review Bot]

Patch Review

**Correctness: Good.**

The two changes match the function signatures exactly:

1. `pvr_power_fw_disable(pvr_dev, false, true)` — adds the missing `rpm_suspend` parameter. Passing `true` is correct because `pvr_power_device_suspend()` is the system PM suspend path and needs the IRQ disabled (lines 109-112 of `pvr_power.c` show `rpm_suspend=true` calls `disable_irq()`). The `false` for `hard_reset` is also correct — a suspend is not a hard reset.

2. `pvr_power_fw_enable(pvr_dev, true)` — adds the missing `rpm_resume` parameter. Passing `true` is correct because `pvr_power_device_resume()` is the system PM resume path and needs the IRQ re-enabled (line 126-127 show `rpm_resume=true` calls `enable_irq()`).

These values are consistent with the existing (pre-regression) code in the drm-next tree, where the same calls at lines 382 and 412 already have the correct arguments.

**Commit message: Good.** Includes the compiler error output, the `Fixes:` tag pointing to the offending commit, and the `base-commit` / `branch` metadata.

**No issues found.** Reviewed-by would be appropriate here.

---
Generated by Claude Code Patch Reviewer