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 D010B2EAD10; Thu, 3 Jul 2025 15:15:48 +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=1751555748; cv=none; b=LiKdMYsps5P408g7mbqSeDIIlgsXsFtYW9Fh5BS6CiNb7KClFm1hz4WRA0uluzmITYKuvoYtnclTtbBUpeDEIq4g8fL70pW9A+uufmaXb7OUcyU9NZb/ytTdz1w43vP/zXPDY2pgwwoNKWpPRgsF6j0bVSPicbd9FEDfB6n2l6k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751555748; c=relaxed/simple; bh=CpcqJx/RR9hRW/Q8IA7osVO6UqFfdyy50kF6M1h3juI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fjn8Uc8uiuKo11mPcUJ2UZCddblcy1tYvX5zVnoGXJjy7Kii1DUX+zY9lNlZqzH9+f708o1S8nPoHyfagDgZYW7GOH22iTIbsLW273ILjMXib3QujceRIOnaYW3RQ6VflS3iLpCRqRBwzem4jGTTAR19z9pd+eaIdvwwK2C7XRA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=v1hlEi2z; 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="v1hlEi2z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F1E5C4CEE3; Thu, 3 Jul 2025 15:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751555748; bh=CpcqJx/RR9hRW/Q8IA7osVO6UqFfdyy50kF6M1h3juI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v1hlEi2z4PVJPh9FaDdstVxXj84GVgU/7XFfouEzGsiJYB1QUqTi0gd49AEeghcIw CPrfXVmH9yyiuzpj+RMqTrO7VuzpJnHX+0eXTMyXkFDZTuJl9mPM1SBah1tK/MQevY 6mx+D7DETE9RJO/SNhnfLUkSfKnZUf8w5MLbwK2U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Zimmermann , Gerd Hoffmann , Adam Jackson , Dave Airlie , Maarten Lankhorst , Maxime Ripard Subject: [PATCH 6.6 110/139] drm/cirrus-qemu: Fix pitch programming Date: Thu, 3 Jul 2025 16:42:53 +0200 Message-ID: <20250703143945.477877310@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250703143941.182414597@linuxfoundation.org> References: <20250703143941.182414597@linuxfoundation.org> User-Agent: quilt/0.68 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: Thomas Zimmermann commit 4bfb389a0136a13f0802eeb5e97a0e76d88f77ae upstream. Do not set CR1B[6] when programming the pitch. The bit effects VGA text mode and is not interpreted by qemu. [1] It has no affect on the scanline pitch. The scanline bit that is set into CR1B[6] belongs into CR13[7], which the driver sets up correctly. This bug goes back to the driver's initial commit. Signed-off-by: Thomas Zimmermann Acked-by: Gerd Hoffmann Link: https://gitlab.com/qemu-project/qemu/-/blob/stable-9.2/hw/display/cirrus_vga.c?ref_type=heads#L1112 # 1 Fixes: f9aa76a85248 ("drm/kms: driver for virtual cirrus under qemu") Cc: Adam Jackson Cc: Dave Airlie Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: # v3.5+ Link: https://lore.kernel.org/r/20250328091821.195061-2-tzimmermann@suse.de Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/tiny/cirrus.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/gpu/drm/tiny/cirrus.c +++ b/drivers/gpu/drm/tiny/cirrus.c @@ -318,7 +318,6 @@ static void cirrus_pitch_set(struct cirr /* Enable extended blanking and pitch bits, and enable full memory */ cr1b = 0x22; cr1b |= (pitch >> 7) & 0x10; - cr1b |= (pitch >> 6) & 0x40; wreg_crt(cirrus, 0x1b, cr1b); cirrus_set_start_address(cirrus, 0);