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
f2d85ad1
Commit
f2d85ad1
authored
Aug 20, 2015
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/msvld: switch to device pri macros
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
320ca251
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
+3
-2
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c
View file @
f2d85ad1
...
@@ -61,14 +61,15 @@ static int
...
@@ -61,14 +61,15 @@ static int
g98_msvld_init
(
struct
nvkm_object
*
object
)
g98_msvld_init
(
struct
nvkm_object
*
object
)
{
{
struct
nvkm_falcon
*
msvld
=
(
void
*
)
object
;
struct
nvkm_falcon
*
msvld
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
msvld
->
engine
.
subdev
.
device
;
int
ret
;
int
ret
;
ret
=
nvkm_falcon_init
(
msvld
);
ret
=
nvkm_falcon_init
(
msvld
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
nv
_wr32
(
msvld
,
0x084010
,
0x0000ffd2
);
nv
km_wr32
(
device
,
0x084010
,
0x0000ffd2
);
nv
_wr32
(
msvld
,
0x08401c
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x08401c
,
0x0000fff2
);
return
0
;
return
0
;
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c
View file @
f2d85ad1
...
@@ -59,14 +59,15 @@ static int
...
@@ -59,14 +59,15 @@ static int
gf100_msvld_init
(
struct
nvkm_object
*
object
)
gf100_msvld_init
(
struct
nvkm_object
*
object
)
{
{
struct
nvkm_falcon
*
msvld
=
(
void
*
)
object
;
struct
nvkm_falcon
*
msvld
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
msvld
->
engine
.
subdev
.
device
;
int
ret
;
int
ret
;
ret
=
nvkm_falcon_init
(
msvld
);
ret
=
nvkm_falcon_init
(
msvld
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
nv
_wr32
(
msvld
,
0x084010
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x084010
,
0x0000fff2
);
nv
_wr32
(
msvld
,
0x08401c
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x08401c
,
0x0000fff2
);
return
0
;
return
0
;
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c
View file @
f2d85ad1
...
@@ -59,14 +59,15 @@ static int
...
@@ -59,14 +59,15 @@ static int
gk104_msvld_init
(
struct
nvkm_object
*
object
)
gk104_msvld_init
(
struct
nvkm_object
*
object
)
{
{
struct
nvkm_falcon
*
msvld
=
(
void
*
)
object
;
struct
nvkm_falcon
*
msvld
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
msvld
->
engine
.
subdev
.
device
;
int
ret
;
int
ret
;
ret
=
nvkm_falcon_init
(
msvld
);
ret
=
nvkm_falcon_init
(
msvld
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
nv
_wr32
(
msvld
,
0x084010
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x084010
,
0x0000fff2
);
nv
_wr32
(
msvld
,
0x08401c
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x08401c
,
0x0000fff2
);
return
0
;
return
0
;
}
}
...
...
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