diff options
| author | Joonas Lahtinen <[email protected]> | 2025-05-28 07:20:17 +0000 |
|---|---|---|
| committer | Joonas Lahtinen <[email protected]> | 2025-05-28 07:20:17 +0000 |
| commit | bbfd5594756011167b8f8de9a00e0c946afda1e6 (patch) | |
| tree | 11171eb57fdb6b5123d796805cd0df10f6fc877b /drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | |
| parent | Revert "drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1" (diff) | |
| parent | drm/nouveau/tegra: Fix error pointer vs NULL return in nvkm_device_tegra_reso... (diff) | |
| download | kernel-bbfd5594756011167b8f8de9a00e0c946afda1e6.tar.gz kernel-bbfd5594756011167b8f8de9a00e0c946afda1e6.zip | |
Merge drm/drm-next into drm-intel-gt-next
Need to pull in a67221b5eb8d ("drm/i915/dp: Return min bpc supported by source instead of 0")
in order to fix build breakage on GCC 9.4.0 (from Ubuntu 20.04).
Signed-off-by: Joonas Lahtinen <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c index 732744488b03..43fc941dfa57 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c @@ -124,7 +124,7 @@ static int isp_early_init(struct amdgpu_ip_block *ip_block) return 0; } -static bool isp_is_idle(void *handle) +static bool isp_is_idle(struct amdgpu_ip_block *ip_block) { return true; } |