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
e56f90fe
Commit
e56f90fe
authored
Apr 08, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mc/g98: define reset masks + intr cleanup
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
88c0de2c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
14 deletions
+22
-14
drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
+22
-14
No files found.
drivers/gpu/drm/nouveau/nvkm/subdev/mc/g98.c
View file @
e56f90fe
...
...
@@ -24,23 +24,30 @@
#include "priv.h"
static
const
struct
nvkm_mc_map
g98_mc_intr
[]
=
{
{
0x04000000
,
NVKM_ENGINE_DISP
},
/* DISP first, so pageflip timestamps work */
{
0x00000001
,
NVKM_ENGINE_MSPPP
},
g98_mc_reset
[]
=
{
{
0x04008000
,
NVKM_ENGINE_MSVLD
},
{
0x02004000
,
NVKM_ENGINE_SEC
},
{
0x01020000
,
NVKM_ENGINE_MSPDEC
},
{
0x00400002
,
NVKM_ENGINE_MSPPP
},
{
0x00201000
,
NVKM_ENGINE_GR
},
{
0x00000100
,
NVKM_ENGINE_FIFO
},
{
0x00001000
,
NVKM_ENGINE_GR
},
{
0x00004000
,
NVKM_ENGINE_SEC
},
/* NV84:NVA3 */
{
0x00008000
,
NVKM_ENGINE_MSVLD
},
{}
};
static
const
struct
nvkm_mc_map
g98_mc_intr
[]
=
{
{
0x04000000
,
NVKM_ENGINE_DISP
},
{
0x00020000
,
NVKM_ENGINE_MSPDEC
},
{
0x000
40000
,
NVKM_SUBDEV_PMU
},
/* NVA3:NVC0 */
{
0x000
80000
,
NVKM_SUBDEV_THERM
},
/* NVA3:NVC0 */
{
0x00
100000
,
NVKM_SUBDEV_TIME
R
},
{
0x00
200000
,
NVKM_SUBDEV_GPIO
},
/* PMGR->GPIO */
{
0x00
200000
,
NVKM_SUBDEV_I2C
},
/* PMGR->I2C/AUX */
{
0x00
400000
,
NVKM_ENGINE_CE0
},
/* NVA3- */
{
0x000
08000
,
NVKM_ENGINE_MSVLD
},
{
0x000
04000
,
NVKM_ENGINE_SEC
},
{
0x00
001000
,
NVKM_ENGINE_G
R
},
{
0x00
000100
,
NVKM_ENGINE_FIFO
},
{
0x00
000001
,
NVKM_ENGINE_MSPPP
},
{
0x00
02d101
,
NVKM_SUBDEV_FB
},
{
0x10000000
,
NVKM_SUBDEV_BUS
},
{
0x80000000
,
NVKM_ENGINE_SW
},
{
0x0042d101
,
NVKM_SUBDEV_FB
},
{
0x00200000
,
NVKM_SUBDEV_GPIO
},
{
0x00200000
,
NVKM_SUBDEV_I2C
},
{
0x00100000
,
NVKM_SUBDEV_TIMER
},
{},
};
...
...
@@ -51,6 +58,7 @@ g98_mc = {
.
intr_unarm
=
nv04_mc_intr_unarm
,
.
intr_rearm
=
nv04_mc_intr_rearm
,
.
intr_mask
=
nv04_mc_intr_mask
,
.
reset
=
g98_mc_reset
,
};
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