diff options
| author |   Rob Clark <robdclark@gmail.com> | 2013-10-20 11:57:52 -0400 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2013-11-01 12:39:45 -0400 |
| commit | 505886d50633385f57e8e2b14fbb636cecb50297 (patch) | |
| tree | 6a32dd7d183a168dd62133f3f2a70d899e92c711 /drivers/gpu/drm/msm/msm_gem.c | |
| parent | drm/msm: rework inactive-work (diff) | |
| download | linux-dev-505886d50633385f57e8e2b14fbb636cecb50297.tar.xz linux-dev-505886d50633385f57e8e2b14fbb636cecb50297.zip | |
drm/msm: EBUSY status handling in msm_gem_fault()
Subsequent threads returning EBUSY from vm_insert_pfn() was not
handled correctly. As a result concurrent access from new threads
to mmapped data caused SIGBUS.
See e79e0fe3
Signed-off-by: Rob Clark <robdclark@gmail.com>
Acked-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 291939de299e..e587d251c590 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -178,6 +178,11 @@ out: case 0: case -ERESTARTSYS: case -EINTR: + case -EBUSY: + /* + * EBUSY is ok: this just means that another thread + * already did the job. + */ return VM_FAULT_NOPAGE; case -ENOMEM: return VM_FAULT_OOM; |