blob: f27d6c1d4e753ab656a8eed9021434c61c17d99a [file] [log] [blame]
Joel Stanleye50183f2017-02-28 12:17:46 +10301From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2From: "Y.C. Chen" <yc_chen@aspeedtech.com>
3Date: Wed, 22 Feb 2017 15:10:50 +1100
4Subject: [PATCH 13/15] drm/ast: Fix test for VGA enabled
5
6The test to see if VGA was already enabled is doing an unnecessary
7second test from a register that may or may not have been initialized
8to a valid value. Remove it.
9
10Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com>
11Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
12Signed-off-by: Joel Stanley <joel@jms.id.au>
13---
14 drivers/gpu/drm/ast/ast_post.c | 8 ++------
15 1 file changed, 2 insertions(+), 6 deletions(-)
16
17diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
18index c15f643915af..a5a780921553 100644
19--- a/drivers/gpu/drm/ast/ast_post.c
20+++ b/drivers/gpu/drm/ast/ast_post.c
21@@ -59,13 +59,9 @@ bool ast_is_vga_enabled(struct drm_device *dev)
22 /* TODO 1180 */
23 } else {
24 ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT);
25- if (ch) {
26- ast_open_key(ast);
27- ch = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff);
28- return ch & 0x04;
29- }
30+ return !!(ch & 0x01);
31 }
32- return 0;
33+ return false;
34 }
35
36 static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff };
37--
382.11.0
39