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
Kirill Smelkov
linux
Commits
b9a3906b
Commit
b9a3906b
authored
Jun 04, 2012
by
Ben Widawsky
Committed by
Daniel Vetter
Jun 14, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/i915: add ccid to error state
Signed-off-by:
Ben Widawsky
<
ben@bwidawsk.net
>
parent
dfabbcb4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
0 deletions
+3
-0
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_debugfs.c
+1
-0
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_drv.h
+1
-0
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_irq.c
+1
-0
No files found.
drivers/gpu/drm/i915/i915_debugfs.c
View file @
b9a3906b
...
@@ -713,6 +713,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
...
@@ -713,6 +713,7 @@ static int i915_error_state(struct seq_file *m, void *unused)
seq_printf
(
m
,
"EIR: 0x%08x
\n
"
,
error
->
eir
);
seq_printf
(
m
,
"EIR: 0x%08x
\n
"
,
error
->
eir
);
seq_printf
(
m
,
"IER: 0x%08x
\n
"
,
error
->
ier
);
seq_printf
(
m
,
"IER: 0x%08x
\n
"
,
error
->
ier
);
seq_printf
(
m
,
"PGTBL_ER: 0x%08x
\n
"
,
error
->
pgtbl_er
);
seq_printf
(
m
,
"PGTBL_ER: 0x%08x
\n
"
,
error
->
pgtbl_er
);
seq_printf
(
m
,
"CCID: 0x%08x
\n
"
,
error
->
ccid
);
for
(
i
=
0
;
i
<
dev_priv
->
num_fence_regs
;
i
++
)
for
(
i
=
0
;
i
<
dev_priv
->
num_fence_regs
;
i
++
)
seq_printf
(
m
,
" fence[%d] = %08llx
\n
"
,
i
,
error
->
fence
[
i
]);
seq_printf
(
m
,
" fence[%d] = %08llx
\n
"
,
i
,
error
->
fence
[
i
]);
...
...
drivers/gpu/drm/i915/i915_drv.h
View file @
b9a3906b
...
@@ -176,6 +176,7 @@ struct drm_i915_error_state {
...
@@ -176,6 +176,7 @@ struct drm_i915_error_state {
u32
eir
;
u32
eir
;
u32
pgtbl_er
;
u32
pgtbl_er
;
u32
ier
;
u32
ier
;
u32
ccid
;
bool
waiting
[
I915_NUM_RINGS
];
bool
waiting
[
I915_NUM_RINGS
];
u32
pipestat
[
I915_MAX_PIPES
];
u32
pipestat
[
I915_MAX_PIPES
];
u32
tail
[
I915_NUM_RINGS
];
u32
tail
[
I915_NUM_RINGS
];
...
...
drivers/gpu/drm/i915/i915_irq.c
View file @
b9a3906b
...
@@ -1156,6 +1156,7 @@ static void i915_capture_error_state(struct drm_device *dev)
...
@@ -1156,6 +1156,7 @@ static void i915_capture_error_state(struct drm_device *dev)
kref_init
(
&
error
->
ref
);
kref_init
(
&
error
->
ref
);
error
->
eir
=
I915_READ
(
EIR
);
error
->
eir
=
I915_READ
(
EIR
);
error
->
pgtbl_er
=
I915_READ
(
PGTBL_ER
);
error
->
pgtbl_er
=
I915_READ
(
PGTBL_ER
);
error
->
ccid
=
I915_READ
(
CCID
);
if
(
HAS_PCH_SPLIT
(
dev
))
if
(
HAS_PCH_SPLIT
(
dev
))
error
->
ier
=
I915_READ
(
DEIER
)
|
I915_READ
(
GTIER
);
error
->
ier
=
I915_READ
(
DEIER
)
|
I915_READ
(
GTIER
);
...
...
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