Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3704791d
Commit
3704791d
authored
Nov 17, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/device: store revision
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
37353543
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
drivers/gpu/drm/nouveau/core/engine/device/base.c
drivers/gpu/drm/nouveau/core/engine/device/base.c
+3
-1
drivers/gpu/drm/nouveau/core/include/core/device.h
drivers/gpu/drm/nouveau/core/include/core/device.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/core/engine/device/base.c
View file @
3704791d
...
@@ -138,7 +138,7 @@ nouveau_devobj_info(struct nouveau_object *object, void *data, u32 size)
...
@@ -138,7 +138,7 @@ nouveau_devobj_info(struct nouveau_object *object, void *data, u32 size)
}
}
args
->
v0
.
chipset
=
device
->
chipset
;
args
->
v0
.
chipset
=
device
->
chipset
;
args
->
v0
.
revision
=
device
->
chip
set
>=
0x10
?
nv_rd32
(
device
,
0
)
:
0x00
;
args
->
v0
.
revision
=
device
->
chip
rev
;
if
(
pfb
)
args
->
v0
.
ram_size
=
args
->
v0
.
ram_user
=
pfb
->
ram
->
size
;
if
(
pfb
)
args
->
v0
.
ram_size
=
args
->
v0
.
ram_user
=
pfb
->
ram
->
size
;
else
args
->
v0
.
ram_size
=
args
->
v0
.
ram_user
=
0
;
else
args
->
v0
.
ram_size
=
args
->
v0
.
ram_user
=
0
;
if
(
imem
)
args
->
v0
.
ram_user
=
args
->
v0
.
ram_user
-
imem
->
reserved
;
if
(
imem
)
args
->
v0
.
ram_user
=
args
->
v0
.
ram_user
-
imem
->
reserved
;
...
@@ -354,12 +354,14 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
...
@@ -354,12 +354,14 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
/* determine chipset and derive architecture from it */
/* determine chipset and derive architecture from it */
if
((
boot0
&
0x1f000000
)
>
0
)
{
if
((
boot0
&
0x1f000000
)
>
0
)
{
device
->
chipset
=
(
boot0
&
0x1ff00000
)
>>
20
;
device
->
chipset
=
(
boot0
&
0x1ff00000
)
>>
20
;
device
->
chiprev
=
(
boot0
&
0x000000ff
);
switch
(
device
->
chipset
&
0x1f0
)
{
switch
(
device
->
chipset
&
0x1f0
)
{
case
0x010
:
{
case
0x010
:
{
if
(
0x461
&
(
1
<<
(
device
->
chipset
&
0xf
)))
if
(
0x461
&
(
1
<<
(
device
->
chipset
&
0xf
)))
device
->
card_type
=
NV_10
;
device
->
card_type
=
NV_10
;
else
else
device
->
card_type
=
NV_11
;
device
->
card_type
=
NV_11
;
device
->
chiprev
=
0x00
;
break
;
break
;
}
}
case
0x020
:
device
->
card_type
=
NV_20
;
break
;
case
0x020
:
device
->
card_type
=
NV_20
;
break
;
...
...
drivers/gpu/drm/nouveau/core/include/core/device.h
View file @
3704791d
...
@@ -92,6 +92,7 @@ struct nouveau_device {
...
@@ -92,6 +92,7 @@ struct nouveau_device {
GM100
=
0x110
,
GM100
=
0x110
,
}
card_type
;
}
card_type
;
u32
chipset
;
u32
chipset
;
u8
chiprev
;
u32
crystal
;
u32
crystal
;
struct
nouveau_oclass
*
oclass
[
NVDEV_SUBDEV_NR
];
struct
nouveau_oclass
*
oclass
[
NVDEV_SUBDEV_NR
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment