nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: host1x: Merge upstream changes

Browse Source 
Merge upstream changes from linux-next, including merged version
of new UAPI.

JIRA LS-128

Change-Id: I32c6745d2c17902e8216e9b376fd74d38a3b5904
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2653092
Tested-by: Jonathan Hunter <jonathanh@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Mikko Perttunen
2021-09-02 14:52:52 +03:00
committed by Laxman Dewangan
parent 174f4e87f6
commit 65b76aee13
22 changed files with 195 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/host1x/dev.c
View File

@@ -528,12 +528,6 @@ static int host1x_probe(struct platform_device *pdev)
goto deinit_syncpt;
}
err = host1x_uapi_init(&host->uapi, host);
if (err) {
dev_err(&pdev->dev, "failed to initialize uapi\n");
goto deinit_intr;
}
host1x_debug_init(host);
if (host->info->has_hypervisor)
@@ -553,8 +547,6 @@ unregister:
host1x_unregister(host);
deinit_debugfs:
host1x_debug_deinit(host);
host1x_uapi_deinit(&host->uapi);
deinit_intr:
host1x_intr_deinit(host);
deinit_syncpt:
host1x_syncpt_deinit(host);
@@ -576,7 +568,6 @@ static int host1x_remove(struct platform_device *pdev)
host1x_unregister(host);
host1x_debug_deinit(host);
host1x_uapi_deinit(&host->uapi);
host1x_intr_deinit(host);
host1x_syncpt_deinit(host);
reset_control_assert(host->rst);