From ca570376eaa68fe983bbee42676cac55a56a3c04 Mon Sep 17 00:00:00 2001 From: Shridhar Rasal Date: Thu, 6 Aug 2020 12:50:34 +0530 Subject: [PATCH] video: tegra: host: nvdla: restore dma mask to 39 This reverts commit d992031895beef8ba8032b41834b2202b76de561. Reason for revert: GP CMOD fix is available for 2 OP's issue Bug 200640073 Bug 200642227 Change-Id: Ic6dba0e851cb03f81b32a63d97252a2e41c3bfb0 Signed-off-by: Shridhar Rasal Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2394644 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Bharat Nihalani Reviewed-by: Amit Sharma (SW-TEGRA) Reviewed-by: Praveen K Reviewed-by: mobile promotions Tested-by: mobile promotions GVS: Gerrit_Virtual_Submit --- drivers/video/tegra/host/nvdla/nvdla.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/video/tegra/host/nvdla/nvdla.c b/drivers/video/tegra/host/nvdla/nvdla.c index ed887d6a..e53152b9 100644 --- a/drivers/video/tegra/host/nvdla/nvdla.c +++ b/drivers/video/tegra/host/nvdla/nvdla.c @@ -714,7 +714,7 @@ static struct of_device_id tegra_nvdla_of_match[] = { static int nvdla_probe(struct platform_device *pdev) { - int err = 0, dla_dma_bit_mask = 39; + int err = 0; struct nvhost_device_data *pdata = NULL; struct nvdla_device *nvdla_dev = NULL; struct device *dev = &pdev->dev; @@ -759,10 +759,7 @@ static int nvdla_probe(struct platform_device *pdev) goto err_no_ip; } - if (tegra_platform_is_vdk()) - dla_dma_bit_mask = 32; - - dma_set_mask(dev, DMA_BIT_MASK(dla_dma_bit_mask)); + dma_set_mask(dev, DMA_BIT_MASK(39)); nvdla_dev = devm_kzalloc(dev, sizeof(*nvdla_dev), GFP_KERNEL); if (!nvdla_dev) {