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 B77641586C5; Mon, 29 Jan 2024 17:12:49 +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=1706548369; cv=none; b=aHAdYSfVEomZHy3kvni3dERqiC3h8T25FoZknFCWTocSRE8bkTh/Gk3JACsppu8V/znbnoHZtTi5gSDUKP7ThkJpqhog7njfWa0bCGirFUWUWI3DgzteVfcsW2QpJ4Q1mMQ2oHEoh+THcvQaN4yYGDpugvgF7DDFpqQ4L0Wb3Mc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706548369; c=relaxed/simple; bh=15fiWpRmpKzFokUdTX76aQ2x+VsnsfxwmHRNqhrzC2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aiPf+jpKzT612xJjfOkCDyZWai57UrVyVKLHe5TiavxmhrgxXeSUXxeNNEZZCJHrr1khhRM5LvgtDSAxM9tajdlrI57wCFNiioPxijiBos90A01LbinhcB2TavZ8k4QgyiK7nydCzSdSm6QTbwMsZteT/uTaMdkxFOme41DPauE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L4W9BXll; 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="L4W9BXll" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F721C433C7; Mon, 29 Jan 2024 17:12:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706548369; bh=15fiWpRmpKzFokUdTX76aQ2x+VsnsfxwmHRNqhrzC2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L4W9BXllNikgUJNpcxf67HQ2anzRp/9lVoCWx/ORG2WLrv7Ao1YUeMXzIEM3o4BDU yiSBUQtaWkYxFbxEfmNdwFNr9GtnZZ4bEvlXFZF2Z429RI1NKE4HRcJekZC/n58R/S tNL9nEl906MwRCc5N0oOMSacSG4aY2rLlKWhmua8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aradhya Bhatia , Tomi Valkeinen Subject: [PATCH 6.1 135/185] drm/tidss: Fix atomic_flush check Date: Mon, 29 Jan 2024 09:05:35 -0800 Message-ID: <20240129170002.928928337@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129165958.589924174@linuxfoundation.org> References: <20240129165958.589924174@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tomi Valkeinen commit 95d4b471953411854f9c80b568da7fcf753f3801 upstream. tidss_crtc_atomic_flush() checks if the crtc is enabled, and if not, returns immediately as there's no reason to do any register changes. However, the code checks for 'crtc->state->enable', which does not reflect the actual HW state. We should instead look at the 'crtc->state->active' flag. This causes the tidss_crtc_atomic_flush() to proceed with the flush even if the active state is false, which then causes us to hit the WARN_ON(!crtc->state->event) check. Fix this by checking the active flag, and while at it, fix the related debug print which had "active" and "needs modeset" wrong way. Cc: Fixes: 32a1795f57ee ("drm/tidss: New driver for TI Keystone platform Display SubSystem") Reviewed-by: Aradhya Bhatia Link: https://lore.kernel.org/r/20231109-tidss-probe-v2-10-ac91b5ea35c0@ideasonboard.com Signed-off-by: Tomi Valkeinen Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/tidss/tidss_crtc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- a/drivers/gpu/drm/tidss/tidss_crtc.c +++ b/drivers/gpu/drm/tidss/tidss_crtc.c @@ -170,13 +170,13 @@ static void tidss_crtc_atomic_flush(stru struct tidss_device *tidss = to_tidss(ddev); unsigned long flags; - dev_dbg(ddev->dev, - "%s: %s enabled %d, needs modeset %d, event %p\n", __func__, - crtc->name, drm_atomic_crtc_needs_modeset(crtc->state), - crtc->state->enable, crtc->state->event); + dev_dbg(ddev->dev, "%s: %s is %sactive, %s modeset, event %p\n", + __func__, crtc->name, crtc->state->active ? "" : "not ", + drm_atomic_crtc_needs_modeset(crtc->state) ? "needs" : "doesn't need", + crtc->state->event); /* There is nothing to do if CRTC is not going to be enabled. */ - if (!crtc->state->enable) + if (!crtc->state->active) return; /*