From: Simona Vetter Date: Thu, 23 Jan 2025 13:39:49 +0000 (+0100) Subject: Merge v6.13 into drm-next X-Git-Tag: v6.14-rc1~13^2~4 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=07c5b277208cf9a9e9cf31bf0143977d7f030aa1;p=linux-block.git Merge v6.13 into drm-next A regression was caused by commit e4b5ccd392b9 ("drm/v3d: Ensure job pointer is set to NULL after job completion"), but this commit is not yet in next-fixes, fast-forward it. Note that this recreates Linus merge in 96c84703f1cf ("Merge tag 'drm-next-2025-01-17' of https://gitlab.freedesktop.org/drm/kernel") because I didn't want to backmerge a random point in the merge window. Signed-off-by: Simona Vetter --- 07c5b277208cf9a9e9cf31bf0143977d7f030aa1 diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c index 6d5d81f0dc4e,1d155463d044..784b03abb3a4 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@@ -2072,20 -2008,14 +2073,23 @@@ void amdgpu_gfx_enforce_isolation_ring_ mutex_lock(&adev->enforce_isolation_mutex); if (adev->enforce_isolation[idx]) { if (adev->kfd.init_complete) - amdgpu_gfx_kfd_sch_ctrl(adev, idx, false); + sched_work = true; } mutex_unlock(&adev->enforce_isolation_mutex); + + if (sched_work) + amdgpu_gfx_kfd_sch_ctrl(adev, idx, false); } +/** + * amdgpu_gfx_enforce_isolation_ring_end_use - End use of a ring with enforced isolation + * @ring: Pointer to the amdgpu_ring structure + * + * Ring end_use helper implementation for gfx which serializes access to the + * gfx IP between kernel submission IOCTLs and KFD user queues when isolation + * enforcement is enabled. The kernel submission IOCTLs and KFD user queues + * each get a time slice when both are active. + */ void amdgpu_gfx_enforce_isolation_ring_end_use(struct amdgpu_ring *ring) { struct amdgpu_device *adev = ring->adev; diff --cc drivers/gpu/drm/display/drm_bridge_connector.c index 32108307de66,3a5a4f92c979..56f977bbe62d --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@@ -596,8 -460,9 +596,11 @@@ struct drm_connector *drm_bridge_connec return ERR_PTR(-EINVAL); if (bridge_connector->bridge_hdmi) { + if (!connector->ycbcr_420_allowed) + supported_formats &= ~BIT(HDMI_COLORSPACE_YUV420); + + bridge = bridge_connector->bridge_hdmi; + ret = drmm_connector_hdmi_init(drm, connector, bridge_connector->bridge_hdmi->vendor, bridge_connector->bridge_hdmi->product,