| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: "Y.C. Chen" <yc_chen@aspeedtech.com> |
| Date: Wed, 22 Feb 2017 15:10:50 +1100 |
| Subject: [PATCH 13/15] drm/ast: Fix test for VGA enabled |
| |
| 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: Y.C. Chen <yc_chen@aspeedtech.com> |
| Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Signed-off-by: Joel Stanley <joel@jms.id.au> |
| --- |
| drivers/gpu/drm/ast/ast_post.c | 8 ++------ |
| 1 file changed, 2 insertions(+), 6 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c |
| index c15f643915af..a5a780921553 100644 |
| --- a/drivers/gpu/drm/ast/ast_post.c |
| +++ b/drivers/gpu/drm/ast/ast_post.c |
| @@ -59,13 +59,9 @@ bool ast_is_vga_enabled(struct drm_device *dev) |
| /* TODO 1180 */ |
| } else { |
| ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT); |
| - if (ch) { |
| - ast_open_key(ast); |
| - ch = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xb6, 0xff); |
| - return ch & 0x04; |
| - } |
| + return !!(ch & 0x01); |
| } |
| - return 0; |
| + return false; |
| } |
| |
| static const u8 extreginfo[] = { 0x0f, 0x04, 0x1c, 0xff }; |
| -- |
| 2.11.0 |
| |