From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A461A8801; Tue, 30 Apr 2024 11:18:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714475883; cv=none; b=auT0VZjWLte7qrFNEsddLC6FbXsx35ok0qifdXC08TOs+ouGGm8PSfjstkN+H+09V7tuCJRZELZZJu5Li/Gea/7idXaYh+m7iP3gYLaAIpzI1yQ2/qmRdXr+cttxPGTbQwv+woxVM6G5fMajSTisiRTTpBf3w5JoN4ZQPv79zT0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714475883; c=relaxed/simple; bh=sjbm3782hDJ8Ev7/7zZObWWqMWFFnmWWxRj+VRG3umw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q5q5nVcgpkZdK9Pf3gwmQHzNXXh4PG/GxG2L6UtRLDBNivvJRR3QqByIlom0WoU22/aafzbXQbbqRiPRTFX8FT2sczrYOZ27n5NaMwTb5c0wRudeYJC4CDP9VQ9eO8727IXB6WbGlXxsPERFZ4Kb5AwLhYvlm1BGIJiIzrX6u2s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Cm4SrOEe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Cm4SrOEe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2274BC2BBFC; Tue, 30 Apr 2024 11:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714475883; bh=sjbm3782hDJ8Ev7/7zZObWWqMWFFnmWWxRj+VRG3umw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cm4SrOEel3jt9qEpP4/nCMnyT7Ynn1d3fp8kofD5Z/tiBSlj655/eyRPQruV0SR8N NcEI2cTJDxX/KK5OeknxqVQg868oxJPmk0VVXB9/EUivfc/NzBICsP1IyX4D8Y9ywb Zm2ghYo7zdfHJ+Q3y61E+k7O5SU2Q2xWAftNnwcw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zack Rusin , Broadcom internal kernel review list , dri-devel@lists.freedesktop.org, Ian Forbes , Martin Krastev , Sasha Levin Subject: [PATCH 5.15 47/80] drm/vmwgfx: Fix crtcs atomic check conditional Date: Tue, 30 Apr 2024 12:40:19 +0200 Message-ID: <20240430103044.808613827@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103043.397234724@linuxfoundation.org> References: <20240430103043.397234724@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zack Rusin [ Upstream commit a60ccade88f926e871a57176e86a34bbf0db0098 ] The conditional was supposed to prevent enabling of a crtc state without a set primary plane. Accidently it also prevented disabling crtc state with a set primary plane. Neither is correct. Fix the conditional and just driver-warn when a crtc state has been enabled without a primary plane which will help debug broken userspace. Fixes IGT's kms_atomic_interruptible and kms_atomic_transition tests. Signed-off-by: Zack Rusin Fixes: 06ec41909e31 ("drm/vmwgfx: Add and connect CRTC helper functions") Cc: Broadcom internal kernel review list Cc: dri-devel@lists.freedesktop.org Cc: # v4.12+ Reviewed-by: Ian Forbes Reviewed-by: Martin Krastev Link: https://patchwork.freedesktop.org/patch/msgid/20240412025511.78553-5-zack.rusin@broadcom.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 01d5a01af2594..e2a52b5de1733 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -537,6 +537,7 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, int vmw_du_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct vmw_private *vmw = vmw_priv(crtc->dev); struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc); struct vmw_display_unit *du = vmw_crtc_to_du(new_state->crtc); @@ -544,9 +545,13 @@ int vmw_du_crtc_atomic_check(struct drm_crtc *crtc, bool has_primary = new_state->plane_mask & drm_plane_mask(crtc->primary); - /* We always want to have an active plane with an active CRTC */ - if (has_primary != new_state->enable) - return -EINVAL; + /* + * This is fine in general, but broken userspace might expect + * some actual rendering so give a clue as why it's blank. + */ + if (new_state->enable && !has_primary) + drm_dbg_driver(&vmw->drm, + "CRTC without a primary plane will be blank.\n"); if (new_state->connector_mask != connector_mask && -- 2.43.0