tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/i915/display: Allow async flip when Selective Fetch is enabled

Fix silent conflict during drm-next backmerge causing async flips being
rejected when Selective Fetch is enabled.

Fixes: b8304863a399 ("Merge drm/drm-next into drm-intel-next")
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20251216130351.2799110-1-jouni.hogander@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Jouni Högander and committed by
Rodrigo Vivi d400dad6 524696a1

-8
-8
drivers/gpu/drm/i915/display/intel_display.c
··· 6026 6026 return -EINVAL; 6027 6027 } 6028 6028 6029 - /* FIXME: selective fetch should be disabled for async flips */ 6030 - if (new_crtc_state->enable_psr2_sel_fetch) { 6031 - drm_dbg_kms(display->drm, 6032 - "[CRTC:%d:%s] async flip disallowed with PSR2 selective fetch\n", 6033 - crtc->base.base.id, crtc->base.name); 6034 - return -EINVAL; 6035 - } 6036 - 6037 6029 for_each_oldnew_intel_plane_in_state(state, plane, old_plane_state, 6038 6030 new_plane_state, i) { 6039 6031 if (plane->pipe != crtc->pipe)