drm/ast: Fixed reboot test may cause system hanged (05b43971) · Commits · 戴 / test

drivers/gpu/drm/ast/ast_main.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -131,8 +131,8 @@ static int ast_detect_chip(struct drm_device dev, bool need_post)


		/* Enable extended register access */
		ast_enable_mmio(dev);
		ast_open_key(ast);
		ast_enable_mmio(dev);

		/* Find out whether P2A works or whether to use device-tree */
		ast_detect_config_mode(dev, &scu_rev);
		@@ -576,6 +576,9 @@ void ast_driver_unload(struct drm_device *dev)
		{
		struct ast_private *ast = dev->dev_private;

		/* enable standard VGA decode */
		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x04);

		ast_release_firmware(dev);
		kfree(ast->dp501_fw_addr);
		ast_mode_fini(dev);

+1 −1

Original line number	Diff line number	Diff line
		@@ -604,7 +604,7 @@ static int ast_crtc_mode_set(struct drm_crtc *crtc,
		return -EINVAL;
		ast_open_key(ast);

		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa1, 0xff, 0x04);
		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x06);

		ast_set_std_reg(crtc, adjusted_mode, &vbios_mode);
		ast_set_crtc_reg(crtc, adjusted_mode, &vbios_mode);

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ void ast_enable_mmio(struct drm_device *dev)
		{
		struct ast_private *ast = dev->dev_private;

		ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa1, 0xff, 0x04);
		ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x06);
		}