diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 48af49e9b..9bcbf2850 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -79,6 +79,7 @@ nvgpu-y += common/bus/bus_gk20a.o \ # Linux specific parts of nvgpu. nvgpu-y += \ + os/linux/gk20a.o \ os/linux/os_ops.o \ os/linux/os_ops_gm20b.o \ os/linux/os_ops_gp10b.o \ @@ -266,7 +267,6 @@ nvgpu-y += \ common/ecc.o \ common/ce2.o \ common/debugger.o \ - gk20a/gk20a.o \ gk20a/ce2_gk20a.o \ gk20a/fifo_gk20a.o \ gk20a/regops_gk20a.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 0cb370a94..69d267843 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -45,6 +45,7 @@ srcs := os/posix/nvgpu.c \ os/posix/lock.c \ os/posix/stubs.c \ os/posix/posix-fault-injection.c \ + os/posix/gk20a.c \ common/mm/nvgpu_allocator.c \ common/mm/bitmap_allocator.c \ common/mm/buddy_allocator.c \ @@ -174,7 +175,6 @@ srcs := os/posix/nvgpu.c \ pmgr/pwrpolicy.c \ lpwr/lpwr.c \ lpwr/rppg.c \ - gk20a/gk20a.c \ common/ptimer/ptimer_gk20a.c \ gk20a/ce2_gk20a.c \ gk20a/fifo_gk20a.c \ diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/os/linux/gk20a.c similarity index 100% rename from drivers/gpu/nvgpu/gk20a/gk20a.c rename to drivers/gpu/nvgpu/os/linux/gk20a.c diff --git a/drivers/gpu/nvgpu/os/posix/gk20a.c b/drivers/gpu/nvgpu/os/posix/gk20a.c new file mode 100644 index 000000000..aa31c4ff2 --- /dev/null +++ b/drivers/gpu/nvgpu/os/posix/gk20a.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include +#include + +int gk20a_init_gpu_characteristics(struct gk20a *g) +{ + BUG(); + + return 0; +} + +struct gk20a * __must_check gk20a_get(struct gk20a *g) +{ + BUG(); + + return g; +} + +void gk20a_put(struct gk20a *g) +{ + BUG(); +}