nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gpu: nvgpu: take power refcount in ISR"

Browse Source 
This reverts commit 2219f38727. It leaves
GPU in on state for some tests that require powering down GPU.

Change-Id: I79d44fed729e98692021c57bbeff6a0ef2e8c983
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1161846
This commit is contained in:
Terje Bergstrom
2016-06-09 09:46:06 -07:00
parent e3162262e3
commit 3daeac112b
2 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -545,29 +545,15 @@ int gk20a_sim_esc_read(struct gk20a *g, char *path, u32 index, u32 count, u32 *d
static irqreturn_t gk20a_intr_isr_stall(int irq, void *dev_id)
{
struct gk20a *g = dev_id;
irqreturn_t ret;
ret = g->ops.mc.isr_stall(g);
if (ret == IRQ_WAKE_THREAD) {
/* balanced in gk20a_intr_thread_stall() */
gk20a_busy_noresume(g->dev);
}
return ret;
return g->ops.mc.isr_stall(g);
}
static irqreturn_t gk20a_intr_isr_nonstall(int irq, void *dev_id)
{
struct gk20a *g = dev_id;
irqreturn_t ret;
ret = g->ops.mc.isr_nonstall(g);
if (ret == IRQ_WAKE_THREAD) {
/* balanced in gk20a_intr_thread_nonstall() */
gk20a_busy_noresume(g->dev);
}
return ret;
return g->ops.mc.isr_nonstall(g);
}
void gk20a_pbus_isr(struct gk20a *g)
@@ -607,27 +593,13 @@ void gk20a_pbus_isr(struct gk20a *g)
static irqreturn_t gk20a_intr_thread_stall(int irq, void *dev_id)
{
struct gk20a *g = dev_id;
irqreturn_t ret;
ret = g->ops.mc.isr_thread_stall(g);
/* refcount taken in gk20a_intr_isr_stall() */
gk20a_idle_nosuspend(g->dev);
return ret;
return g->ops.mc.isr_thread_stall(g);
}
static irqreturn_t gk20a_intr_thread_nonstall(int irq, void *dev_id)
{
struct gk20a *g = dev_id;
irqreturn_t ret;
ret = g->ops.mc.isr_thread_nonstall(g);
/* refcount taken in gk20a_intr_isr_nonstall() */
gk20a_idle_nosuspend(g->dev);
return ret;
return g->ops.mc.isr_thread_nonstall(g);
}
void gk20a_remove_support(struct device *dev)
@@ -1870,11 +1842,6 @@ fail:
return ret < 0 ? ret : 0;
}
void gk20a_idle_nosuspend(struct device *dev)
{
pm_runtime_put_noidle(dev);
}
void gk20a_idle(struct device *dev)
{
#ifdef CONFIG_PM

1
drivers/gpu/nvgpu/gk20a/gk20a.h
View File

@@ -1061,7 +1061,6 @@ void gk20a_remove_sysfs(struct device *dev);
void gk20a_busy_noresume(struct device *dev);
int __must_check gk20a_busy(struct device *dev);
void gk20a_idle_nosuspend(struct device *dev);
void gk20a_idle(struct device *dev);
void gk20a_disable(struct gk20a *g, u32 units);
void gk20a_enable(struct gk20a *g, u32 units);