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
54118c74
Commit
54118c74
authored
9 years ago
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mspdec: switch to device pri macros
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
636e37aa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
+5
-4
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/g98.c
View file @
54118c74
...
@@ -60,14 +60,15 @@ static int
...
@@ -60,14 +60,15 @@ static int
g98_mspdec_init
(
struct
nvkm_object
*
object
)
g98_mspdec_init
(
struct
nvkm_object
*
object
)
{
{
struct
nvkm_falcon
*
mspdec
=
(
void
*
)
object
;
struct
nvkm_falcon
*
mspdec
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
mspdec
->
engine
.
subdev
.
device
;
int
ret
;
int
ret
;
ret
=
nvkm_falcon_init
(
mspdec
);
ret
=
nvkm_falcon_init
(
mspdec
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
nv
_wr32
(
mspdec
,
0x085010
,
0x0000ffd2
);
nv
km_wr32
(
device
,
0x085010
,
0x0000ffd2
);
nv
_wr32
(
mspdec
,
0x08501c
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x08501c
,
0x0000fff2
);
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gf100.c
View file @
54118c74
...
@@ -59,14 +59,15 @@ static int
...
@@ -59,14 +59,15 @@ static int
gf100_mspdec_init
(
struct
nvkm_object
*
object
)
gf100_mspdec_init
(
struct
nvkm_object
*
object
)
{
{
struct
nvkm_falcon
*
mspdec
=
(
void
*
)
object
;
struct
nvkm_falcon
*
mspdec
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
mspdec
->
engine
.
subdev
.
device
;
int
ret
;
int
ret
;
ret
=
nvkm_falcon_init
(
mspdec
);
ret
=
nvkm_falcon_init
(
mspdec
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
nv
_wr32
(
mspdec
,
0x085010
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x085010
,
0x0000fff2
);
nv
_wr32
(
mspdec
,
0x08501c
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x08501c
,
0x0000fff2
);
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
drivers/gpu/drm/nouveau/nvkm/engine/mspdec/gk104.c
View file @
54118c74
...
@@ -58,15 +58,16 @@ gk104_mspdec_cclass = {
...
@@ -58,15 +58,16 @@ gk104_mspdec_cclass = {
static
int
static
int
gk104_mspdec_init
(
struct
nvkm_object
*
object
)
gk104_mspdec_init
(
struct
nvkm_object
*
object
)
{
{
struct
nvkm_falcon
*
falcon
=
(
void
*
)
object
;
struct
nvkm_falcon
*
mspdec
=
(
void
*
)
object
;
struct
nvkm_device
*
device
=
mspdec
->
engine
.
subdev
.
device
;
int
ret
;
int
ret
;
ret
=
nvkm_falcon_init
(
falcon
);
ret
=
nvkm_falcon_init
(
mspdec
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
nv
_wr32
(
falcon
,
0x085010
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x085010
,
0x0000fff2
);
nv
_wr32
(
falcon
,
0x08501c
,
0x0000fff2
);
nv
km_wr32
(
device
,
0x08501c
,
0x0000fff2
);
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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