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
Kirill Smelkov
linux
Commits
4fdc6ba3
Commit
4fdc6ba3
authored
May 19, 2017
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fb/ram/nv40-: use new devinit script interpreter entry-point
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
28c62976
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
22 deletions
+4
-22
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
+1
-6
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
+1
-6
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
+2
-10
No files found.
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
View file @
4fdc6ba3
...
@@ -1424,12 +1424,7 @@ gk104_ram_init(struct nvkm_ram *ram)
...
@@ -1424,12 +1424,7 @@ gk104_ram_init(struct nvkm_ram *ram)
for
(
i
=
0
;
i
<
cnt
;
i
++
,
data
+=
4
)
{
for
(
i
=
0
;
i
<
cnt
;
i
++
,
data
+=
4
)
{
if
(
i
!=
save
>>
4
)
{
if
(
i
!=
save
>>
4
)
{
nvkm_mask
(
device
,
0x10f65c
,
0x000000f0
,
i
<<
4
);
nvkm_mask
(
device
,
0x10f65c
,
0x000000f0
,
i
<<
4
);
nvbios_exec
(
&
(
struct
nvbios_init
)
{
nvbios_init
(
subdev
,
nvbios_rd32
(
bios
,
data
));
.
subdev
=
subdev
,
.
bios
=
bios
,
.
offset
=
nvbios_rd32
(
bios
,
data
),
.
execute
=
1
,
});
}
}
}
}
nvkm_mask
(
device
,
0x10f65c
,
0x000000f0
,
save
);
nvkm_mask
(
device
,
0x10f65c
,
0x000000f0
,
save
);
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
View file @
4fdc6ba3
...
@@ -59,12 +59,7 @@ gp100_ram_init(struct nvkm_ram *ram)
...
@@ -59,12 +59,7 @@ gp100_ram_init(struct nvkm_ram *ram)
for
(
i
=
0
;
i
<
cnt
;
i
++
,
data
+=
4
)
{
for
(
i
=
0
;
i
<
cnt
;
i
++
,
data
+=
4
)
{
if
(
i
!=
save
>>
4
)
{
if
(
i
!=
save
>>
4
)
{
nvkm_mask
(
device
,
0x9a065c
,
0x000000f0
,
i
<<
4
);
nvkm_mask
(
device
,
0x9a065c
,
0x000000f0
,
i
<<
4
);
nvbios_exec
(
&
(
struct
nvbios_init
)
{
nvbios_init
(
subdev
,
nvbios_rd32
(
bios
,
data
));
.
subdev
=
subdev
,
.
bios
=
bios
,
.
offset
=
nvbios_rd32
(
bios
,
data
),
.
execute
=
1
,
});
}
}
}
}
nvkm_mask
(
device
,
0x9a065c
,
0x000000f0
,
save
);
nvkm_mask
(
device
,
0x9a065c
,
0x000000f0
,
save
);
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
View file @
4fdc6ba3
...
@@ -150,16 +150,8 @@ nv40_ram_prog(struct nvkm_ram *base)
...
@@ -150,16 +150,8 @@ nv40_ram_prog(struct nvkm_ram *base)
udelay
(
100
);
udelay
(
100
);
/* execute memory reset script from vbios */
/* execute memory reset script from vbios */
if
(
!
bit_entry
(
bios
,
'M'
,
&
M
))
{
if
(
!
bit_entry
(
bios
,
'M'
,
&
M
))
struct
nvbios_init
init
=
{
nvbios_init
(
subdev
,
nvbios_rd16
(
bios
,
M
.
offset
+
0x00
));
.
subdev
=
subdev
,
.
bios
=
bios
,
.
offset
=
nvbios_rd16
(
bios
,
M
.
offset
+
0x00
),
.
execute
=
1
,
};
nvbios_exec
(
&
init
);
}
/* make sure we're in vblank (hopefully the same one as before), and
/* make sure we're in vblank (hopefully the same one as before), and
* then re-enable crtc memory access
* then re-enable crtc memory access
...
...
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