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
nexedi
linux
Commits
0c088847
Commit
0c088847
authored
Nov 05, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mc: fix (incorrect) reporting of unknown pending intr bits
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
8df1d0c0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
drivers/gpu/drm/nouveau/core/subdev/mc/base.c
drivers/gpu/drm/nouveau/core/subdev/mc/base.c
+11
-6
No files found.
drivers/gpu/drm/nouveau/core/subdev/mc/base.c
View file @
0c088847
...
@@ -25,6 +25,15 @@
...
@@ -25,6 +25,15 @@
#include <subdev/mc.h>
#include <subdev/mc.h>
#include <core/option.h>
#include <core/option.h>
static
inline
u32
nouveau_mc_intr_mask
(
struct
nouveau_mc
*
pmc
)
{
u32
intr
=
nv_rd32
(
pmc
,
0x000100
);
if
(
intr
==
0xffffffff
)
/* likely fallen off the bus */
intr
=
0x00000000
;
return
intr
;
}
static
irqreturn_t
static
irqreturn_t
nouveau_mc_intr
(
int
irq
,
void
*
arg
)
nouveau_mc_intr
(
int
irq
,
void
*
arg
)
{
{
...
@@ -37,16 +46,12 @@ nouveau_mc_intr(int irq, void *arg)
...
@@ -37,16 +46,12 @@ nouveau_mc_intr(int irq, void *arg)
nv_wr32
(
pmc
,
0x000140
,
0x00000000
);
nv_wr32
(
pmc
,
0x000140
,
0x00000000
);
nv_rd32
(
pmc
,
0x000140
);
nv_rd32
(
pmc
,
0x000140
);
intr
=
nouveau_mc_intr_mask
(
pmc
);
intr
=
nv_rd32
(
pmc
,
0x000100
);
if
(
intr
==
0xffffffff
)
/* likely fallen off the bus */
intr
=
0x00000000
;
if
(
pmc
->
use_msi
)
if
(
pmc
->
use_msi
)
oclass
->
msi_rearm
(
pmc
);
oclass
->
msi_rearm
(
pmc
);
if
(
intr
)
{
if
(
intr
)
{
u32
stat
=
nv_rd32
(
pmc
,
0x000100
);
u32
stat
=
intr
=
nouveau_mc_intr_mask
(
pmc
);
while
(
map
->
stat
)
{
while
(
map
->
stat
)
{
if
(
intr
&
map
->
stat
)
{
if
(
intr
&
map
->
stat
)
{
unit
=
nouveau_subdev
(
pmc
,
map
->
unit
);
unit
=
nouveau_subdev
(
pmc
,
map
->
unit
);
...
...
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