linux-stable.git/drivers/media/platform/amd, branch master

media: amd: isp4: fix self-deadlock in isp4sd_pwron_and_init() error path

2026-08-10T08:48:54+00:00

isp4sd_pwron_and_init() holds ops_mutex via guard(mutex) and, on any
init failure, jumps to err_deinit and calls isp4sd_pwroff_and_deinit().
That helper takes the same ops_mutex, re-acquiring a non-recursive mutex
already held by the current thread, so any init failure deadlocks.

Unwind the error path in stages instead, releasing only what each
failure point acquired. This also avoids the issues that an
unconditional teardown would hit at the earlier failures, such as a
runtime-PM underflow from pm_runtime_resume_and_get() and MMIO access
while the device is unpowered.

Fixes: 4e5e7a7ddb4a ("media: platform: amd: isp4 subdev and firmware loading handling added")
Assisted-by: Claude:claude-opus-4-8 smatch
Signed-off-by: Yifei Gao 
Reviewed-by: Bin Du 
Signed-off-by: Sakari Ailus

media: amd: isp4: release partial allocations in isp4if_alloc_fw_gpumem()

2026-08-10T08:48:54+00:00

isp4if_alloc_fw_gpumem() allocates several GPU memory pools in sequence.
If one of them fails, it jumps to error_no_memory and returns -ENOMEM
without releasing the pools that were already allocated, leaking them.

Release the already-allocated pools before returning. isp4if_gpu_mem_free()
is a no-op on pools that were not allocated, so calling
isp4if_dealloc_fw_gpumem() here safely frees exactly the pools that
succeeded.

isp4if_gpu_mem_free() previously logged an error for a NULL entry, which
is a normal case during partial-allocation cleanup, so make it silent.

Fixes: 4c5feef6a62c ("media: platform: amd: Add isp4 fw and hw interface")
Signed-off-by: Yifei Gao 
Reviewed-by: Bin Du 
Signed-off-by: Sakari Ailus

media: platform: amd: fix unmet dependency for VIDEO_V4L2_SUBDEV_API

2026-07-15T08:13:55+00:00

Currently, VIDEO_AMD_ISP4_CAPTURE selects VIDEO_V4L2_SUBDEV_API without
ensuring MEDIA_CONTROLLER is enabled, causing an unmet dependency:

WARNING: unmet direct dependencies detected for VIDEO_V4L2_SUBDEV_API
  Depends on [n]: MEDIA_SUPPORT [=m] && VIDEO_DEV [=m] && MEDIA_CONTROLLER [=n]
  Selected by [m]:
  - VIDEO_AMD_ISP4_CAPTURE [=m] && MEDIA_SUPPORT [=m] && MEDIA_PLATFORM_SUPPORT [=y] && MEDIA_PLATFORM_DRIVERS [=y] && DRM_AMDGPU [=m] && DRM_AMD_ISP [=y] && HAS_DMA [=y] && VIDEO_DEV [=m]

Many other options in this subsystem select MEDIA_CONTROLLER, let's do the
same here.

This unmet dependency bug was detected by kconfirm, a static analysis tool
for Kconfig.

Fixes: 9a54c285630c ("media: platform: amd: Introduce amd isp4 capture driver")
Signed-off-by: Julian Braha 
Reviewed-by: Bin Du 
Signed-off-by: Sakari Ailus

media: platform: amd: use refcount_t instead of atomic_t

2026-07-10T12:17:56+00:00

We are using the refcnt variable for refcounting. Use the refcount_t
type instead, as it has support for saturation and underflow.

This also makes cocci happier, as it will fix the following warning:
./platform/amd/isp4/isp4_subdev.c:394:6-25: WARNING: atomic_dec_and_test variation before object free at line 395.

Fixes: 4c5feef6a62c ("media: platform: amd: Add isp4 fw and hw interface")
Signed-off-by: Ricardo Ribalda 
Reviewed-by: Pratap Nirujogi 
Reviewed-by: Bin Du 
Signed-off-by: Hans Verkuil

media: platform: amd: add DRM_AMDGPU dependency

2026-05-19T11:49:25+00:00

With DRM_AMDGPU=m and DRM_AMD_ISP=y, it is possible to configura
VIDEO_AMD_ISP4_CAPTURE as built-in, but that fails to link:

aarch64-linux-ld: drivers/media/platform/amd/isp4/isp4_interface.o: in function `isp4if_gpu_mem_alloc.isra.0':
isp4_interface.c:(.text+0x1d0): undefined reference to `isp_kernel_buffer_alloc'
aarch64-linux-ld: drivers/media/platform/amd/isp4/isp4_interface.o: in function `isp4if_dealloc_fw_gpumem':
isp4_interface.c:(.text+0x26c): undefined reference to `isp_kernel_buffer_free'

Add a dependency on the tristate DRM_AMDGPU symbol in addition to
the boolean DRM_AMD_ISP=y, so this can only be built-in if
the ISP driver is also linked into the kernel itself.

Fixes: 9a54c285630c ("media: platform: amd: Introduce amd isp4 capture driver")
Signed-off-by: Arnd Bergmann 
Reviewed-by: Bin Du 
Tested-by: Bin Du 
Signed-off-by: Sakari Ailus

media: platform: amd: isp4: drop stale list reinit before free

2026-05-19T11:49:25+00:00

Newer Smatch snapshots no longer report the false positive around
isp4if_send_fw_cmd(), so the extra list reinitialization before kfree()
is no longer needed.

Drop the stale list reinit and keep the cleanup path simpler.

Signed-off-by: Bin Du 
Signed-off-by: Sakari Ailus

media: platform: amd: isp4 debug fs logging and more descriptive errors

2026-05-06T10:48:09+00:00

Add debug fs for isp4 driver and add more detailed descriptive error info
to some of the log message

Co-developed-by: Sultan Alsawaf 
Signed-off-by: Sultan Alsawaf 
Co-developed-by: Svetoslav Stoilov 
Signed-off-by: Svetoslav Stoilov 
Signed-off-by: Bin Du 
Reviewed-by: Sultan Alsawaf 
Tested-by: Alexey Zagorodnikov 
Tested-by: Kate Hsuan 
Signed-off-by: Sakari Ailus

media: platform: amd: isp4 video node and buffers handling added

2026-05-06T10:48:09+00:00

Isp video implements v4l2 video interface and supports NV12 and YUYV. It
manages buffers, pipeline power and state. Cherry-picked Sultan's DMA
buffer related fix from branch v6.16-drm-tip-isp4-for-amd on
https://github.com/kerneltoast/kernel_x86_laptop.git

Co-developed-by: Sultan Alsawaf 
Signed-off-by: Sultan Alsawaf 
Co-developed-by: Svetoslav Stoilov 
Signed-off-by: Svetoslav Stoilov 
Signed-off-by: Bin Du 
Reviewed-by: Sultan Alsawaf 
Tested-by: Alexey Zagorodnikov 
Tested-by: Kate Hsuan 
Signed-off-by: Sakari Ailus

media: platform: amd: isp4 subdev and firmware loading handling added

2026-05-06T10:48:09+00:00

Isp4 sub-device is implementing v4l2 sub-device interface. It has one
capture video node, and supports only preview stream. It manages firmware
states, stream configuration. Add interrupt handling and notification for
isp firmware to isp-subdevice.

Co-developed-by: Sultan Alsawaf 
Signed-off-by: Sultan Alsawaf 
Co-developed-by: Svetoslav Stoilov 
Signed-off-by: Svetoslav Stoilov 
Signed-off-by: Bin Du 
Reviewed-by: Sultan Alsawaf 
Tested-by: Alexey Zagorodnikov 
Tested-by: Kate Hsuan 
Signed-off-by: Sakari Ailus

media: platform: amd: Add isp4 fw and hw interface

2026-05-06T10:48:09+00:00

ISP firmware controls ISP HW pipeline using dedicated embedded processor
called ccpu. The communication between ISP FW and driver is using commands
and response messages sent through the ring buffer. Command buffers support
either global setting that is not specific to the stream and support stream
specific parameters. Response buffers contain ISP FW notification
information such as frame buffer done and command done. IRQ is used for
receiving response buffer from ISP firmware, which is handled in the main
isp4 media device. ISP ccpu is booted up through the firmware loading
helper function prior to stream start. Memory used for command buffer and
response buffer needs to be allocated from amdgpu buffer manager because
isp4 is a child device of amdgpu.

Co-developed-by: Sultan Alsawaf 
Signed-off-by: Sultan Alsawaf 
Co-developed-by: Svetoslav Stoilov 
Signed-off-by: Svetoslav Stoilov 
Signed-off-by: Bin Du 
Reviewed-by: Sultan Alsawaf 
Tested-by: Alexey Zagorodnikov 
Tested-by: Kate Hsuan 
Signed-off-by: Sakari Ailus