nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

video: tegra: host: fix the bundle corruption

Browse Source 
Wait for FE idle between SW bundles.

Bug 1477234
Bug 1486347
Bug 1485069

Change-Id: I5181b1240fff73cfecd07aa3e54076cde800ea00
Signed-off-by: Kevin Huang <kevinh@nvidia.com>
Reviewed-on: http://git-master/r/391591
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Kevin Huang
2014-04-02 18:36:42 -07:00
committed by Dan Willemsen
parent bde3d332f9
commit ea76deaa6a
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/nvgpu/gk20a/gr_gk20a.c
View File

@@ -322,6 +322,34 @@ static int gr_gk20a_wait_idle(struct gk20a *g, unsigned long end_jiffies,
return -EAGAIN;
}
static int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long end_jiffies,
u32 expect_delay)
{
u32 val;
u32 delay = expect_delay;
gk20a_dbg_fn("");
do {
val = gk20a_readl(g, gr_status_r());
if (!gr_status_fe_method_upper_v(val) &&
!gr_status_fe_method_lower_v(val) &&
!gr_status_fe_method_fe_gi_v(val)) {
gk20a_dbg_fn("done");
return 0;
}
usleep_range(delay, delay * 2);
delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX);
} while (time_before(jiffies, end_jiffies)
|| !tegra_platform_is_silicon());
gk20a_err(dev_from_gk20a(g),
"timeout, fe busy : %x", val);
return -EAGAIN;
}
static int gr_gk20a_ctx_reset(struct gk20a *g, u32 rst_mask)
{
u32 delay = GR_IDLE_CHECK_DEFAULT;
@@ -1475,7 +1503,8 @@ static u32 gk20a_init_sw_bundle(struct gk20a *g)
/* load bundle init */
for (i = 0; i < sw_bundle_init->count; i++) {
err |= gr_gk20a_wait_fe_idle(g, end_jiffies,
GR_IDLE_CHECK_DEFAULT);
if (i == 0 || last_bundle_data != sw_bundle_init->l[i].value) {
gk20a_writel(g, gr_pipe_bundle_data_r(),
sw_bundle_init->l[i].value);

8
drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h
View File

@@ -234,6 +234,10 @@ static inline u32 gr_status_r(void)
{
return 0x00400700;
}
static inline u32 gr_status_fe_method_upper_v(u32 r)
{
return (r >> 1) & 0x1;
}
static inline u32 gr_status_fe_method_lower_v(u32 r)
{
return (r >> 2) & 0x1;
@@ -242,6 +246,10 @@ static inline u32 gr_status_fe_method_lower_idle_v(void)
{
return 0x00000000;
}
static inline u32 gr_status_fe_method_fe_gi_v(u32 r)
{
return (r >> 21) & 0x1;
}
static inline u32 gr_status_mask_r(void)
{
return 0x00400610;