diff options
| author | Rob Clark <robdclark@gmail.com> | 2017-02-13 10:14:09 -0700 |
|---|---|---|
| committer | Jordan Crouse <jcrouse@codeaurora.org> | 2017-02-13 15:29:46 -0700 |
| commit | 25f709275834c4219aff4451afa234e9d2be5126 (patch) | |
| tree | ba273cbf3616b189ac322e8b628e416e75e7cade /drivers/gpu | |
| parent | a2f939ec05189b9fe36e2186c39be33e583f35f4 (diff) | |
drm/msm: set dma_mask properly
Previous value really only made sense on armv7 without LPAE. Everything
that supports more than 4g of memory also has iommu's that can map
anything.
Change-Id: Ic0dedbad6ca5973f2ac0d2690dec77e40787b8da
Git-commit: 49d24b7a6bf253aeb7cb81672316c83e7b628ea9
Git-repo: https://github.com/freedreno/kernel-msm
Signed-off-by: Rob Clark <robdclark@gmail.com>
[jcrouse@codeaurora.org: Fixed minor merge issues]
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 5d04b0384215..1dcf88a23afa 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1777,7 +1777,13 @@ static int msm_pdev_probe(struct platform_device *pdev) component_match_add(&pdev->dev, &match, compare_dev, dev); } #endif - pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); + /* on all devices that I am aware of, iommu's which cna map + * any address the cpu can see are used: + */ + ret = dma_set_mask_and_coherent(&pdev->dev, ~0); + if (ret) + return ret; + ret = msm_add_master_component(&pdev->dev, match); return ret; |