Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
aa860e4b
cloud-kernel
项目概览
openanolis
/
cloud-kernel
1 年多 前同步成功
通知
160
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
aa860e4b
编写于
8月 20, 2015
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/devinit: switch to subdev printk macros
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
b907649e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
29 addition
and
22 deletion
+29
-22
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
+5
-4
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
+5
-3
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c
+4
-4
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
+7
-5
未找到文件。
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
浏览文件 @
aa860e4b
...
...
@@ -55,7 +55,7 @@ gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
nvkm_wr32
(
device
,
info
.
reg
+
0x10
,
fN
<<
16
);
break
;
default:
nv
_warn
(
init
,
"0x
%08x/%dKhz unimplemented
\n
"
,
type
,
freq
);
nv
km_warn
(
subdev
,
"
%08x/%dKhz unimplemented
\n
"
,
type
,
freq
);
ret
=
-
EINVAL
;
break
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
浏览文件 @
aa860e4b
...
...
@@ -81,11 +81,12 @@ static int
pmu_load
(
struct
nv50_devinit
*
init
,
u8
type
,
bool
post
,
u32
*
init_addr_pmu
,
u32
*
args_addr_pmu
)
{
struct
nvkm_bios
*
bios
=
nvkm_bios
(
init
);
struct
nvkm_subdev
*
subdev
=
&
init
->
base
.
subdev
;
struct
nvkm_bios
*
bios
=
subdev
->
device
->
bios
;
struct
nvbios_pmuR
pmu
;
if
(
!
nvbios_pmuRm
(
bios
,
type
,
&
pmu
))
{
nv
_error
(
init
,
"VBIOS PMU fuc %02x not found
\n
"
,
type
);
nv
km_error
(
subdev
,
"VBIOS PMU fuc %02x not found
\n
"
,
type
);
return
-
EINVAL
;
}
...
...
@@ -109,7 +110,7 @@ static int
gm204_devinit_post
(
struct
nvkm_subdev
*
subdev
,
bool
post
)
{
struct
nv50_devinit
*
init
=
(
void
*
)
nvkm_devinit
(
subdev
);
struct
nvkm_device
*
device
=
init
->
base
.
subdev
.
device
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvkm_bios
*
bios
=
device
->
bios
;
struct
bit_entry
bit_I
;
u32
exec
,
args
;
...
...
@@ -117,7 +118,7 @@ gm204_devinit_post(struct nvkm_subdev *subdev, bool post)
if
(
bit_entry
(
bios
,
'I'
,
&
bit_I
)
||
bit_I
.
version
!=
1
||
bit_I
.
length
<
0x1c
)
{
nv
_error
(
init
,
"VBIOS PMU init data not found
\n
"
);
nv
km_error
(
subdev
,
"VBIOS PMU init data not found
\n
"
);
return
-
EINVAL
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
浏览文件 @
aa860e4b
...
...
@@ -54,7 +54,7 @@ gt215_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
nvkm_wr32
(
device
,
info
.
reg
+
8
,
fN
);
break
;
default:
nv
_warn
(
init
,
"0x
%08x/%dKhz unimplemented
\n
"
,
type
,
freq
);
nv
km_warn
(
subdev
,
"
%08x/%dKhz unimplemented
\n
"
,
type
,
freq
);
ret
=
-
EINVAL
;
break
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
浏览文件 @
aa860e4b
...
...
@@ -35,7 +35,8 @@
static
void
nv04_devinit_meminit
(
struct
nvkm_devinit
*
init
)
{
struct
nvkm_device
*
device
=
init
->
subdev
.
device
;
struct
nvkm_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
u32
patt
=
0xdeadbeef
;
struct
io_mapping
*
fb
;
int
i
;
...
...
@@ -43,7 +44,7 @@ nv04_devinit_meminit(struct nvkm_devinit *init)
/* Map the framebuffer aperture */
fb
=
fbmem_init
(
device
);
if
(
!
fb
)
{
nv
_error
(
init
,
"failed to map fb
\n
"
);
nv
km_error
(
subdev
,
"failed to map fb
\n
"
);
return
;
}
...
...
@@ -414,6 +415,7 @@ int
nv04_devinit_init
(
struct
nvkm_object
*
object
)
{
struct
nv04_devinit
*
init
=
(
void
*
)
object
;
struct
nvkm_subdev
*
subdev
=
&
init
->
base
.
subdev
;
if
(
!
init
->
base
.
post
)
{
u32
htotal
=
nv_rdvgac
(
init
,
0
,
0x06
);
...
...
@@ -422,7 +424,7 @@ nv04_devinit_init(struct nvkm_object *object)
htotal
|=
(
nv_rdvgac
(
init
,
0
,
0x25
)
&
0x01
)
<<
10
;
htotal
|=
(
nv_rdvgac
(
init
,
0
,
0x41
)
&
0x01
)
<<
11
;
if
(
!
htotal
)
{
nv
_info
(
init
,
"adaptor not initialised
\n
"
);
nv
km_debug
(
subdev
,
"adaptor not initialised
\n
"
);
init
->
base
.
post
=
true
;
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
浏览文件 @
aa860e4b
...
...
@@ -44,7 +44,8 @@ nv05_devinit_meminit(struct nvkm_devinit *init)
{
0x06
,
0x00
},
{
0x00
,
0x00
}
};
struct
nvkm_device
*
device
=
init
->
subdev
.
device
;
struct
nvkm_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvkm_bios
*
bios
=
device
->
bios
;
struct
io_mapping
*
fb
;
u32
patt
=
0xdeadbeef
;
...
...
@@ -55,7 +56,7 @@ nv05_devinit_meminit(struct nvkm_devinit *init)
/* Map the framebuffer aperture */
fb
=
fbmem_init
(
device
);
if
(
!
fb
)
{
nv
_error
(
init
,
"failed to map fb
\n
"
);
nv
km_error
(
subdev
,
"failed to map fb
\n
"
);
return
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c
浏览文件 @
aa860e4b
...
...
@@ -32,7 +32,8 @@
static
void
nv10_devinit_meminit
(
struct
nvkm_devinit
*
init
)
{
struct
nvkm_device
*
device
=
init
->
subdev
.
device
;
struct
nvkm_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
static
const
int
mem_width
[]
=
{
0x10
,
0x00
,
0x20
};
int
mem_width_count
;
uint32_t
patt
=
0xdeadbeef
;
...
...
@@ -47,7 +48,7 @@ nv10_devinit_meminit(struct nvkm_devinit *init)
/* Map the framebuffer aperture */
fb
=
fbmem_init
(
device
);
if
(
!
fb
)
{
nv
_error
(
init
,
"failed to map fb
\n
"
);
nv
km_error
(
subdev
,
"failed to map fb
\n
"
);
return
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c
浏览文件 @
aa860e4b
...
...
@@ -30,10 +30,10 @@
#include <subdev/bios/init.h>
static
void
nv20_devinit_meminit
(
struct
nvkm_devinit
*
dev
init
)
nv20_devinit_meminit
(
struct
nvkm_devinit
*
init
)
{
struct
nv
04_devinit
*
init
=
(
void
*
)
devinit
;
struct
nvkm_device
*
device
=
nv_device
(
init
)
;
struct
nv
km_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
uint32_t
mask
=
(
device
->
chipset
>=
0x25
?
0x300
:
0x900
);
uint32_t
amount
,
off
;
struct
io_mapping
*
fb
;
...
...
@@ -41,7 +41,7 @@ nv20_devinit_meminit(struct nvkm_devinit *devinit)
/* Map the framebuffer aperture */
fb
=
fbmem_init
(
nv_device
(
init
));
if
(
!
fb
)
{
nv
_error
(
init
,
"failed to map fb
\n
"
);
nv
km_error
(
subdev
,
"failed to map fb
\n
"
);
return
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
浏览文件 @
aa860e4b
...
...
@@ -44,13 +44,13 @@ nv50_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
ret
=
nvbios_pll_parse
(
bios
,
type
,
&
info
);
if
(
ret
)
{
nv_error
(
subdev
,
"failed to retrieve pll data, %d
\n
"
,
ret
);
nv
km
_error
(
subdev
,
"failed to retrieve pll data, %d
\n
"
,
ret
);
return
ret
;
}
ret
=
nv04_pll_calc
(
subdev
,
&
info
,
freq
,
&
N1
,
&
M1
,
&
N2
,
&
M2
,
&
P
);
if
(
!
ret
)
{
nv_error
(
subdev
,
"failed pll calculation
\n
"
);
nv
km
_error
(
subdev
,
"failed pll calculation
\n
"
);
return
ret
;
}
...
...
@@ -94,9 +94,11 @@ nv50_devinit_disable(struct nvkm_devinit *init)
int
nv50_devinit_init
(
struct
nvkm_object
*
object
)
{
struct
nvkm_bios
*
bios
=
nvkm_bios
(
object
);
struct
nvkm_ibus
*
ibus
=
nvkm_ibus
(
object
);
struct
nv50_devinit
*
init
=
(
void
*
)
object
;
struct
nvkm_subdev
*
subdev
=
&
init
->
base
.
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvkm_bios
*
bios
=
device
->
bios
;
struct
nvkm_subdev
*
ibus
=
device
->
ibus
;
struct
nvbios_outp
info
;
struct
dcb_output
outp
;
u8
ver
=
0xff
,
hdr
,
cnt
,
len
;
...
...
@@ -105,7 +107,7 @@ nv50_devinit_init(struct nvkm_object *object)
if
(
!
init
->
base
.
post
)
{
if
(
!
nv_rdvgac
(
init
,
0
,
0x00
)
&&
!
nv_rdvgac
(
init
,
0
,
0x1a
))
{
nv
_info
(
init
,
"adaptor not initialised
\n
"
);
nv
km_debug
(
subdev
,
"adaptor not initialised
\n
"
);
init
->
base
.
post
=
true
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录