Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
129dcca7
Commit
129dcca7
authored
Feb 23, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nve0/fifo: attempt to recover from engine ctxsw timeouts
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
98d1e317
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
0 deletions
+44
-0
drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+44
-0
No files found.
drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
View file @
129dcca7
...
...
@@ -416,6 +416,14 @@ nve0_fifo_engidx(struct nve0_fifo_priv *priv, u32 engn)
return
engn
;
}
static
inline
struct
nouveau_engine
*
nve0_fifo_engine
(
struct
nve0_fifo_priv
*
priv
,
u32
engn
)
{
if
(
engn
>=
ARRAY_SIZE
(
fifo_engine
))
return
NULL
;
return
nouveau_engine
(
priv
,
fifo_engine
[
engn
].
subdev
);
}
static
void
nve0_fifo_recover_work
(
struct
work_struct
*
work
)
{
...
...
@@ -498,6 +506,34 @@ nve0_fifo_sched_reason[] = {
{}
};
static
void
nve0_fifo_intr_sched_ctxsw
(
struct
nve0_fifo_priv
*
priv
)
{
struct
nouveau_engine
*
engine
;
struct
nve0_fifo_chan
*
chan
;
u32
engn
;
for
(
engn
=
0
;
engn
<
ARRAY_SIZE
(
fifo_engine
);
engn
++
)
{
u32
stat
=
nv_rd32
(
priv
,
0x002640
+
(
engn
*
0x04
));
u32
busy
=
(
stat
&
0x80000000
);
u32
next
=
(
stat
&
0x07ff0000
)
>>
16
;
u32
chsw
=
(
stat
&
0x00008000
);
u32
save
=
(
stat
&
0x00004000
);
u32
load
=
(
stat
&
0x00002000
);
u32
prev
=
(
stat
&
0x000007ff
);
u32
chid
=
load
?
next
:
prev
;
(
void
)
save
;
if
(
busy
&&
chsw
)
{
if
(
!
(
chan
=
(
void
*
)
priv
->
base
.
channel
[
chid
]))
continue
;
if
(
!
(
engine
=
nve0_fifo_engine
(
priv
,
engn
)))
continue
;
nve0_fifo_recover
(
priv
,
engine
,
chan
);
}
}
}
static
void
nve0_fifo_intr_sched
(
struct
nve0_fifo_priv
*
priv
)
{
...
...
@@ -511,6 +547,14 @@ nve0_fifo_intr_sched(struct nve0_fifo_priv *priv)
snprintf
(
enunk
,
sizeof
(
enunk
),
"UNK%02x"
,
code
);
nv_error
(
priv
,
"SCHED_ERROR [ %s ]
\n
"
,
en
?
en
->
name
:
enunk
);
switch
(
code
)
{
case
0x0a
:
nve0_fifo_intr_sched_ctxsw
(
priv
);
break
;
default:
break
;
}
}
static
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment