diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sync_sema_android.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c index 25832417..e7070612 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | |||
@@ -58,8 +58,8 @@ int nvgpu_os_fence_sema_wait_gen_cmd(struct nvgpu_os_fence *s, | |||
58 | } | 58 | } |
59 | 59 | ||
60 | for (i = 0; i < num_wait_cmds; i++) { | 60 | for (i = 0; i < num_wait_cmds; i++) { |
61 | struct fence *f = sync_fence->cbs[i].sync_pt; | 61 | struct sync_pt *pt = sync_pt_from_fence( |
62 | struct sync_pt *pt = sync_pt_from_fence(f); | 62 | sync_fence->cbs[i].sync_pt); |
63 | 63 | ||
64 | sema = gk20a_sync_pt_sema(pt); | 64 | sema = gk20a_sync_pt_sema(pt); |
65 | gk20a_channel_gen_sema_wait_cmd(c, sema, wait_cmd, | 65 | gk20a_channel_gen_sema_wait_cmd(c, sema, wait_cmd, |
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c index d7a72fcd..dc340f1a 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | |||
@@ -70,8 +70,8 @@ int nvgpu_os_fence_syncpt_wait_gen_cmd(struct nvgpu_os_fence *s, | |||
70 | } | 70 | } |
71 | 71 | ||
72 | for (i = 0; i < sync_fence->num_fences; i++) { | 72 | for (i = 0; i < sync_fence->num_fences; i++) { |
73 | struct fence *f = sync_fence->cbs[i].sync_pt; | 73 | struct sync_pt *pt = sync_pt_from_fence( |
74 | struct sync_pt *pt = sync_pt_from_fence(f); | 74 | sync_fence->cbs[i].sync_pt); |
75 | u32 wait_id = nvgpu_nvhost_sync_pt_id(pt); | 75 | u32 wait_id = nvgpu_nvhost_sync_pt_id(pt); |
76 | u32 wait_value = nvgpu_nvhost_sync_pt_thresh(pt); | 76 | u32 wait_value = nvgpu_nvhost_sync_pt_thresh(pt); |
77 | 77 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c index 4dd10e6e..9598f2df 100644 --- a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c +++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c | |||
@@ -15,7 +15,6 @@ | |||
15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | |||
19 | #include <linux/file.h> | 18 | #include <linux/file.h> |
20 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
21 | #include <linux/hrtimer.h> | 20 | #include <linux/hrtimer.h> |
@@ -324,8 +323,7 @@ struct sync_fence *gk20a_sync_fence_fdget(int fd) | |||
324 | return NULL; | 323 | return NULL; |
325 | 324 | ||
326 | for (i = 0; i < fence->num_fences; i++) { | 325 | for (i = 0; i < fence->num_fences; i++) { |
327 | struct fence *pt = fence->cbs[i].sync_pt; | 326 | struct sync_pt *spt = sync_pt_from_fence(fence->cbs[i].sync_pt); |
328 | struct sync_pt *spt = sync_pt_from_fence(pt); | ||
329 | struct sync_timeline *t; | 327 | struct sync_timeline *t; |
330 | 328 | ||
331 | if (spt == NULL) { | 329 | if (spt == NULL) { |