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
1957d3d5
Commit
1957d3d5
authored
Nov 18, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/bios/timing: pointers are 32-bit
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
a215721f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
+3
-3
drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c
drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c
+10
-10
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/timing.h
View file @
1957d3d5
...
...
@@ -2,10 +2,10 @@
#define __NVBIOS_TIMING_H__
#include <subdev/bios/ramcfg.h>
u
16
nvbios_timingTe
(
struct
nvkm_bios
*
,
u
32
nvbios_timingTe
(
struct
nvkm_bios
*
,
u8
*
ver
,
u8
*
hdr
,
u8
*
cnt
,
u8
*
len
,
u8
*
snr
,
u8
*
ssz
);
u
16
nvbios_timingEe
(
struct
nvkm_bios
*
,
int
idx
,
u
32
nvbios_timingEe
(
struct
nvkm_bios
*
,
int
idx
,
u8
*
ver
,
u8
*
hdr
,
u8
*
cnt
,
u8
*
len
);
u
16
nvbios_timingEp
(
struct
nvkm_bios
*
,
int
idx
,
u
32
nvbios_timingEp
(
struct
nvkm_bios
*
,
int
idx
,
u8
*
ver
,
u8
*
hdr
,
u8
*
cnt
,
u8
*
len
,
struct
nvbios_ramcfg
*
);
#endif
drivers/gpu/drm/nouveau/nvkm/subdev/bios/timing.c
View file @
1957d3d5
...
...
@@ -25,19 +25,19 @@
#include <subdev/bios/bit.h>
#include <subdev/bios/timing.h>
u
16
u
32
nvbios_timingTe
(
struct
nvkm_bios
*
bios
,
u8
*
ver
,
u8
*
hdr
,
u8
*
cnt
,
u8
*
len
,
u8
*
snr
,
u8
*
ssz
)
{
struct
bit_entry
bit_P
;
u
16
timing
=
0x000
0
;
u
32
timing
=
0
;
if
(
!
bit_entry
(
bios
,
'P'
,
&
bit_P
))
{
if
(
bit_P
.
version
==
1
)
timing
=
nvbios_rd
16
(
bios
,
bit_P
.
offset
+
4
);
timing
=
nvbios_rd
32
(
bios
,
bit_P
.
offset
+
4
);
else
if
(
bit_P
.
version
==
2
)
timing
=
nvbios_rd
16
(
bios
,
bit_P
.
offset
+
8
);
timing
=
nvbios_rd
32
(
bios
,
bit_P
.
offset
+
8
);
if
(
timing
)
{
*
ver
=
nvbios_rd08
(
bios
,
timing
+
0
);
...
...
@@ -62,15 +62,15 @@ nvbios_timingTe(struct nvkm_bios *bios,
}
}
return
0
x0000
;
return
0
;
}
u
16
u
32
nvbios_timingEe
(
struct
nvkm_bios
*
bios
,
int
idx
,
u8
*
ver
,
u8
*
hdr
,
u8
*
cnt
,
u8
*
len
)
{
u8
snr
,
ssz
;
u
16
timing
=
nvbios_timingTe
(
bios
,
ver
,
hdr
,
cnt
,
len
,
&
snr
,
&
ssz
);
u
32
timing
=
nvbios_timingTe
(
bios
,
ver
,
hdr
,
cnt
,
len
,
&
snr
,
&
ssz
);
if
(
timing
&&
idx
<
*
cnt
)
{
timing
+=
*
hdr
+
idx
*
(
*
len
+
(
snr
*
ssz
));
*
hdr
=
*
len
;
...
...
@@ -78,14 +78,14 @@ nvbios_timingEe(struct nvkm_bios *bios, int idx,
*
len
=
ssz
;
return
timing
;
}
return
0
x0000
;
return
0
;
}
u
16
u
32
nvbios_timingEp
(
struct
nvkm_bios
*
bios
,
int
idx
,
u8
*
ver
,
u8
*
hdr
,
u8
*
cnt
,
u8
*
len
,
struct
nvbios_ramcfg
*
p
)
{
u
16
data
=
nvbios_timingEe
(
bios
,
idx
,
ver
,
hdr
,
cnt
,
len
),
temp
;
u
32
data
=
nvbios_timingEe
(
bios
,
idx
,
ver
,
hdr
,
cnt
,
len
),
temp
;
p
->
timing_ver
=
*
ver
;
p
->
timing_hdr
=
*
hdr
;
switch
(
!!
data
*
*
ver
)
{
...
...
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