diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-14 11:11:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-14 11:11:33 +0000 |
| commit | 5f783fd0a840588ca62b9f658d306277c7127229 (patch) | |
| tree | acc2d5d7d33801ce8478e308a08acef7353b4afe /drivers/gpu | |
| parent | 684d5e05df8cdc18791e76b11f6bc85ecd4d9416 (diff) | |
| parent | 640f85865ca658ae07d485693a3d452bdbbadaba (diff) | |
Merge tag 'v4.4.167' into linux-linaro-lsk-v4.4linux-linaro-lsk-v4.4
This is the 4.4.167 stable release
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_main.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/gma500/mdfld_intel_display.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 498a94069e6b..1acebd64fded 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -557,7 +557,8 @@ int ast_driver_unload(struct drm_device *dev) drm_mode_config_cleanup(dev); ast_mm_fini(ast); - pci_iounmap(dev->pdev, ast->ioregs); + if (ast->ioregs != ast->regs + AST_IO_MM_OFFSET) + pci_iounmap(dev->pdev, ast->ioregs); pci_iounmap(dev->pdev, ast->regs); kfree(ast); return 0; diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c index acd38344b302..764094dd30dd 100644 --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c @@ -99,7 +99,7 @@ void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe) /* Wait for for the pipe enable to take effect. */ for (count = 0; count < COUNT_MAX; count++) { temp = REG_READ(map->conf); - if ((temp & PIPEACONF_PIPE_STATE) == 1) + if (temp & PIPEACONF_PIPE_STATE) break; } } |