On Thu Aug 27 15:33:24 2026 +0300, Antti Laakso wrote:
> The ipu7 don't have watermark nor LTR support, skip it.
>
> Signed-off-by: Antti Laakso <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 4 +++-
drivers/media/pci/intel/ipu6/ipu6-isys.c | 12 +++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
index 560524e6e624..9634b4f232bd 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
@@ -727,8 +727,10 @@ void ipu6_isys_update_stream_watermark(struct
ipu6_isys_video *av, bool state)
{
struct isys_iwake_watermark *iwake_watermark =
&av->isys->iwake_watermark;
+ struct ipu6_device *isp = av->isys->adev->isp;
- if (!av->watermark.pixel_rate)
+ if (IS_IPU7(isp) ||
+ !av->watermark.pixel_rate)
return;
if (state) {
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.c
b/drivers/media/pci/intel/ipu6/ipu6-isys.c
index 622f74021f6d..5a3ba5007249 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.c
@@ -822,12 +822,12 @@ static int isys_runtime_pm_resume(struct device *dev)
isys->power = 1;
spin_unlock_irqrestore(&isys->power_lock, flags);
- if (IS_IPU7(isp))
+ if (IS_IPU7(isp)) {
ipu7_isys_setup_hw(isys);
- else
+ } else {
ipu6_isys_setup_hw(isys);
-
- set_iwake_ltrdid(isys, 0, 0, LTR_ISYS_ON);
+ set_iwake_ltrdid(isys, 0, 0, LTR_ISYS_ON);
+ }
return 0;
}
@@ -836,6 +836,7 @@ static int isys_runtime_pm_suspend(struct device *dev)
{
struct ipu6_bus_device *adev = to_ipu6_bus_device(dev);
struct ipu6_isys *isys = dev_get_drvdata(dev);
+ struct ipu6_device *isp = adev->isp;
unsigned long flags;
spin_lock_irqsave(&isys->power_lock, flags);
@@ -849,7 +850,8 @@ static int isys_runtime_pm_suspend(struct device *dev)
isys->phy_termcal_val = 0;
cpu_latency_qos_update_request(&isys->pm_qos, PM_QOS_DEFAULT_VALUE);
- set_iwake_ltrdid(isys, 0, 0, LTR_ISYS_OFF);
+ if (!IS_IPU7(isp))
+ set_iwake_ltrdid(isys, 0, 0, LTR_ISYS_OFF);
ipu6_mmu_hw_cleanup(adev->mmu);
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
