From c60f43f0bafd5692a5ff979c063ca181c0384b7a Mon Sep 17 00:00:00 2001 From: Seeta Rama Raju Date: Sun, 18 Oct 2020 12:53:48 +0530 Subject: [PATCH] gpu: nvgpu: update path of gpu firmware for unit tests - Removing gpu firmware files from nvgpu repo, now Unit tests will access these from /proc/boot/ on QNX. Bug 3093555 Change-Id: I2258a80fdf2f52220ec19d330a78f8b048e7bddb Signed-off-by: Seeta Rama Raju Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2429544 (cherry picked from commit b3ccf7b007a423860aa60a7b7bddc41562076069) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2429549 Reviewed-by: automaticguardword Reviewed-by: Deepak Nibade Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/posix/firmware.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/nvgpu/os/posix/firmware.c b/drivers/gpu/nvgpu/os/posix/firmware.c index 87c5d1bcc..6ecbb9e0a 100644 --- a/drivers/gpu/nvgpu/os/posix/firmware.c +++ b/drivers/gpu/nvgpu/os/posix/firmware.c @@ -30,7 +30,12 @@ #include #define FW_MAX_PATH_SIZE 2048U + +#if defined(__QNX__) +#define NVGPU_UNITTEST_UCODE_PATH "/gv11b/" +#else #define NVGPU_UNITTEST_UCODE_PATH "/firmware/gv11b/" +#endif static int nvgpu_ucode_load(struct gk20a *g, const char *path, struct nvgpu_firmware *ucode) @@ -115,7 +120,12 @@ struct nvgpu_firmware *nvgpu_request_firmware(struct gk20a *g, return NULL; } +#if defined(__QNX__) + strcpy(full_path, "/proc/boot/"); +#else getcwd(full_path, FW_MAX_PATH_SIZE); +#endif + full_path_len = strlen(full_path); full_path_len += strlen(fw_name); full_path_len += strlen(NVGPU_UNITTEST_UCODE_PATH);