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

Commit bad09da6 authored by Y.C. Chen's avatar Y.C. Chen Committed by Dave Airlie
Browse files

drm/ast: Fixed vram size incorrect issue on POWER 



The default value of VGA scratch may incorrect.
Should initial h/w before get vram info.

Acked-by: default avatarJoel Stanley <joel@jms.id.au>
Tested-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 9f93c8b3

drivers/gpu/drm/ast/ast_main.c

+3 −3
Original line number Diff line number Diff line
@@ -518,6 +518,9 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) 


	ast_detect_chip(dev, &need_post);



	if (need_post)

		ast_post_gpu(dev);



	if (ast->chip != AST1180) {

		ret = ast_get_dram_info(dev);

		if (ret)
@@ -528,9 +531,6 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags) 
			 ast->dram_bus_width, ast->vram_size);

	}



	if (need_post)

		ast_post_gpu(dev);



	ret = ast_mm_init(ast);

	if (ret)

		goto out_free;

drivers/gpu/drm/ast/ast_post.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ ast_set_def_ext_reg(struct drm_device *dev) 
	const u8 *ext_reg_info;



	/* reset scratch */

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

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

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



	if (ast->chip == AST2300 || ast->chip == AST2400) {