Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b7f6e50 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Greg Kroah-Hartman
Browse files

drm/ast: Fix DRAM init on AST2200 



commit 4cfe75f0f14f044dae66ad0e6eea812d038465d9 upstream.

Fix the test for the AST2200 in the DRAM initialization. The value
in ast->chip has to be compared against an enum constant instead of
a numerical value.

This bug got introduced when the driver was first imported into the
kernel.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Fixes: 312fec14 ("drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)")
Cc: Dave Airlie <airlied@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v3.5+
Reviewed-by: default avatarSui Jingfeng <suijingfeng@loongson.cn>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Tested-by: Jocelyn Falempe <jfalempe@redhat.com> # AST2600
Link: https://patchwork.freedesktop.org/patch/msgid/20230621130032.3568-2-tzimmermann@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ffa40ff

drivers/gpu/drm/ast/ast_post.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void ast_init_dram_reg(struct drm_device *dev) 
				;

			} while (ast_read32(ast, 0x10100) != 0xa8);

		} else {/* AST2100/1100 */

			if (ast->chip == AST2100 || ast->chip == 2200)

			if (ast->chip == AST2100 || ast->chip == AST2200)

				dram_reg_info = ast2100_dram_table_data;

			else

				dram_reg_info = ast1100_dram_table_data;