UBUNTU: SAUCE: drm/ast: Call open_key before enable_mmio in POST code

BugLink: http://bugs.launchpad.net/bugs/1667424
open_key enables access the registers used by enable_mmio

Signed-off-by: Y.C. Chen <yc_chen@aspeedtech.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 7d0ce0a85c8e9a2ccfb20ab94219abaac8f460b7..75a7c65474a36ae528adcdcf1500d4f3b534b1ab 100644 (file)
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -374,8 +374,8 @@ void ast_post_gpu(struct drm_device *dev)
        pci_write_config_dword(ast->dev->pdev, 0x04, reg);
 
        ast_enable_vga(dev);
-       ast_enable_mmio(dev);
        ast_open_key(ast);
+       ast_enable_mmio(dev);
        ast_set_def_ext_reg(dev);
 
        if (ast->config_mode == ast_use_p2a) {