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
4a3f63f8
Commit
4a3f63f8
authored
Mar 11, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fifo/gk104: add vic plumbing
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
a8b005fd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
drivers/gpu/drm/nouveau/include/nvif/cla06f.h
drivers/gpu/drm/nouveau/include/nvif/cla06f.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
+2
-0
No files found.
drivers/gpu/drm/nouveau/include/nvif/cla06f.h
View file @
4a3f63f8
...
...
@@ -12,6 +12,7 @@ struct kepler_channel_gpfifo_a_v0 {
#define NVA06F_V0_ENGINE_MSPDEC 0x00000020
#define NVA06F_V0_ENGINE_MSPPP 0x00000040
#define NVA06F_V0_ENGINE_MSENC 0x00000080
#define NVA06F_V0_ENGINE_VIC 0x00000100
#define NVA06F_V0_ENGINE_NVDEC 0x00000200
#define NVA06F_V0_ENGINE_NVENC0 0x00000400
#define NVA06F_V0_ENGINE_NVENC1 0x00000800
...
...
drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
View file @
4a3f63f8
...
...
@@ -67,6 +67,7 @@ gk104_fifo_gpfifo_engine_addr(struct nvkm_engine *engine)
case
NVKM_ENGINE_MSPDEC
:
return
0x0250
;
case
NVKM_ENGINE_MSPPP
:
return
0x0260
;
case
NVKM_ENGINE_MSVLD
:
return
0x0270
;
case
NVKM_ENGINE_VIC
:
return
0x0280
;
case
NVKM_ENGINE_MSENC
:
return
0x0290
;
case
NVKM_ENGINE_NVDEC
:
return
0x02100270
;
case
NVKM_ENGINE_NVENC0
:
return
0x02100290
;
...
...
@@ -346,6 +347,7 @@ gk104_fifo_gpfifo[] = {
{
NVA06F_V0_ENGINE_MSPDEC
,
BIT_ULL
(
NVKM_ENGINE_MSPDEC
)
},
{
NVA06F_V0_ENGINE_MSPPP
,
BIT_ULL
(
NVKM_ENGINE_MSPPP
)
},
{
NVA06F_V0_ENGINE_MSENC
,
BIT_ULL
(
NVKM_ENGINE_MSENC
)
},
{
NVA06F_V0_ENGINE_VIC
,
BIT_ULL
(
NVKM_ENGINE_VIC
)
},
{
NVA06F_V0_ENGINE_NVDEC
,
BIT_ULL
(
NVKM_ENGINE_NVDEC
)
},
{
NVA06F_V0_ENGINE_NVENC0
,
BIT_ULL
(
NVKM_ENGINE_NVENC0
)
},
{
NVA06F_V0_ENGINE_NVENC1
,
BIT_ULL
(
NVKM_ENGINE_NVENC1
)
},
...
...
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