Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
0f85bbb6
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,发现更多精彩内容 >>
提交
0f85bbb6
编写于
4月 30, 2020
作者:
B
Ben Skeggs
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
drm/nouveau/device: use regular PRI accessors in chipset detection
Signed-off-by:
N
Ben Skeggs
<
bskeggs@redhat.com
>
上级
2924779b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
18 deletion
+13
-18
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+13
-18
未找到文件。
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
浏览文件 @
0f85bbb6
...
...
@@ -2925,9 +2925,9 @@ nvkm_device_del(struct nvkm_device **pdevice)
}
static
inline
bool
nvkm_device_endianness
(
void
__iomem
*
pri
)
nvkm_device_endianness
(
struct
nvkm_device
*
device
)
{
u32
boot1
=
ioread32_native
(
pri
+
0x000004
)
&
0x01000001
;
u32
boot1
=
nvkm_rd32
(
device
,
0x000004
)
&
0x01000001
;
#ifdef __BIG_ENDIAN
if
(
!
boot1
)
return
false
;
...
...
@@ -2949,7 +2949,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
struct
nvkm_subdev
*
subdev
;
u64
mmio_base
,
mmio_size
;
u32
boot0
,
boot1
,
strap
;
void
__iomem
*
map
=
NULL
;
int
ret
=
-
EEXIST
,
i
;
unsigned
chipset
;
...
...
@@ -2976,8 +2975,8 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
mmio_size
=
device
->
func
->
resource_size
(
device
,
0
);
if
(
detect
||
mmio
)
{
map
=
ioremap
(
mmio_base
,
mmio_size
);
if
(
map
==
NULL
)
{
device
->
pri
=
ioremap
(
mmio_base
,
mmio_size
);
if
(
device
->
pri
==
NULL
)
{
nvdev_error
(
device
,
"unable to map PRI
\n
"
);
ret
=
-
ENOMEM
;
goto
done
;
...
...
@@ -2987,10 +2986,10 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
/* identify the chipset, and determine classes of subdev/engines */
if
(
detect
)
{
/* switch mmio to cpu's native endianness */
if
(
!
nvkm_device_endianness
(
map
))
{
iowrite32_native
(
0x01000001
,
map
+
0x000004
);
ioread32_native
(
map
);
if
(
!
nvkm_device_endianness
(
map
))
{
if
(
!
nvkm_device_endianness
(
device
))
{
nvkm_wr32
(
device
,
0x000004
,
0x01000001
);
nvkm_rd32
(
device
,
0x000000
);
if
(
!
nvkm_device_endianness
(
device
))
{
nvdev_error
(
device
,
"GPU not supported on big-endian
\n
"
);
ret
=
-
ENOSYS
;
...
...
@@ -2998,7 +2997,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
}
}
boot0
=
ioread32_native
(
map
+
0x000000
);
boot0
=
nvkm_rd32
(
device
,
0x000000
);
/* chipset can be overridden for devel/testing purposes */
chipset
=
nvkm_longopt
(
device
->
cfgopt
,
"NvChipset"
,
0
);
...
...
@@ -3157,7 +3156,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
device
->
chip
->
name
,
boot0
);
/* vGPU detection */
boot1
=
ioread32_native
(
map
+
0x
000004
);
boot1
=
nvkm_rd32
(
device
,
0x0
000004
);
if
(
device
->
card_type
>=
TU100
&&
(
boot1
&
0x00030000
))
{
nvdev_info
(
device
,
"vGPUs are not supported
\n
"
);
ret
=
-
ENODEV
;
...
...
@@ -3165,7 +3164,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
}
/* read strapping information */
strap
=
ioread32_native
(
map
+
0x101000
);
strap
=
nvkm_rd32
(
device
,
0x101000
);
/* determine frequency of timing crystal */
if
(
device
->
card_type
<=
NV_10
||
device
->
chipset
<
0x17
||
...
...
@@ -3187,10 +3186,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
if
(
!
device
->
name
)
device
->
name
=
device
->
chip
->
name
;
if
(
mmio
)
{
device
->
pri
=
map
;
}
mutex_init
(
&
device
->
mutex
);
for
(
i
=
0
;
i
<
NVKM_SUBDEV_NR
;
i
++
)
{
...
...
@@ -3278,9 +3273,9 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
ret
=
0
;
done:
if
(
map
&&
(
!
mmio
||
ret
))
{
if
(
device
->
pri
&&
(
!
mmio
||
ret
))
{
iounmap
(
device
->
pri
);
device
->
pri
=
NULL
;
iounmap
(
map
);
}
mutex_unlock
(
&
nv_devices_mutex
);
return
ret
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录