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
29e9f510
Commit
29e9f510
authored
Aug 20, 2015
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/ce: switch to device pri macros
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
2ef770f7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
+3
-2
drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
+3
-2
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
View file @
29e9f510
...
...
@@ -62,13 +62,14 @@ gk104_ce_cclass = {
static
void
gk104_ce_intr
(
struct
nvkm_subdev
*
subdev
)
{
struct
nvkm_device
*
device
=
subdev
->
device
;
const
int
idx
=
nv_subidx
(
subdev
)
-
NVDEV_ENGINE_CE0
;
struct
nvkm_engine
*
ce
=
(
void
*
)
subdev
;
u32
stat
=
nv
_rd32
(
ce
,
0x104908
+
(
idx
*
0x1000
));
u32
stat
=
nv
km_rd32
(
devi
ce
,
0x104908
+
(
idx
*
0x1000
));
if
(
stat
)
{
nv_warn
(
ce
,
"unhandled intr 0x%08x
\n
"
,
stat
);
nv
_wr32
(
ce
,
0x104908
+
(
idx
*
0x1000
),
stat
);
nv
km_wr32
(
devi
ce
,
0x104908
+
(
idx
*
0x1000
),
stat
);
}
}
...
...
drivers/gpu/drm/nouveau/nvkm/engine/ce/gm204.c
View file @
29e9f510
...
...
@@ -62,13 +62,14 @@ gm204_ce_cclass = {
static
void
gm204_ce_intr
(
struct
nvkm_subdev
*
subdev
)
{
struct
nvkm_device
*
device
=
subdev
->
device
;
const
int
idx
=
nv_subidx
(
subdev
)
-
NVDEV_ENGINE_CE0
;
struct
nvkm_engine
*
ce
=
(
void
*
)
subdev
;
u32
stat
=
nv
_rd32
(
ce
,
0x104908
+
(
idx
*
0x1000
));
u32
stat
=
nv
km_rd32
(
devi
ce
,
0x104908
+
(
idx
*
0x1000
));
if
(
stat
)
{
nv_warn
(
ce
,
"unhandled intr 0x%08x
\n
"
,
stat
);
nv
_wr32
(
ce
,
0x104908
+
(
idx
*
0x1000
),
stat
);
nv
km_wr32
(
devi
ce
,
0x104908
+
(
idx
*
0x1000
),
stat
);
}
}
...
...
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