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 DFE13223302; Thu, 12 Dec 2024 15:42:10 +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=1734018131; cv=none; b=EzCGMXMs4z1UpZrO1Pw5JDvjWqQzTcjRU4KR+kErCe8NVA+vQ1uovzkrRGOcDYCwnSBsz2sy6kOr0VEbtZ4UoOhLGoFCRz/VV/7dO62hMcRmWTr5+5K5A1qcZdTCDd6tsybchaMFmOxIk+LX50lVBO8rNYADEy28AKAWuDBOSVI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734018131; c=relaxed/simple; bh=1lrfd4Z8JMoP+/hDNIox+vqVr/obbs5Qeq6/6SjTuMs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jvzEqth0IdHFR0HKVvwEdcGRlOn+RUi3RcpjR+SWeLYZN8qgheWvlMR9GFU6aWf8uG3JsbhUQxW108tKZTTSAwMPEQEU39MdxgYRYgkixn1WzCll+Iht9Szj9X5HfwzikrW0xAkclPwW9kdRCD1v4lWU66QxJTt2AVjTOF5CYZo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NuySuH+R; 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="NuySuH+R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50127C4CECE; Thu, 12 Dec 2024 15:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734018130; bh=1lrfd4Z8JMoP+/hDNIox+vqVr/obbs5Qeq6/6SjTuMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NuySuH+Rp3D4eVbRgUQmGdgNf8aDq3P7O9TPCLv5mtUajioK8v2EnfcSUhqbLSuBg fYEcJ9sTMbC/eJYjXZtASXFhCYWntead4oqkNjq3LM5Kd1SEBr8Wq9IefXTS+Foa+3 wy14EpI8tNRSVgIntwoeKNZzSnnmgGTzPMfSWwow= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maxime Ripard , Dave Stevenson , Sasha Levin Subject: [PATCH 6.6 207/356] drm/vc4: hvs: Set AXI panic modes for the HVS Date: Thu, 12 Dec 2024 15:58:46 +0100 Message-ID: <20241212144252.793919364@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144244.601729511@linuxfoundation.org> References: <20241212144244.601729511@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Stevenson [ Upstream commit 014eccc9da7bfc76a3107fceea37dd60f1d63630 ] The HVS can change AXI request mode based on how full the COB FIFOs are. Until now the vc4 driver has been relying on the firmware to have set these to sensible values. With HVS channel 2 now being used for live video, change the panic mode for all channels to be explicitly set by the driver, and the same for all channels. Reviewed-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20240621152055.4180873-7-dave.stevenson@raspberrypi.com Signed-off-by: Dave Stevenson Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_hvs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index 008352166579e..bea1b3d35cdd3 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -956,6 +956,17 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data) SCALER_DISPCTRL_SCLEIRQ); + /* Set AXI panic mode. + * VC4 panics when < 2 lines in FIFO. + * VC5 panics when less than 1 line in the FIFO. + */ + dispctrl &= ~(SCALER_DISPCTRL_PANIC0_MASK | + SCALER_DISPCTRL_PANIC1_MASK | + SCALER_DISPCTRL_PANIC2_MASK); + dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC0); + dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC1); + dispctrl |= VC4_SET_FIELD(2, SCALER_DISPCTRL_PANIC2); + /* Set AXI panic mode. * VC4 panics when < 2 lines in FIFO. * VC5 panics when less than 1 line in the FIFO. -- 2.43.0