samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: fix vram allocation when IOMMU is not present

Browse Source 
Allocate DSI/LUTDMA buffers from VRAM when IOMMU is not
available. Add checks in msm_gem to avoid few operations
when aspace is not available due to no IOMMU. Parse the
VRAM size from device tree, when available.

Change-Id: Iedf5749b71c2e772ac5434048520a34705c54b45
Signed-off-by: Veera Sundaram Sankaran <veeras@codeaurora.org>
This commit is contained in:
Veera Sundaram Sankaran
2020-05-26 14:52:46 -07:00
parent 743dc695c4
commit 88037da799
5 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
msm/dsi/dsi_display.c
View File

@@ -495,17 +495,23 @@ static int dsi_host_alloc_cmd_tx_buffer(struct dsi_display *display)
display->aspace = msm_gem_smmu_address_space_get(
display->drm_dev, MSM_SMMU_DOMAIN_UNSECURE);
if (!display->aspace) {
DSI_ERR("failed to get aspace\n");
rc = -EINVAL;
goto free_gem;
}
/* register to aspace */
rc = msm_gem_address_space_register_cb(display->aspace,
dsi_display_aspace_cb_locked, (void *)display);
if (rc) {
DSI_ERR("failed to register callback %d\n", rc);
if (PTR_ERR(display->aspace) == -ENODEV) {
display->aspace = NULL;
DSI_DEBUG("IOMMU not present, relying on VRAM\n");
} else if (IS_ERR_OR_NULL(display->aspace)) {
rc = PTR_ERR(display->aspace);
display->aspace = NULL;
DSI_ERR("failed to get aspace %d\n", rc);
goto free_gem;
} else if (display->aspace) {
/* register to aspace */
rc = msm_gem_address_space_register_cb(display->aspace,
dsi_display_aspace_cb_locked, (void *)display);
if (rc) {
DSI_ERR("failed to register callback %d\n", rc);
goto free_gem;
}
}
rc = msm_gem_get_iova(display->tx_cmd_buf, display->aspace,