diff options
| author | Moritz Fischer <mdf@kernel.org> | 2019-09-04 04:35:07 +0200 |
|---|---|---|
| committer | Moritz Fischer <mdf@kernel.org> | 2019-09-04 04:35:07 +0200 |
| commit | af9ca4b0bd0502bb134f18d394a613be371d2352 (patch) | |
| tree | 37b1159d4456e223981dddde4795f2061c83d14c /drivers/gpu/drm/ast/ast_main.c | |
| parent | Merge tag 'dev_groups_all_drivers' into fpga-dfl-for-5.4 (diff) | |
| parent | Merge 5.3-rc7 into char-misc-next (diff) | |
| download | linux-af9ca4b0bd0502bb134f18d394a613be371d2352.tar.xz linux-af9ca4b0bd0502bb134f18d394a613be371d2352.zip | |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc into fpga-dfl-for-5.4
Diffstat (limited to 'drivers/gpu/drm/ast/ast_main.c')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 4c7e31cb45ff..a5d1494a3dc4 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -131,8 +131,8 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post) /* Enable extended register access */ - ast_enable_mmio(dev); ast_open_key(ast); + ast_enable_mmio(dev); /* Find out whether P2A works or whether to use device-tree */ ast_detect_config_mode(dev, &scu_rev); @@ -576,6 +576,9 @@ void ast_driver_unload(struct drm_device *dev) { struct ast_private *ast = dev->dev_private; + /* enable standard VGA decode */ + ast_set_index_reg(ast, AST_IO_CRTC_PORT, 0xa1, 0x04); + ast_release_firmware(dev); kfree(ast->dp501_fw_addr); ast_mode_fini(dev); |