diff options
| author | Y.C. Chen <yc_chen@aspeedtech.com> | 2017-02-22 15:10:50 +1100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-05-17 15:06:59 -0400 |
| commit | 2188c2b367c6eba77622b478c5fe12bbcc3c88bd (patch) | |
| tree | 2854af9758b60a09cf99d7cd878b7869f330cca0 /drivers/gpu | |
| parent | e8b120e25fbc9f19ebff0cfaa0da7049fd25f29c (diff) | |
drm/ast: Fix test for VGA enabled
[ Upstream commit 905f21a49d388de3e99438235f3301cabf0c0ef4 ]
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>
Cc: <stable@vger.kernel.org>
Acked-by: Joel Stanley <joel@jms.id.au>
Tested-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_post.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index 6b82c8a57f9c..75889990c593 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c @@ -58,13 +58,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 }; |