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
e2f973d5
Commit
e2f973d5
authored
Jan 27, 2011
by
Chris Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/i915: Record all error ringbuffers
Signed-off-by:
Chris Wilson
<
chris@chris-wilson.co.uk
>
parent
21dd3734
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
18 deletions
+29
-18
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_debugfs.c
+14
-9
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_drv.h
+1
-1
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_irq.c
+14
-8
No files found.
drivers/gpu/drm/i915/i915_debugfs.c
View file @
e2f973d5
...
@@ -805,18 +805,23 @@ static int i915_error_state(struct seq_file *m, void *unused)
...
@@ -805,18 +805,23 @@ static int i915_error_state(struct seq_file *m, void *unused)
}
}
}
}
if
(
error
->
ringbuffer
)
{
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
error
->
ringbuffer
);
i
++
)
{
struct
drm_i915_error_object
*
obj
=
error
->
ringbuffer
;
if
(
error
->
ringbuffer
[
i
])
{
struct
drm_i915_error_object
*
obj
=
error
->
ringbuffer
[
i
];
seq_printf
(
m
,
"--- ringbuffer = 0x%08x
\n
"
,
obj
->
gtt_offset
);
seq_printf
(
m
,
"%s --- ringbuffer = 0x%08x
\n
"
,
dev_priv
->
ring
[
i
].
name
,
obj
->
gtt_offset
);
offset
=
0
;
offset
=
0
;
for
(
page
=
0
;
page
<
obj
->
page_count
;
page
++
)
{
for
(
page
=
0
;
page
<
obj
->
page_count
;
page
++
)
{
for
(
elt
=
0
;
elt
<
PAGE_SIZE
/
4
;
elt
++
)
{
for
(
elt
=
0
;
elt
<
PAGE_SIZE
/
4
;
elt
++
)
{
seq_printf
(
m
,
"%08x : %08x
\n
"
,
offset
,
obj
->
pages
[
page
][
elt
]);
seq_printf
(
m
,
"%08x : %08x
\n
"
,
offset
,
obj
->
pages
[
page
][
elt
]);
offset
+=
4
;
offset
+=
4
;
}
}
}
}
}
}
}
if
(
error
->
overlay
)
if
(
error
->
overlay
)
intel_overlay_print_error_state
(
m
,
error
->
overlay
);
intel_overlay_print_error_state
(
m
,
error
->
overlay
);
...
...
drivers/gpu/drm/i915/i915_drv.h
View file @
e2f973d5
...
@@ -174,7 +174,7 @@ struct drm_i915_error_state {
...
@@ -174,7 +174,7 @@ struct drm_i915_error_state {
int
page_count
;
int
page_count
;
u32
gtt_offset
;
u32
gtt_offset
;
u32
*
pages
[
0
];
u32
*
pages
[
0
];
}
*
ringbuffer
,
*
batchbuffer
[
I915_NUM_RINGS
];
}
*
ringbuffer
[
I915_NUM_RINGS
]
,
*
batchbuffer
[
I915_NUM_RINGS
];
struct
drm_i915_error_buffer
{
struct
drm_i915_error_buffer
{
u32
size
;
u32
size
;
u32
name
;
u32
name
;
...
...
drivers/gpu/drm/i915/i915_irq.c
View file @
e2f973d5
...
@@ -648,9 +648,14 @@ static void
...
@@ -648,9 +648,14 @@ static void
i915_error_state_free
(
struct
drm_device
*
dev
,
i915_error_state_free
(
struct
drm_device
*
dev
,
struct
drm_i915_error_state
*
error
)
struct
drm_i915_error_state
*
error
)
{
{
i915_error_object_free
(
error
->
batchbuffer
[
0
]);
int
i
;
i915_error_object_free
(
error
->
batchbuffer
[
1
]);
i915_error_object_free
(
error
->
ringbuffer
);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
error
->
batchbuffer
);
i
++
)
i915_error_object_free
(
error
->
batchbuffer
[
i
]);
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
error
->
ringbuffer
);
i
++
)
i915_error_object_free
(
error
->
ringbuffer
[
i
]);
kfree
(
error
->
active_bo
);
kfree
(
error
->
active_bo
);
kfree
(
error
->
overlay
);
kfree
(
error
->
overlay
);
kfree
(
error
);
kfree
(
error
);
...
@@ -824,15 +829,16 @@ static void i915_capture_error_state(struct drm_device *dev)
...
@@ -824,15 +829,16 @@ static void i915_capture_error_state(struct drm_device *dev)
}
}
i915_gem_record_fences
(
dev
,
error
);
i915_gem_record_fences
(
dev
,
error
);
/* Record the active batchbuffers */
/* Record the active batch
and ring
buffers */
for
(
i
=
0
;
i
<
I915_NUM_RINGS
;
i
++
)
for
(
i
=
0
;
i
<
I915_NUM_RINGS
;
i
++
)
{
error
->
batchbuffer
[
i
]
=
error
->
batchbuffer
[
i
]
=
i915_error_first_batchbuffer
(
dev_priv
,
i915_error_first_batchbuffer
(
dev_priv
,
&
dev_priv
->
ring
[
i
]);
&
dev_priv
->
ring
[
i
]);
/* Record the ringbuffer */
error
->
ringbuffer
[
i
]
=
error
->
ringbuffer
=
i915_error_object_create
(
dev_priv
,
i915_error_object_create
(
dev_priv
,
dev_priv
->
ring
[
RCS
].
obj
);
dev_priv
->
ring
[
i
].
obj
);
}
/* Record buffers on the active and pinned lists. */
/* Record buffers on the active and pinned lists. */
error
->
active_bo
=
NULL
;
error
->
active_bo
=
NULL
;
...
...
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