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
86e18ebd
Commit
86e18ebd
authored
Jan 28, 2020
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/disp/gv100-: not all channel types support reporting error codes
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
0e6176c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
6 deletions
+17
-6
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
+17
-6
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c
View file @
86e18ebd
...
...
@@ -101,15 +101,26 @@ gv100_disp_exception(struct nv50_disp *disp, int chid)
u32
stat
=
nvkm_rd32
(
device
,
0x611020
+
(
chid
*
12
));
u32
type
=
(
stat
&
0x00007000
)
>>
12
;
u32
mthd
=
(
stat
&
0x00000fff
)
<<
2
;
u32
data
=
nvkm_rd32
(
device
,
0x611024
+
(
chid
*
12
));
u32
code
=
nvkm_rd32
(
device
,
0x611028
+
(
chid
*
12
));
const
struct
nvkm_enum
*
reason
=
nvkm_enum_find
(
nv50_disp_intr_error_type
,
type
);
nvkm_error
(
subdev
,
"chid %d stat %08x reason %d [%s] mthd %04x "
"data %08x code %08x
\n
"
,
chid
,
stat
,
type
,
reason
?
reason
->
name
:
""
,
mthd
,
data
,
code
);
/*TODO: Suspect 33->41 are for WRBK channel exceptions, but we
* don't support those currently.
*
* CORE+WIN CHIDs map directly to the FE_EXCEPT() slots.
*/
if
(
chid
<=
32
)
{
u32
data
=
nvkm_rd32
(
device
,
0x611024
+
(
chid
*
12
));
u32
code
=
nvkm_rd32
(
device
,
0x611028
+
(
chid
*
12
));
nvkm_error
(
subdev
,
"chid %d stat %08x reason %d [%s] "
"mthd %04x data %08x code %08x
\n
"
,
chid
,
stat
,
type
,
reason
?
reason
->
name
:
""
,
mthd
,
data
,
code
);
}
else
{
nvkm_error
(
subdev
,
"chid %d stat %08x reason %d [%s] "
"mthd %04x
\n
"
,
chid
,
stat
,
type
,
reason
?
reason
->
name
:
""
,
mthd
);
}
if
(
chid
<
ARRAY_SIZE
(
disp
->
chan
)
&&
disp
->
chan
[
chid
])
{
switch
(
mthd
)
{
...
...
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