diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-08-20 15:57:19 +0300 |
|---|---|---|
| committer | Winnie Hsu <whsu@nvidia.com> | 2014-08-21 13:47:52 -0700 |
| commit | 6192df4abcedd8bf70563db9ab90dfe455297232 (patch) | |
| tree | 67250acd3e998c4ba1dad4ea824861d055df48fb /drivers/gpu | |
| parent | e31246d4c355453be7b02ed4a36bb29e04bf5106 (diff) | |
gpu: nvgpu: Never use KEPLER_C sync point increment
Bug 1497928
Change-Id: Ic3a2923ae73792e87145b6211e45e5ace3651ddc
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/482492
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Tested-by: Prabhu Kuttiyam <pkuttiyam@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index eb435977e62d..a8f57830f8ad 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c @@ -196,31 +196,20 @@ static int __gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, return -EAGAIN; } - if (gfx_class) { - WARN_ON(wfi_cmd); /* No sense to use gfx class + wfi. */ - /* setobject KEPLER_C */ - incr_cmd->ptr[j++] = 0x20010000; - incr_cmd->ptr[j++] = KEPLER_C; - /* syncpt incr */ - incr_cmd->ptr[j++] = 0x200100B2; - incr_cmd->ptr[j++] = sp->id | - (0x1 << 20) | (0x1 << 16); - } else { - if (wfi_cmd) { - /* wfi */ - incr_cmd->ptr[j++] = 0x2001001E; - /* handle, ignored */ - incr_cmd->ptr[j++] = 0x00000000; - } - /* syncpoint_a */ - incr_cmd->ptr[j++] = 0x2001001C; - /* payload, ignored */ - incr_cmd->ptr[j++] = 0; - /* syncpoint_b */ - incr_cmd->ptr[j++] = 0x2001001D; - /* syncpt_id, incr */ - incr_cmd->ptr[j++] = (sp->id << 8) | 0x1; + if (wfi_cmd) { + /* wfi */ + incr_cmd->ptr[j++] = 0x2001001E; + /* handle, ignored */ + incr_cmd->ptr[j++] = 0x00000000; } + /* syncpoint_a */ + incr_cmd->ptr[j++] = 0x2001001C; + /* payload, ignored */ + incr_cmd->ptr[j++] = 0; + /* syncpoint_b */ + incr_cmd->ptr[j++] = 0x2001001D; + /* syncpt_id, incr */ + incr_cmd->ptr[j++] = (sp->id << 8) | 0x1; WARN_ON(j != incr_cmd_size); thresh = nvhost_syncpt_incr_max_ext(sp->host1x_pdev, sp->id, 1); |