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
37353543
Commit
37353543
authored
Nov 17, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/core: add some forgotten subdevs to disable mask
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
c50d3b2b
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/core/engine/device/base.c
drivers/gpu/drm/nouveau/core/engine/device/base.c
+2
-0
drivers/gpu/drm/nouveau/nvif/class.h
drivers/gpu/drm/nouveau/nvif/class.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/core/engine/device/base.c
View file @
37353543
...
@@ -222,6 +222,7 @@ static const u64 disable_map[] = {
...
@@ -222,6 +222,7 @@ static const u64 disable_map[] = {
[
NVDEV_SUBDEV_VOLT
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_SUBDEV_VOLT
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_SUBDEV_THERM
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_SUBDEV_THERM
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_SUBDEV_PWR
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_SUBDEV_PWR
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_SUBDEV_FUSE
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_ENGINE_DMAOBJ
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_ENGINE_DMAOBJ
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_ENGINE_PERFMON
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_ENGINE_PERFMON
]
=
NV_DEVICE_V0_DISABLE_CORE
,
[
NVDEV_ENGINE_FIFO
]
=
NV_DEVICE_V0_DISABLE_FIFO
,
[
NVDEV_ENGINE_FIFO
]
=
NV_DEVICE_V0_DISABLE_FIFO
,
...
@@ -235,6 +236,7 @@ static const u64 disable_map[] = {
...
@@ -235,6 +236,7 @@ static const u64 disable_map[] = {
[
NVDEV_ENGINE_PPP
]
=
NV_DEVICE_V0_DISABLE_PPP
,
[
NVDEV_ENGINE_PPP
]
=
NV_DEVICE_V0_DISABLE_PPP
,
[
NVDEV_ENGINE_COPY0
]
=
NV_DEVICE_V0_DISABLE_COPY0
,
[
NVDEV_ENGINE_COPY0
]
=
NV_DEVICE_V0_DISABLE_COPY0
,
[
NVDEV_ENGINE_COPY1
]
=
NV_DEVICE_V0_DISABLE_COPY1
,
[
NVDEV_ENGINE_COPY1
]
=
NV_DEVICE_V0_DISABLE_COPY1
,
[
NVDEV_ENGINE_COPY2
]
=
NV_DEVICE_V0_DISABLE_COPY1
,
[
NVDEV_ENGINE_VIC
]
=
NV_DEVICE_V0_DISABLE_VIC
,
[
NVDEV_ENGINE_VIC
]
=
NV_DEVICE_V0_DISABLE_VIC
,
[
NVDEV_ENGINE_VENC
]
=
NV_DEVICE_V0_DISABLE_VENC
,
[
NVDEV_ENGINE_VENC
]
=
NV_DEVICE_V0_DISABLE_VENC
,
[
NVDEV_ENGINE_DISP
]
=
NV_DEVICE_V0_DISABLE_DISP
,
[
NVDEV_ENGINE_DISP
]
=
NV_DEVICE_V0_DISABLE_DISP
,
...
...
drivers/gpu/drm/nouveau/nvif/class.h
View file @
37353543
...
@@ -133,6 +133,7 @@ struct nv_device_v0 {
...
@@ -133,6 +133,7 @@ struct nv_device_v0 {
#define NV_DEVICE_V0_DISABLE_COPY1 0x0000010000000000ULL
#define NV_DEVICE_V0_DISABLE_COPY1 0x0000010000000000ULL
#define NV_DEVICE_V0_DISABLE_VIC 0x0000020000000000ULL
#define NV_DEVICE_V0_DISABLE_VIC 0x0000020000000000ULL
#define NV_DEVICE_V0_DISABLE_VENC 0x0000040000000000ULL
#define NV_DEVICE_V0_DISABLE_VENC 0x0000040000000000ULL
#define NV_DEVICE_V0_DISABLE_COPY2 0x0000080000000000ULL
__u64
disable
;
/* disable particular subsystems */
__u64
disable
;
/* disable particular subsystems */
__u64
debug0
;
/* as above, but *internal* ids, and *NOT* ABI */
__u64
debug0
;
/* as above, but *internal* ids, and *NOT* ABI */
};
};
...
...
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