[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <37eb802af8287857f8e41fd57c087f0184125fcd.1489497268.git.jslaby@suse.cz>
Date: Tue, 14 Mar 2017 14:15:48 +0100
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, "Y.C. Chen" <yc_chen@...eedtech.com>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Dave Airlie <airlied@...hat.com>, Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 57/60] drm/ast: Fix test for VGA enabled
From: "Y.C. Chen" <yc_chen@...eedtech.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
commit 905f21a49d388de3e99438235f3301cabf0c0ef4 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: Y.C. Chen <yc_chen@...eedtech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@...nel.crashing.org>
Acked-by: Joel Stanley <joel@....id.au>
Tested-by: Y.C. Chen <yc_chen@...eedtech.com>
Signed-off-by: Dave Airlie <airlied@...hat.com>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
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 977cfb35837a..d3464f35f427 100644
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -53,13 +53,9 @@ ast_is_vga_enabled(struct drm_device *dev)
/* TODO 1180 */
} else {
ch = ast_io_read8(ast, 0x43);
- 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;
}
#endif
--
2.12.0
Powered by blists - more mailing lists