Commit b1ce4ab0 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/ast: Split ast_set_def_ext_reg() by chip generation 



Duplicate ast_set_def_ext_reg() for individual chip generations
and move call it into per-chip source files. Remove the original
code. AST2100 and AST2500 reuse the function from earlier chips.
AST2600 appears to be incorrect as it uses an older function. Keep
this behavior for now.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20250706162816.211552-9-tzimmermann@suse.de
parent eb104c69

drivers/gpu/drm/ast/ast_2000.c

+32 −0
Original line number Diff line number Diff line
@@ -35,6 +35,36 @@ 
 * POST

 */



void ast_2000_set_def_ext_reg(struct ast_device *ast)

{

	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };

	u8 i, index, reg;

	const u8 *ext_reg_info;



	/* reset scratch */

	for (i = 0x81; i <= 0x9f; i++)

		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);



	ext_reg_info = extreginfo;

	index = 0xa0;

	while (*ext_reg_info != 0xff) {

		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);

		index++;

		ext_reg_info++;

	}



	/* disable standard IO/MEM decode if secondary */

	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */



	/* Set Ext. Default */

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);



	/* Enable RAMDAC for A1 */

	reg = 0x04;

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);

}



static const struct ast_dramstruct ast2000_dram_table_data[] = {

	{ 0x0108, 0x00000000 },

	{ 0x0120, 0x00004a21 },
@@ -104,6 +134,8 @@ static void ast_post_chip_2000(struct ast_device *ast) 


int ast_2000_post(struct ast_device *ast)

{

	ast_2000_set_def_ext_reg(ast);



	if (ast->config_mode == ast_use_p2a) {

		ast_post_chip_2000(ast);

	} else {

drivers/gpu/drm/ast/ast_2100.c

+2 −0
Original line number Diff line number Diff line
@@ -333,6 +333,8 @@ static void ast_post_chip_2100(struct ast_device *ast) 


int ast_2100_post(struct ast_device *ast)

{

	ast_2000_set_def_ext_reg(ast);



	if (ast->config_mode == ast_use_p2a) {

		ast_post_chip_2100(ast);

	} else {

drivers/gpu/drm/ast/ast_2300.c

+33 −0
Original line number Diff line number Diff line
@@ -35,6 +35,37 @@ 
 *  POST

 */



void ast_2300_set_def_ext_reg(struct ast_device *ast)

{

	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1f, 0xff };

	u8 i, index, reg;

	const u8 *ext_reg_info;



	/* reset scratch */

	for (i = 0x81; i <= 0x9f; i++)

		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);



	ext_reg_info = extreginfo;

	index = 0xa0;

	while (*ext_reg_info != 0xff) {

		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);

		index++;

		ext_reg_info++;

	}



	/* disable standard IO/MEM decode if secondary */

	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */



	/* Set Ext. Default */

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);



	/* Enable RAMDAC for A1 */

	reg = 0x04;

	reg |= 0x20;

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);

}



/* AST 2300 DRAM settings */

#define AST_DDR3 0

#define AST_DDR2 1
@@ -1281,6 +1312,8 @@ static void ast_post_chip_2300(struct ast_device *ast) 


int ast_2300_post(struct ast_device *ast)

{

	ast_2300_set_def_ext_reg(ast);



	if (ast->config_mode == ast_use_p2a) {

		ast_post_chip_2300(ast);

		ast_init_3rdtx(ast);

drivers/gpu/drm/ast/ast_2500.c

+2 −0
Original line number Diff line number Diff line
@@ -554,6 +554,8 @@ static void ast_post_chip_2500(struct ast_device *ast) 


int ast_2500_post(struct ast_device *ast)

{

	ast_2300_set_def_ext_reg(ast);



	if (ast->config_mode == ast_use_p2a) {

		ast_post_chip_2500(ast);

	} else {

drivers/gpu/drm/ast/ast_2600.c

+33 −0
Original line number Diff line number Diff line
@@ -27,13 +27,46 @@ 
 */



#include "ast_drv.h"

#include "ast_post.h"



/*

 * POST

 */



void ast_2600_set_def_ext_reg(struct ast_device *ast)

{

	static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };

	u8 i, index, reg;

	const u8 *ext_reg_info;



	/* reset scratch */

	for (i = 0x81; i <= 0x9f; i++)

		ast_set_index_reg(ast, AST_IO_VGACRI, i, 0x00);



	ext_reg_info = extreginfo;

	index = 0xa0;

	while (*ext_reg_info != 0xff) {

		ast_set_index_reg_mask(ast, AST_IO_VGACRI, index, 0x00, *ext_reg_info);

		index++;

		ext_reg_info++;

	}



	/* disable standard IO/MEM decode if secondary */

	/* ast_set_index_reg-mask(ast, AST_IO_VGACRI, 0xa1, 0xff, 0x3); */



	/* Set Ext. Default */

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0x8c, 0x00, 0x01);

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb7, 0x00, 0x00);



	/* Enable RAMDAC for A1 */

	reg = 0x04;

	ast_set_index_reg_mask(ast, AST_IO_VGACRI, 0xb6, 0xff, reg);

}



int ast_2600_post(struct ast_device *ast)

{

	ast_2600_set_def_ext_reg(ast);



	if (ast->tx_chip == AST_TX_ASTDP)

		return ast_dp_launch(ast);