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
2f68234f
Commit
2f68234f
authored
May 08, 2018
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mc/gp100-: route fault buffer interrupts to FAULT
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
1ce46689
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c
+19
-1
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
+2
-0
No files found.
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c
View file @
2f68234f
...
...
@@ -75,10 +75,28 @@ gp100_mc_intr_mask(struct nvkm_mc *base, u32 mask, u32 intr)
spin_unlock_irqrestore
(
&
mc
->
lock
,
flags
);
}
const
struct
nvkm_mc_map
gp100_mc_intr
[]
=
{
{
0x04000000
,
NVKM_ENGINE_DISP
},
{
0x00000100
,
NVKM_ENGINE_FIFO
},
{
0x00000200
,
NVKM_SUBDEV_FAULT
},
{
0x40000000
,
NVKM_SUBDEV_IBUS
},
{
0x10000000
,
NVKM_SUBDEV_BUS
},
{
0x08000000
,
NVKM_SUBDEV_FB
},
{
0x02000000
,
NVKM_SUBDEV_LTC
},
{
0x01000000
,
NVKM_SUBDEV_PMU
},
{
0x00200000
,
NVKM_SUBDEV_GPIO
},
{
0x00200000
,
NVKM_SUBDEV_I2C
},
{
0x00100000
,
NVKM_SUBDEV_TIMER
},
{
0x00040000
,
NVKM_SUBDEV_THERM
},
{
0x00002000
,
NVKM_SUBDEV_FB
},
{},
};
static
const
struct
nvkm_mc_func
gp100_mc
=
{
.
init
=
nv50_mc_init
,
.
intr
=
g
k104
_mc_intr
,
.
intr
=
g
p100
_mc_intr
,
.
intr_unarm
=
gp100_mc_intr_unarm
,
.
intr_rearm
=
gp100_mc_intr_rearm
,
.
intr_mask
=
gp100_mc_intr_mask
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c
View file @
2f68234f
...
...
@@ -34,7 +34,7 @@ gp10b_mc_init(struct nvkm_mc *mc)
static
const
struct
nvkm_mc_func
gp10b_mc
=
{
.
init
=
gp10b_mc_init
,
.
intr
=
g
k104
_mc_intr
,
.
intr
=
g
p100
_mc_intr
,
.
intr_unarm
=
gp100_mc_intr_unarm
,
.
intr_rearm
=
gp100_mc_intr_rearm
,
.
intr_mask
=
gp100_mc_intr_mask
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h
View file @
2f68234f
...
...
@@ -57,4 +57,6 @@ int gp100_mc_new_(const struct nvkm_mc_func *, struct nvkm_device *, int,
extern
const
struct
nvkm_mc_map
gk104_mc_intr
[];
extern
const
struct
nvkm_mc_map
gk104_mc_reset
[];
extern
const
struct
nvkm_mc_map
gp100_mc_intr
[];
#endif
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