Commit 8b787652 authored by Y.C. Chen's avatar Y.C. Chen Committed by Greg Kroah-Hartman

drm/ast: Fix test for VGA enabled

commit 905f21a4 upstream.

The test to see if VGA was already enabled is doing an unnecessary
second test from a register that may or may not have been initialized
to a valid value. Remove it.
Signed-off-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarJoel Stanley <joel@jms.id.au>
Tested-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d80ac62
...@@ -58,13 +58,9 @@ bool ast_is_vga_enabled(struct drm_device *dev) ...@@ -58,13 +58,9 @@ bool ast_is_vga_enabled(struct drm_device *dev)
/* TODO 1180 */ /* TODO 1180 */
} else { } else {
ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT); ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT);
if (ch) { return !!(ch & 0x01);
ast_open_key(ast);
ch = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff);
return ch & 0x04;
}
} }
return 0; return false;
} }
static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff }; static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment