From 1a9d4c1cfa5ad202f94c563ffa831b0ea726108d Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Thu, 25 Jan 2018 11:20:31 -0800 Subject: gpu: nvgpu: vgpu: remove virt_ctx from tegra_gr_comm queue index can already index the queues. It also help make the api more common. Jira EVLR-2364 Change-Id: I98a5014ba0510a2687fdf096a160c497bd1f6985 Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1646197 Reviewed-by: Damian Halas Reviewed-by: svc-mobile-coverity Reviewed-by: Aingara Paramakuru GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: Nirav Patel Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c') diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c index cdf3ef1c..3d5afcf9 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.c @@ -53,8 +53,7 @@ static inline int vgpu_comm_init(struct platform_device *pdev) { size_t queue_sizes[] = { TEGRA_VGPU_QUEUE_SIZES }; - return tegra_gr_comm_init(pdev, TEGRA_GR_COMM_CTX_CLIENT, 3, - queue_sizes, TEGRA_VGPU_QUEUE_CMD, + return tegra_gr_comm_init(pdev, 3, queue_sizes, TEGRA_VGPU_QUEUE_CMD, ARRAY_SIZE(queue_sizes)); } @@ -62,8 +61,7 @@ static inline void vgpu_comm_deinit(void) { size_t queue_sizes[] = { TEGRA_VGPU_QUEUE_SIZES }; - tegra_gr_comm_deinit(TEGRA_GR_COMM_CTX_CLIENT, TEGRA_VGPU_QUEUE_CMD, - ARRAY_SIZE(queue_sizes)); + tegra_gr_comm_deinit(TEGRA_VGPU_QUEUE_CMD, ARRAY_SIZE(queue_sizes)); } int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in, @@ -74,8 +72,7 @@ int vgpu_comm_sendrecv(struct tegra_vgpu_cmd_msg *msg, size_t size_in, void *data = msg; int err; - err = tegra_gr_comm_sendrecv(TEGRA_GR_COMM_CTX_CLIENT, - tegra_gr_comm_get_server_vmid(), + err = tegra_gr_comm_sendrecv(tegra_gr_comm_get_server_vmid(), TEGRA_VGPU_QUEUE_CMD, &handle, &data, &size); if (!err) { WARN_ON(size < size_out); @@ -152,8 +149,7 @@ static int vgpu_intr_thread(void *dev_id) size_t size; int err; - err = tegra_gr_comm_recv(TEGRA_GR_COMM_CTX_CLIENT, - TEGRA_VGPU_QUEUE_INTR, &handle, + err = tegra_gr_comm_recv(TEGRA_VGPU_QUEUE_INTR, &handle, (void **)&msg, &size, &sender); if (err == -ETIME) continue; @@ -229,8 +225,7 @@ static void vgpu_remove_support(struct gk20a *g) g->mm.remove_support(&g->mm); msg.event = TEGRA_VGPU_EVENT_ABORT; - err = tegra_gr_comm_send(TEGRA_GR_COMM_CTX_CLIENT, - TEGRA_GR_COMM_ID_SELF, TEGRA_VGPU_QUEUE_INTR, + err = tegra_gr_comm_send(TEGRA_GR_COMM_ID_SELF, TEGRA_VGPU_QUEUE_INTR, &msg, sizeof(msg)); WARN_ON(err); nvgpu_thread_stop(&priv->intr_handler); -- cgit v1.2.2