From: Ville Syrjälä Date: Tue, 17 Nov 2020 19:47:15 +0000 (-0800) Subject: drm/i915: Disable legacy cursor fastpath for bigjoiner X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=756c1b8767a54a270f60c00a7d95a2cdd67d70f9;p=linux.git drm/i915: Disable legacy cursor fastpath for bigjoiner The legacy cursor fastpath code doesn't deal with bigjoiner. Disable the fastpath for now. Signed-off-by: Ville Syrjälä Reviewed-by: Manasi Navare Signed-off-by: Manasi Navare Link: https://patchwork.freedesktop.org/patch/msgid/20201117194718.11462-13-manasi.d.navare@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 22224b8c49982..4d11d5b0606ba 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -16931,9 +16931,11 @@ intel_legacy_cursor_update(struct drm_plane *_plane, /* * When crtc is inactive or there is a modeset pending, * wait for it to complete in the slowpath + * + * FIXME bigjoiner fastpath would be good */ if (!crtc_state->hw.active || needs_modeset(crtc_state) || - crtc_state->update_pipe) + crtc_state->update_pipe || crtc_state->bigjoiner) goto slow; /*