Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
Kernel
提交
45143cb5
K
Kernel
项目概览
openeuler
/
Kernel
1 年多 前同步成功
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
45143cb5
编写于
6月 07, 2011
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nv50-nvc0: explicitly map fbcon fb into channel vm
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
fd2871af
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
10 deletion
+22
-10
drivers/gpu/drm/nouveau/nouveau_fb.h
drivers/gpu/drm/nouveau/nouveau_fb.h
+1
-0
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/nouveau/nouveau_fbcon.c
+11
-0
drivers/gpu/drm/nouveau/nv50_fbcon.c
drivers/gpu/drm/nouveau/nv50_fbcon.c
+5
-5
drivers/gpu/drm/nouveau/nvc0_fbcon.c
drivers/gpu/drm/nouveau/nvc0_fbcon.c
+5
-5
未找到文件。
drivers/gpu/drm/nouveau/nouveau_fb.h
浏览文件 @
45143cb5
...
...
@@ -30,6 +30,7 @@
struct
nouveau_framebuffer
{
struct
drm_framebuffer
base
;
struct
nouveau_bo
*
nvbo
;
struct
nouveau_vma
vma
;
u32
r_dma
;
u32
r_format
;
u32
r_pitch
;
...
...
drivers/gpu/drm/nouveau/nouveau_fbcon.c
浏览文件 @
45143cb5
...
...
@@ -279,6 +279,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
struct
fb_info
*
info
;
struct
drm_framebuffer
*
fb
;
struct
nouveau_framebuffer
*
nouveau_fb
;
struct
nouveau_channel
*
chan
;
struct
nouveau_bo
*
nvbo
;
struct
drm_mode_fb_cmd
mode_cmd
;
struct
pci_dev
*
pdev
=
dev
->
pdev
;
...
...
@@ -318,6 +319,15 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev,
goto
out
;
}
chan
=
nouveau_nofbaccel
?
NULL
:
dev_priv
->
channel
;
if
(
chan
&&
dev_priv
->
card_type
>=
NV_50
)
{
ret
=
nouveau_bo_vma_add
(
nvbo
,
chan
->
vm
,
&
nfbdev
->
nouveau_fb
.
vma
);
if
(
ret
)
{
NV_ERROR
(
dev
,
"failed to map fb into chan: %d
\n
"
,
ret
);
chan
=
NULL
;
}
}
mutex_lock
(
&
dev
->
struct_mutex
);
info
=
framebuffer_alloc
(
0
,
device
);
...
...
@@ -448,6 +458,7 @@ nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *nfbdev)
if
(
nouveau_fb
->
nvbo
)
{
nouveau_bo_unmap
(
nouveau_fb
->
nvbo
);
nouveau_bo_vma_del
(
nouveau_fb
->
nvbo
,
&
nouveau_fb
->
vma
);
drm_gem_object_unreference_unlocked
(
nouveau_fb
->
nvbo
->
gem
);
nouveau_fb
->
nvbo
=
NULL
;
}
...
...
drivers/gpu/drm/nouveau/nv50_fbcon.c
浏览文件 @
45143cb5
...
...
@@ -159,7 +159,7 @@ nv50_fbcon_accel_init(struct fb_info *info)
struct
drm_device
*
dev
=
nfbdev
->
dev
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_channel
*
chan
=
dev_priv
->
channel
;
struct
nouveau_
bo
*
nvbo
=
nfbdev
->
nouveau_fb
.
nvbo
;
struct
nouveau_
framebuffer
*
fb
=
&
nfbdev
->
nouveau_fb
;
int
ret
,
format
;
switch
(
info
->
var
.
bits_per_pixel
)
{
...
...
@@ -247,8 +247,8 @@ nv50_fbcon_accel_init(struct fb_info *info)
OUT_RING
(
chan
,
info
->
fix
.
line_length
);
OUT_RING
(
chan
,
info
->
var
.
xres_virtual
);
OUT_RING
(
chan
,
info
->
var
.
yres_virtual
);
OUT_RING
(
chan
,
upper_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
upper_32_bits
(
fb
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
fb
->
vma
.
offset
));
BEGIN_RING
(
chan
,
NvSub2D
,
0x0230
,
2
);
OUT_RING
(
chan
,
format
);
OUT_RING
(
chan
,
1
);
...
...
@@ -256,8 +256,8 @@ nv50_fbcon_accel_init(struct fb_info *info)
OUT_RING
(
chan
,
info
->
fix
.
line_length
);
OUT_RING
(
chan
,
info
->
var
.
xres_virtual
);
OUT_RING
(
chan
,
info
->
var
.
yres_virtual
);
OUT_RING
(
chan
,
upper_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
upper_32_bits
(
fb
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
fb
->
vma
.
offset
));
return
0
;
}
...
...
drivers/gpu/drm/nouveau/nvc0_fbcon.c
浏览文件 @
45143cb5
...
...
@@ -159,7 +159,7 @@ nvc0_fbcon_accel_init(struct fb_info *info)
struct
drm_device
*
dev
=
nfbdev
->
dev
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_channel
*
chan
=
dev_priv
->
channel
;
struct
nouveau_
bo
*
nvbo
=
nfbdev
->
nouveau_fb
.
nvbo
;
struct
nouveau_
framebuffer
*
fb
=
&
nfbdev
->
nouveau_fb
;
int
ret
,
format
;
ret
=
nouveau_gpuobj_gr_new
(
chan
,
0x902d
,
0x902d
);
...
...
@@ -249,8 +249,8 @@ nvc0_fbcon_accel_init(struct fb_info *info)
OUT_RING
(
chan
,
info
->
fix
.
line_length
);
OUT_RING
(
chan
,
info
->
var
.
xres_virtual
);
OUT_RING
(
chan
,
info
->
var
.
yres_virtual
);
OUT_RING
(
chan
,
upper_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
upper_32_bits
(
fb
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
fb
->
vma
.
offset
));
BEGIN_NVC0
(
chan
,
2
,
NvSub2D
,
0x0230
,
10
);
OUT_RING
(
chan
,
format
);
OUT_RING
(
chan
,
1
);
...
...
@@ -260,8 +260,8 @@ nvc0_fbcon_accel_init(struct fb_info *info)
OUT_RING
(
chan
,
info
->
fix
.
line_length
);
OUT_RING
(
chan
,
info
->
var
.
xres_virtual
);
OUT_RING
(
chan
,
info
->
var
.
yres_virtual
);
OUT_RING
(
chan
,
upper_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
nvbo
->
vma
.
offset
));
OUT_RING
(
chan
,
upper_32_bits
(
fb
->
vma
.
offset
));
OUT_RING
(
chan
,
lower_32_bits
(
fb
->
vma
.
offset
));
FIRE_RING
(
chan
);
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录