Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xenomai
ipipe-x86
Commits
7dc351b3
Commit
7dc351b3
authored
May 12, 2014
by
Ben Skeggs
Browse files
drm/gk104/gpio: fix incorrect interrupt register usage
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
964f85ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c
View file @
7dc351b3
...
...
@@ -44,7 +44,7 @@ nve0_gpio_intr(struct nouveau_subdev *subdev)
}
nv_wr32
(
priv
,
0xdc00
,
intr0
);
nv_wr32
(
priv
,
0xdc8
8
,
intr1
);
nv_wr32
(
priv
,
0xdc8
0
,
intr1
);
}
void
...
...
@@ -52,8 +52,8 @@ nve0_gpio_intr_enable(struct nouveau_event *event, int line)
{
const
u32
addr
=
line
<
16
?
0xdc00
:
0xdc80
;
const
u32
mask
=
0x00010001
<<
(
line
&
0xf
);
nv_wr32
(
event
->
priv
,
addr
+
0x0
8
,
mask
);
nv_mask
(
event
->
priv
,
addr
+
0x0
0
,
mask
,
mask
);
nv_wr32
(
event
->
priv
,
addr
+
0x0
0
,
mask
);
nv_mask
(
event
->
priv
,
addr
+
0x0
8
,
mask
,
mask
);
}
void
...
...
@@ -61,8 +61,8 @@ nve0_gpio_intr_disable(struct nouveau_event *event, int line)
{
const
u32
addr
=
line
<
16
?
0xdc00
:
0xdc80
;
const
u32
mask
=
0x00010001
<<
(
line
&
0xf
);
nv_
wr32
(
event
->
priv
,
addr
+
0x08
,
mask
);
nv_
mask
(
event
->
priv
,
addr
+
0x00
,
mask
,
0x00000000
);
nv_
mask
(
event
->
priv
,
addr
+
0x08
,
mask
,
0x00000000
);
nv_
wr32
(
event
->
priv
,
addr
+
0x00
,
mask
);
}
int
...
...
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