android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpu: host1x: Correct host1x_job_pin() error handling

Browse Source 
In case of relocations / waitchecks patching failure the jobs pins stay
referenced till DRM file get closed, wasting memory. Add the missed
unpinning.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Reviewed-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
Dmitry Osipenko 2017-06-15 02:18:33 +03:00 committed by Thierry Reding
parent 3833d16f16
commit e5855aa3e6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/host1x/job.c
View File

@ -592,22 +592,20 @@ int host1x_job_pin(struct host1x_job *job, struct device *dev)
err = do_relocs(job, g->bo); err = do_relocs(job, g->bo);
if (err) if (err)
break; goto out;
err = do_waitchks(job, host, g->bo); err = do_waitchks(job, host, g->bo);
if (err) if (err)
break; goto out;
} }
if (IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL) && !err) { if (!IS_ENABLED(CONFIG_TEGRA_HOST1X_FIREWALL))
err = copy_gathers(job, dev); goto out;
if (err) {
host1x_job_unpin(job);
return err;
}
}
err = copy_gathers(job, dev);
out: out:
if (err)
host1x_job_unpin(job);
wmb(); wmb();
return err; return err;