summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorY.C. Chen <yc_chen@aspeedtech.com>2014-09-10 12:07:53 +0800
committerDave Airlie <airlied@redhat.com>2014-09-12 13:41:27 +1000
commit8f372e250ae5f4a5faf87ca1a629d0ae59db65b6 (patch)
treee4ed1d9689aa2642b6dfd809fd81eb81756cbe74
parentd9f4acd0b46159452d946b20b0ac633b0343a81e (diff)
downloadlwn-8f372e250ae5f4a5faf87ca1a629d0ae59db65b6.tar.gz
lwn-8f372e250ae5f4a5faf87ca1a629d0ae59db65b6.zip
drm/ast: open key before detect chips
Some config settings like 3rd TX chips will not get correctly if the extended reg is protected Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com> Reviewed-by: Egbert Eich <eich@suse.de> Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/ast/ast_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index a2cc6be97983..b027e332caa5 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -67,6 +67,7 @@ static int ast_detect_chip(struct drm_device *dev)
{
struct ast_private *ast = dev->dev_private;
uint32_t data, jreg;
+ ast_open_key(ast);
if (dev->pdev->device == PCI_CHIP_AST1180) {
ast->chip = AST1100;