Joel Stanley | e50183f | 2017-02-28 12:17:46 +1030 | [diff] [blame] | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: "Y.C. Chen" <yc_chen@aspeedtech.com> |
| 3 | Date: Wed, 22 Feb 2017 15:10:50 +1100 |
| 4 | Subject: [PATCH 13/15] drm/ast: Fix test for VGA enabled |
| 5 | |
| 6 | The test to see if VGA was already enabled is doing an unnecessary |
| 7 | second test from a register that may or may not have been initialized |
| 8 | to a valid value. Remove it. |
| 9 | |
| 10 | Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com> |
| 11 | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| 12 | Signed-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 | |
| 17 | diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c |
| 18 | index 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 | -- |
| 38 | 2.11.0 |
| 39 | |