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
206c38a9
Commit
206c38a9
authored
Nov 01, 2012
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/core: add some missing subdev/engine disable flags
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
b6caea50
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
drivers/gpu/drm/nouveau/core/include/core/class.h
drivers/gpu/drm/nouveau/core/include/core/class.h
+1
-0
drivers/gpu/drm/nouveau/core/subdev/device/base.c
drivers/gpu/drm/nouveau/core/subdev/device/base.c
+9
-4
No files found.
drivers/gpu/drm/nouveau/core/include/core/class.h
View file @
206c38a9
...
...
@@ -23,6 +23,7 @@
#define NV_DEVICE_DISABLE_COPY0 0x0000008000000000ULL
#define NV_DEVICE_DISABLE_COPY1 0x0000010000000000ULL
#define NV_DEVICE_DISABLE_UNK1C1 0x0000020000000000ULL
#define NV_DEVICE_DISABLE_VENC 0x0000040000000000ULL
struct
nv_device_class
{
u64
device
;
/* device identifier, ~0 for client default */
...
...
drivers/gpu/drm/nouveau/core/subdev/device/base.c
View file @
206c38a9
...
...
@@ -61,19 +61,24 @@ struct nouveau_devobj {
static
const
u64
disable_map
[]
=
{
[
NVDEV_SUBDEV_VBIOS
]
=
NV_DEVICE_DISABLE_VBIOS
,
[
NVDEV_SUBDEV_DEVINIT
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_GPIO
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_I2C
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_DEVINIT
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_CLOCK
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_MXM
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_MC
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_TIMER
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_FB
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_VM
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_LTCG
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_IBUS
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_INSTMEM
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_VM
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_BAR
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_VOLT
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_CLOCK
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_SUBDEV_THERM
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_ENGINE_DMAOBJ
]
=
NV_DEVICE_DISABLE_CORE
,
[
NVDEV_ENGINE_FIFO
]
=
NV_DEVICE_DISABLE_FIFO
,
[
NVDEV_ENGINE_SW
]
=
NV_DEVICE_DISABLE_FIFO
,
[
NVDEV_ENGINE_GR
]
=
NV_DEVICE_DISABLE_GRAPH
,
[
NVDEV_ENGINE_MPEG
]
=
NV_DEVICE_DISABLE_MPEG
,
[
NVDEV_ENGINE_ME
]
=
NV_DEVICE_DISABLE_ME
,
...
...
@@ -84,7 +89,7 @@ static const u64 disable_map[] = {
[
NVDEV_ENGINE_COPY0
]
=
NV_DEVICE_DISABLE_COPY0
,
[
NVDEV_ENGINE_COPY1
]
=
NV_DEVICE_DISABLE_COPY1
,
[
NVDEV_ENGINE_UNK1C1
]
=
NV_DEVICE_DISABLE_UNK1C1
,
[
NVDEV_ENGINE_
FIFO
]
=
NV_DEVICE_DISABLE_FIFO
,
[
NVDEV_ENGINE_
VENC
]
=
NV_DEVICE_DISABLE_VENC
,
[
NVDEV_ENGINE_DISP
]
=
NV_DEVICE_DISABLE_DISP
,
[
NVDEV_SUBDEV_NR
]
=
0
,
};
...
...
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