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
88c0de2c
Commit
88c0de2c
authored
Apr 08, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/mc/gt215: define reset masks + intr cleanup
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
a6bb38e9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
4 deletions
+76
-4
drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+4
-4
drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
+1
-0
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c
+70
-0
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h
View file @
88c0de2c
...
@@ -17,6 +17,7 @@ int nv04_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
...
@@ -17,6 +17,7 @@ int nv04_mc_new(struct nvkm_device *, int, struct nvkm_mc **);
int
nv44_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
nv44_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
nv50_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
nv50_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
g98_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
g98_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gt215_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gf100_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gf100_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gk104_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gk104_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gk20a_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
int
gk20a_mc_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_mc
**
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
88c0de2c
...
@@ -1150,7 +1150,7 @@ nva3_chipset = {
...
@@ -1150,7 +1150,7 @@ nva3_chipset = {
.
gpio
=
g94_gpio_new
,
.
gpio
=
g94_gpio_new
,
.
i2c
=
g94_i2c_new
,
.
i2c
=
g94_i2c_new
,
.
imem
=
nv50_instmem_new
,
.
imem
=
nv50_instmem_new
,
.
mc
=
g
98
_mc_new
,
.
mc
=
g
t215
_mc_new
,
.
mmu
=
nv50_mmu_new
,
.
mmu
=
nv50_mmu_new
,
.
mxm
=
nv50_mxm_new
,
.
mxm
=
nv50_mxm_new
,
.
pci
=
g94_pci_new
,
.
pci
=
g94_pci_new
,
...
@@ -1184,7 +1184,7 @@ nva5_chipset = {
...
@@ -1184,7 +1184,7 @@ nva5_chipset = {
.
gpio
=
g94_gpio_new
,
.
gpio
=
g94_gpio_new
,
.
i2c
=
g94_i2c_new
,
.
i2c
=
g94_i2c_new
,
.
imem
=
nv50_instmem_new
,
.
imem
=
nv50_instmem_new
,
.
mc
=
g
98
_mc_new
,
.
mc
=
g
t215
_mc_new
,
.
mmu
=
nv50_mmu_new
,
.
mmu
=
nv50_mmu_new
,
.
mxm
=
nv50_mxm_new
,
.
mxm
=
nv50_mxm_new
,
.
pci
=
g94_pci_new
,
.
pci
=
g94_pci_new
,
...
@@ -1217,7 +1217,7 @@ nva8_chipset = {
...
@@ -1217,7 +1217,7 @@ nva8_chipset = {
.
gpio
=
g94_gpio_new
,
.
gpio
=
g94_gpio_new
,
.
i2c
=
g94_i2c_new
,
.
i2c
=
g94_i2c_new
,
.
imem
=
nv50_instmem_new
,
.
imem
=
nv50_instmem_new
,
.
mc
=
g
98
_mc_new
,
.
mc
=
g
t215
_mc_new
,
.
mmu
=
nv50_mmu_new
,
.
mmu
=
nv50_mmu_new
,
.
mxm
=
nv50_mxm_new
,
.
mxm
=
nv50_mxm_new
,
.
pci
=
g94_pci_new
,
.
pci
=
g94_pci_new
,
...
@@ -1314,7 +1314,7 @@ nvaf_chipset = {
...
@@ -1314,7 +1314,7 @@ nvaf_chipset = {
.
gpio
=
g94_gpio_new
,
.
gpio
=
g94_gpio_new
,
.
i2c
=
g94_i2c_new
,
.
i2c
=
g94_i2c_new
,
.
imem
=
nv50_instmem_new
,
.
imem
=
nv50_instmem_new
,
.
mc
=
g
98
_mc_new
,
.
mc
=
g
t215
_mc_new
,
.
mmu
=
nv50_mmu_new
,
.
mmu
=
nv50_mmu_new
,
.
mxm
=
nv50_mxm_new
,
.
mxm
=
nv50_mxm_new
,
.
pci
=
g94_pci_new
,
.
pci
=
g94_pci_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild
View file @
88c0de2c
...
@@ -3,6 +3,7 @@ nvkm-y += nvkm/subdev/mc/nv04.o
...
@@ -3,6 +3,7 @@ nvkm-y += nvkm/subdev/mc/nv04.o
nvkm-y += nvkm/subdev/mc/nv44.o
nvkm-y += nvkm/subdev/mc/nv44.o
nvkm-y += nvkm/subdev/mc/nv50.o
nvkm-y += nvkm/subdev/mc/nv50.o
nvkm-y += nvkm/subdev/mc/g98.o
nvkm-y += nvkm/subdev/mc/g98.o
nvkm-y += nvkm/subdev/mc/gt215.o
nvkm-y += nvkm/subdev/mc/gf100.o
nvkm-y += nvkm/subdev/mc/gf100.o
nvkm-y += nvkm/subdev/mc/gk104.o
nvkm-y += nvkm/subdev/mc/gk104.o
nvkm-y += nvkm/subdev/mc/gk20a.o
nvkm-y += nvkm/subdev/mc/gk20a.o
drivers/gpu/drm/nouveau/nvkm/subdev/mc/gt215.c
0 → 100644
View file @
88c0de2c
/*
* Copyright 2016 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* Authors: Ben Skeggs
*/
#include "priv.h"
static
const
struct
nvkm_mc_map
gt215_mc_reset
[]
=
{
{
0x04008000
,
NVKM_ENGINE_MSVLD
},
{
0x01020000
,
NVKM_ENGINE_MSPDEC
},
{
0x00802000
,
NVKM_ENGINE_CE0
},
{
0x00400002
,
NVKM_ENGINE_MSPPP
},
{
0x00201000
,
NVKM_ENGINE_GR
},
{
0x00000100
,
NVKM_ENGINE_FIFO
},
{}
};
static
const
struct
nvkm_mc_map
gt215_mc_intr
[]
=
{
{
0x04000000
,
NVKM_ENGINE_DISP
},
{
0x00400000
,
NVKM_ENGINE_CE0
},
{
0x00020000
,
NVKM_ENGINE_MSPDEC
},
{
0x00008000
,
NVKM_ENGINE_MSVLD
},
{
0x00001000
,
NVKM_ENGINE_GR
},
{
0x00000100
,
NVKM_ENGINE_FIFO
},
{
0x00000001
,
NVKM_ENGINE_MSPPP
},
{
0x00429101
,
NVKM_SUBDEV_FB
},
{
0x10000000
,
NVKM_SUBDEV_BUS
},
{
0x00200000
,
NVKM_SUBDEV_GPIO
},
{
0x00200000
,
NVKM_SUBDEV_I2C
},
{
0x00100000
,
NVKM_SUBDEV_TIMER
},
{
0x00080000
,
NVKM_SUBDEV_THERM
},
{
0x00040000
,
NVKM_SUBDEV_PMU
},
{},
};
static
const
struct
nvkm_mc_func
gt215_mc
=
{
.
init
=
nv50_mc_init
,
.
intr
=
gt215_mc_intr
,
.
intr_unarm
=
nv04_mc_intr_unarm
,
.
intr_rearm
=
nv04_mc_intr_rearm
,
.
intr_mask
=
nv04_mc_intr_mask
,
.
reset
=
gt215_mc_reset
,
};
int
gt215_mc_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_mc
**
pmc
)
{
return
nvkm_mc_new_
(
&
gt215_mc
,
device
,
index
,
pmc
);
}
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