From ae13910bd9681abcb3eda02b55609e7cd31c0e00 Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Mon, 11 Feb 2019 16:14:15 +0530 Subject: [PATCH] gpu: nvgpu: move engine queues out of falcon to common With engine queues implementations now isolated from falcon unit let us move it to common with following units in the sources: 1. nvgpu.common.engine_queues.mem_queues.mem_queue 2. nvgpu.common.engine_queues.mem_queues.emem_queue 3. nvgpu.common.engine_queues.mem_queues.dmem_queue 4. nvgpu.common.engine_queues.fb_queue 5. nvgpu.common.falcon.falcon 6. nvgpu.common.hal.falcon File/folder names are prepended with "engine_" for better understanding. JIRA NVGPU-1994 Change-Id: I02b06f134e964b0ec665208ae4e08ae65504ed4e Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/2016291 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 8 ++++---- drivers/gpu/nvgpu/Makefile.sources | 8 ++++---- .../common/{falcon => engine_queues}/engine_dmem_queue.c | 0 .../common/{falcon => engine_queues}/engine_dmem_queue.h | 0 .../common/{falcon => engine_queues}/engine_emem_queue.c | 0 .../common/{falcon => engine_queues}/engine_emem_queue.h | 0 .../common/{falcon => engine_queues}/engine_fb_queue.c | 0 .../{falcon => engine_queues}/engine_fb_queue_priv.h | 0 .../common/{falcon => engine_queues}/engine_mem_queue.c | 0 .../{falcon => engine_queues}/engine_mem_queue_priv.h | 0 10 files changed, 8 insertions(+), 8 deletions(-) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_dmem_queue.c (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_dmem_queue.h (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_emem_queue.c (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_emem_queue.h (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_fb_queue.c (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_fb_queue_priv.h (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_mem_queue.c (100%) rename drivers/gpu/nvgpu/common/{falcon => engine_queues}/engine_mem_queue_priv.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 1c7c77af4..76b4cdb90 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -320,10 +320,10 @@ nvgpu-y += \ common/falcon/falcon_gp106.o \ common/falcon/falcon_gv100.o \ common/falcon/falcon_tu104.o \ - common/falcon/engine_mem_queue.o \ - common/falcon/engine_dmem_queue.o \ - common/falcon/engine_emem_queue.o \ - common/falcon/engine_fb_queue.o \ + common/engine_queues/engine_mem_queue.o \ + common/engine_queues/engine_dmem_queue.o \ + common/engine_queues/engine_emem_queue.o \ + common/engine_queues/engine_fb_queue.o \ common/init/hal_init.o \ common/sec2/sec2.o \ common/sec2/sec2_ipc.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 9c3ce69a7..ce294a6d1 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -123,10 +123,10 @@ srcs += common/sim.c \ common/falcon/falcon_gp106.c \ common/falcon/falcon_gv100.c \ common/falcon/falcon_tu104.c \ - common/falcon/engine_mem_queue.c \ - common/falcon/engine_dmem_queue.c \ - common/falcon/engine_emem_queue.c \ - common/falcon/engine_fb_queue.c \ + common/engine_queues/engine_mem_queue.c \ + common/engine_queues/engine_dmem_queue.c \ + common/engine_queues/engine_emem_queue.c \ + common/engine_queues/engine_fb_queue.c \ common/gr/ctxsw_prog/ctxsw_prog_gm20b.c \ common/gr/ctxsw_prog/ctxsw_prog_gp10b.c \ common/gr/ctxsw_prog/ctxsw_prog_gv11b.c \ diff --git a/drivers/gpu/nvgpu/common/falcon/engine_dmem_queue.c b/drivers/gpu/nvgpu/common/engine_queues/engine_dmem_queue.c similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_dmem_queue.c rename to drivers/gpu/nvgpu/common/engine_queues/engine_dmem_queue.c diff --git a/drivers/gpu/nvgpu/common/falcon/engine_dmem_queue.h b/drivers/gpu/nvgpu/common/engine_queues/engine_dmem_queue.h similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_dmem_queue.h rename to drivers/gpu/nvgpu/common/engine_queues/engine_dmem_queue.h diff --git a/drivers/gpu/nvgpu/common/falcon/engine_emem_queue.c b/drivers/gpu/nvgpu/common/engine_queues/engine_emem_queue.c similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_emem_queue.c rename to drivers/gpu/nvgpu/common/engine_queues/engine_emem_queue.c diff --git a/drivers/gpu/nvgpu/common/falcon/engine_emem_queue.h b/drivers/gpu/nvgpu/common/engine_queues/engine_emem_queue.h similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_emem_queue.h rename to drivers/gpu/nvgpu/common/engine_queues/engine_emem_queue.h diff --git a/drivers/gpu/nvgpu/common/falcon/engine_fb_queue.c b/drivers/gpu/nvgpu/common/engine_queues/engine_fb_queue.c similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_fb_queue.c rename to drivers/gpu/nvgpu/common/engine_queues/engine_fb_queue.c diff --git a/drivers/gpu/nvgpu/common/falcon/engine_fb_queue_priv.h b/drivers/gpu/nvgpu/common/engine_queues/engine_fb_queue_priv.h similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_fb_queue_priv.h rename to drivers/gpu/nvgpu/common/engine_queues/engine_fb_queue_priv.h diff --git a/drivers/gpu/nvgpu/common/falcon/engine_mem_queue.c b/drivers/gpu/nvgpu/common/engine_queues/engine_mem_queue.c similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_mem_queue.c rename to drivers/gpu/nvgpu/common/engine_queues/engine_mem_queue.c diff --git a/drivers/gpu/nvgpu/common/falcon/engine_mem_queue_priv.h b/drivers/gpu/nvgpu/common/engine_queues/engine_mem_queue_priv.h similarity index 100% rename from drivers/gpu/nvgpu/common/falcon/engine_mem_queue_priv.h rename to drivers/gpu/nvgpu/common/engine_queues/engine_mem_queue_priv.h