diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/channel.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/channel.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c index e2a10634..727b5067 100644 --- a/drivers/gpu/nvgpu/common/linux/channel.c +++ b/drivers/gpu/nvgpu/common/linux/channel.c | |||
@@ -692,10 +692,6 @@ static int gk20a_submit_append_gpfifo(struct channel_gk20a *c, | |||
692 | * This path (from userspace to sysmem) is special in order to | 692 | * This path (from userspace to sysmem) is special in order to |
693 | * avoid two copies unnecessarily (from user to pipe, then from | 693 | * avoid two copies unnecessarily (from user to pipe, then from |
694 | * pipe to gpu sysmem buffer). | 694 | * pipe to gpu sysmem buffer). |
695 | * | ||
696 | * As a special case, the pipe buffer exists if PRAMIN writes | ||
697 | * are forced, although the buffers may not be in vidmem in | ||
698 | * that case. | ||
699 | */ | 695 | */ |
700 | if (end > gpfifo_size) { | 696 | if (end > gpfifo_size) { |
701 | /* wrap-around */ | 697 | /* wrap-around */ |
@@ -723,8 +719,7 @@ static int gk20a_submit_append_gpfifo(struct channel_gk20a *c, | |||
723 | 0, num_entries); | 719 | 0, num_entries); |
724 | goto out; | 720 | goto out; |
725 | } else if (user_gpfifo) { | 721 | } else if (user_gpfifo) { |
726 | /* from userspace to vidmem or sysmem when pramin forced, use | 722 | /* from userspace to vidmem, use the common copy path below */ |
727 | * the common copy path below */ | ||
728 | err = copy_from_user(c->gpfifo.pipe, user_gpfifo, len); | 723 | err = copy_from_user(c->gpfifo.pipe, user_gpfifo, len); |
729 | if (err) | 724 | if (err) |
730 | return err; | 725 | return err; |