Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
e2f973d5
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e2f973d5
编写于
1月 27, 2011
作者:
C
Chris Wilson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/i915: Record all error ringbuffers
Signed-off-by:
N
Chris Wilson
<
chris@chris-wilson.co.uk
>
上级
21dd3734
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
18 deletion
+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
未找到文件。
drivers/gpu/drm/i915/i915_debugfs.c
浏览文件 @
e2f973d5
...
...
@@ -805,15 +805,20 @@ static int i915_error_state(struct seq_file *m, void *unused)
}
}
if
(
error
->
ringbuffer
)
{
struct
drm_i915_error_object
*
obj
=
error
->
ringbuffer
;
seq_printf
(
m
,
"--- ringbuffer = 0x%08x
\n
"
,
obj
->
gtt_offset
);
offset
=
0
;
for
(
page
=
0
;
page
<
obj
->
page_count
;
page
++
)
{
for
(
elt
=
0
;
elt
<
PAGE_SIZE
/
4
;
elt
++
)
{
seq_printf
(
m
,
"%08x : %08x
\n
"
,
offset
,
obj
->
pages
[
page
][
elt
]);
offset
+=
4
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
error
->
ringbuffer
);
i
++
)
{
if
(
error
->
ringbuffer
[
i
])
{
struct
drm_i915_error_object
*
obj
=
error
->
ringbuffer
[
i
];
seq_printf
(
m
,
"%s --- ringbuffer = 0x%08x
\n
"
,
dev_priv
->
ring
[
i
].
name
,
obj
->
gtt_offset
);
offset
=
0
;
for
(
page
=
0
;
page
<
obj
->
page_count
;
page
++
)
{
for
(
elt
=
0
;
elt
<
PAGE_SIZE
/
4
;
elt
++
)
{
seq_printf
(
m
,
"%08x : %08x
\n
"
,
offset
,
obj
->
pages
[
page
][
elt
]);
offset
+=
4
;
}
}
}
}
...
...
drivers/gpu/drm/i915/i915_drv.h
浏览文件 @
e2f973d5
...
...
@@ -174,7 +174,7 @@ struct drm_i915_error_state {
int
page_count
;
u32
gtt_offset
;
u32
*
pages
[
0
];
}
*
ringbuffer
,
*
batchbuffer
[
I915_NUM_RINGS
];
}
*
ringbuffer
[
I915_NUM_RINGS
]
,
*
batchbuffer
[
I915_NUM_RINGS
];
struct
drm_i915_error_buffer
{
u32
size
;
u32
name
;
...
...
drivers/gpu/drm/i915/i915_irq.c
浏览文件 @
e2f973d5
...
...
@@ -648,9 +648,14 @@ static void
i915_error_state_free
(
struct
drm_device
*
dev
,
struct
drm_i915_error_state
*
error
)
{
i915_error_object_free
(
error
->
batchbuffer
[
0
]);
i915_error_object_free
(
error
->
batchbuffer
[
1
]);
i915_error_object_free
(
error
->
ringbuffer
);
int
i
;
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
->
overlay
);
kfree
(
error
);
...
...
@@ -824,15 +829,16 @@ static void i915_capture_error_state(struct drm_device *dev)
}
i915_gem_record_fences
(
dev
,
error
);
/* Record the active batchbuffers */
for
(
i
=
0
;
i
<
I915_NUM_RINGS
;
i
++
)
/* Record the active batch
and ring
buffers */
for
(
i
=
0
;
i
<
I915_NUM_RINGS
;
i
++
)
{
error
->
batchbuffer
[
i
]
=
i915_error_first_batchbuffer
(
dev_priv
,
&
dev_priv
->
ring
[
i
]);
/* Record the ringbuffer */
error
->
ringbuffer
=
i915_error_object_create
(
dev_priv
,
dev_priv
->
ring
[
RCS
].
obj
);
error
->
ringbuffer
[
i
]
=
i915_error_object_create
(
dev_priv
,
dev_priv
->
ring
[
i
].
obj
);
}
/* Record buffers on the active and pinned lists. */
error
->
active_bo
=
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录