From c1750f45f5239508e7a67db0627552f87943ec9f Mon Sep 17 00:00:00 2001 From: Sachit Kadle Date: Fri, 4 Nov 2016 17:48:59 -0700 Subject: gpu: nvgpu: add tsg_open HAL interface Add HAL interface for TSG open, which is intended to be called from the exisiting gk20a_tsg_open function. The tsg_open entryoint is only implemented for vgpu, as the server needs to clear metadata when a tsg is opened. Bug 200215060 Change-Id: Icc8fd602f31e52d9fa9b2e7786b665b9e7b9294e Signed-off-by: Sachit Kadle Reviewed-on: http://git-master/r/1249218 (cherry picked from commit 35c86f7c796c6574d3dc336e20012ea5c16d7cb4) Reviewed-on: http://git-master/r/1256468 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.h | 1 + drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 14 ++++++++++++++ drivers/gpu/nvgpu/vgpu/tsg_vgpu.c | 23 +++++++++++++++++++++++ 3 files changed, 38 insertions(+) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index ed3a1d2d..f492801e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -392,6 +392,7 @@ struct gpu_ops { int (*tsg_bind_channel)(struct tsg_gk20a *tsg, struct channel_gk20a *ch); int (*tsg_unbind_channel)(struct channel_gk20a *ch); + int (*tsg_open)(struct tsg_gk20a *tsg); u32 (*eng_runlist_base_size)(void); int (*init_engine_info)(struct fifo_gk20a *f); u32 (*runlist_entry_size)(void); diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 43ee79cd..fc36c0c7 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c @@ -402,6 +402,7 @@ int gk20a_tsg_open(struct gk20a *g, struct file *filp) { struct tsg_gk20a *tsg; struct device *dev; + int err; dev = dev_from_gk20a(g); @@ -426,11 +427,24 @@ int gk20a_tsg_open(struct gk20a *g, struct file *filp) filp->private_data = tsg; + if (g->ops.fifo.tsg_open) { + err = g->ops.fifo.tsg_open(tsg); + if (err) { + gk20a_err(dev, "tsg %d fifo open failed %d", + tsg->tsgid, err); + goto clean_up; + } + } + gk20a_dbg(gpu_dbg_fn, "tsg opened %d\n", tsg->tsgid); gk20a_sched_ctrl_tsg_added(g, tsg); return 0; + +clean_up: + kref_put(&tsg->refcount, gk20a_tsg_release); + return err; } int gk20a_tsg_dev_open(struct inode *inode, struct file *filp) diff --git a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c index 2033fd7a..9daf9e6d 100644 --- a/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/tsg_vgpu.c @@ -23,6 +23,28 @@ #include "gk20a/tsg_gk20a.h" #include "vgpu.h" +static int vgpu_tsg_open(struct tsg_gk20a *tsg) +{ + struct tegra_vgpu_cmd_msg msg = {}; + struct tegra_vgpu_tsg_open_params *p = + &msg.params.tsg_open; + int err; + + gk20a_dbg_fn(""); + + msg.cmd = TEGRA_VGPU_CMD_TSG_OPEN; + msg.handle = vgpu_get_handle(tsg->g); + p->tsg_id = tsg->tsgid; + err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg)); + err = err ? err : msg.ret; + if (err) { + gk20a_err(dev_from_gk20a(tsg->g), + "vgpu_tsg_open failed, tsgid %d", tsg->tsgid); + } + + return err; +} + static int vgpu_tsg_bind_channel(struct tsg_gk20a *tsg, struct channel_gk20a *ch) { @@ -101,4 +123,5 @@ void vgpu_init_tsg_ops(struct gpu_ops *gops) gops->fifo.tsg_bind_channel = vgpu_tsg_bind_channel; gops->fifo.tsg_unbind_channel = vgpu_tsg_unbind_channel; gops->fifo.tsg_set_timeslice = vgpu_tsg_set_timeslice; + gops->fifo.tsg_open = vgpu_tsg_open; } -- cgit v1.2.2