Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
70ad25ab
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,发现更多精彩内容 >>
提交
70ad25ab
编写于
7月 20, 2011
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
12a30e26
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
8 addition
and
20 deletion
+8
-20
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+0
-1
drivers/gpu/drm/nouveau/nv04_graph.c
drivers/gpu/drm/nouveau/nv04_graph.c
+2
-13
drivers/gpu/drm/nouveau/nv10_graph.c
drivers/gpu/drm/nouveau/nv10_graph.c
+4
-4
drivers/gpu/drm/nouveau/nv20_graph.c
drivers/gpu/drm/nouveau/nv20_graph.c
+2
-2
未找到文件。
drivers/gpu/drm/nouveau/nouveau_drv.h
浏览文件 @
70ad25ab
...
...
@@ -1142,7 +1142,6 @@ extern int nvc0_fifo_unload_context(struct drm_device *);
/* nv04_graph.c */
extern
int
nv04_graph_create
(
struct
drm_device
*
);
extern
void
nv04_graph_fifo_access
(
struct
drm_device
*
,
bool
);
extern
int
nv04_graph_object_new
(
struct
nouveau_channel
*
,
int
,
u32
,
u16
);
extern
int
nv04_graph_mthd_page_flip
(
struct
nouveau_channel
*
chan
,
u32
class
,
u32
mthd
,
u32
data
);
...
...
drivers/gpu/drm/nouveau/nv04_graph.c
浏览文件 @
70ad25ab
...
...
@@ -450,13 +450,13 @@ nv04_graph_context_del(struct nouveau_channel *chan, int engine)
unsigned
long
flags
;
spin_lock_irqsave
(
&
dev_priv
->
context_switch_lock
,
flags
);
nv
04_graph_fifo_access
(
dev
,
false
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000000
);
/* Unload the context if it's the currently active one */
if
(
nv04_graph_channel
(
dev
)
==
chan
)
nv04_graph_unload_context
(
dev
);
nv
04_graph_fifo_access
(
dev
,
true
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000001
);
spin_unlock_irqrestore
(
&
dev_priv
->
context_switch_lock
,
flags
);
/* Free the context resources */
...
...
@@ -545,17 +545,6 @@ nv04_graph_fini(struct drm_device *dev, int engine)
return
0
;
}
void
nv04_graph_fifo_access
(
struct
drm_device
*
dev
,
bool
enabled
)
{
if
(
enabled
)
nv_wr32
(
dev
,
NV04_PGRAPH_FIFO
,
nv_rd32
(
dev
,
NV04_PGRAPH_FIFO
)
|
1
);
else
nv_wr32
(
dev
,
NV04_PGRAPH_FIFO
,
nv_rd32
(
dev
,
NV04_PGRAPH_FIFO
)
&
~
1
);
}
static
int
nv04_graph_mthd_set_ref
(
struct
nouveau_channel
*
chan
,
u32
class
,
u32
mthd
,
u32
data
)
...
...
drivers/gpu/drm/nouveau/nv10_graph.c
浏览文件 @
70ad25ab
...
...
@@ -708,8 +708,8 @@ static void nv10_graph_load_dma_vtxbuf(struct nouveau_channel *chan,
0x2c000000
|
chan
->
id
<<
20
|
subchan
<<
16
|
0x18c
);
nv_wr32
(
dev
,
NV10_PGRAPH_FFINTFC_ST2_DL
,
inst
);
nv_mask
(
dev
,
NV10_PGRAPH_CTX_CONTROL
,
0
,
0x10000
);
nv
04_graph_fifo_access
(
dev
,
true
);
nv
04_graph_fifo_access
(
dev
,
false
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000001
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000000
);
/* Restore the FIFO state */
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
fifo
);
i
++
)
...
...
@@ -879,13 +879,13 @@ nv10_graph_context_del(struct nouveau_channel *chan, int engine)
unsigned
long
flags
;
spin_lock_irqsave
(
&
dev_priv
->
context_switch_lock
,
flags
);
nv
04_graph_fifo_access
(
dev
,
false
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000000
);
/* Unload the context if it's the currently active one */
if
(
nv10_graph_channel
(
dev
)
==
chan
)
nv10_graph_unload_context
(
dev
);
nv
04_graph_fifo_access
(
dev
,
true
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000001
);
spin_unlock_irqrestore
(
&
dev_priv
->
context_switch_lock
,
flags
);
/* Free the context resources */
...
...
drivers/gpu/drm/nouveau/nv20_graph.c
浏览文件 @
70ad25ab
...
...
@@ -454,13 +454,13 @@ nv20_graph_context_del(struct nouveau_channel *chan, int engine)
unsigned
long
flags
;
spin_lock_irqsave
(
&
dev_priv
->
context_switch_lock
,
flags
);
nv
04_graph_fifo_access
(
dev
,
false
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000000
);
/* Unload the context if it's the currently active one */
if
(
nv10_graph_channel
(
dev
)
==
chan
)
nv20_graph_unload_context
(
dev
);
nv
04_graph_fifo_access
(
dev
,
true
);
nv
_mask
(
dev
,
NV04_PGRAPH_FIFO
,
0x00000001
,
0x00000001
);
spin_unlock_irqrestore
(
&
dev_priv
->
context_switch_lock
,
flags
);
/* Free the context resources */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录