]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/ast: Call open_key before enable_mmio in POST code
authorY.C. Chen <yc_chen@aspeedtech.com>
Wed, 22 Feb 2017 04:14:19 +0000 (15:14 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Mar 2017 02:20:15 +0000 (10:20 +0800)
commit 9bb92f51558f2ef5f56c257bdcea0588f31d857e upstream.

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>
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/ast/ast_post.c

index ac7dbfac55eb8c1d4fd02a8295421366c218e171..e916011f1c810a5efef378c51942462a498e0fcb 100644 (file)
@@ -371,8 +371,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) {