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
b0bc5304
Commit
b0bc5304
authored
Apr 29, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nve0/ce: create engine object for ce2
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
d53635a9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
0 deletions
+36
-0
drivers/gpu/drm/nouveau/core/engine/copy/nve0.c
drivers/gpu/drm/nouveau/core/engine/copy/nve0.c
+31
-0
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
+3
-0
drivers/gpu/drm/nouveau/core/include/core/device.h
drivers/gpu/drm/nouveau/core/include/core/device.h
+1
-0
drivers/gpu/drm/nouveau/core/include/engine/copy.h
drivers/gpu/drm/nouveau/core/include/engine/copy.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/core/engine/copy/nve0.c
View file @
b0bc5304
...
@@ -113,6 +113,26 @@ nve0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
...
@@ -113,6 +113,26 @@ nve0_copy1_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
return
0
;
return
0
;
}
}
static
int
nve0_copy2_ctor
(
struct
nouveau_object
*
parent
,
struct
nouveau_object
*
engine
,
struct
nouveau_oclass
*
oclass
,
void
*
data
,
u32
size
,
struct
nouveau_object
**
pobject
)
{
struct
nve0_copy_priv
*
priv
;
int
ret
;
ret
=
nouveau_engine_create
(
parent
,
engine
,
oclass
,
true
,
"PCE2"
,
"copy2"
,
&
priv
);
*
pobject
=
nv_object
(
priv
);
if
(
ret
)
return
ret
;
nv_subdev
(
priv
)
->
unit
=
0x00200000
;
nv_engine
(
priv
)
->
cclass
=
&
nve0_copy_cclass
;
nv_engine
(
priv
)
->
sclass
=
nve0_copy_sclass
;
return
0
;
}
struct
nouveau_oclass
struct
nouveau_oclass
nve0_copy0_oclass
=
{
nve0_copy0_oclass
=
{
.
handle
=
NV_ENGINE
(
COPY0
,
0xe0
),
.
handle
=
NV_ENGINE
(
COPY0
,
0xe0
),
...
@@ -134,3 +154,14 @@ nve0_copy1_oclass = {
...
@@ -134,3 +154,14 @@ nve0_copy1_oclass = {
.
fini
=
_nouveau_engine_fini
,
.
fini
=
_nouveau_engine_fini
,
},
},
};
};
struct
nouveau_oclass
nve0_copy2_oclass
=
{
.
handle
=
NV_ENGINE
(
COPY2
,
0xe0
),
.
ofuncs
=
&
(
struct
nouveau_ofuncs
)
{
.
ctor
=
nve0_copy2_ctor
,
.
dtor
=
_nouveau_engine_dtor
,
.
init
=
_nouveau_engine_init
,
.
fini
=
_nouveau_engine_fini
,
},
};
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
View file @
b0bc5304
...
@@ -79,6 +79,7 @@ nve0_identify(struct nouveau_device *device)
...
@@ -79,6 +79,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
&
nve0_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
&
nve0_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY1
]
=
&
nve0_copy1_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY1
]
=
&
nve0_copy1_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY2
]
=
&
nve0_copy2_oclass
;
device
->
oclass
[
NVDEV_ENGINE_BSP
]
=
&
nve0_bsp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_BSP
]
=
&
nve0_bsp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_VP
]
=
&
nve0_vp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_VP
]
=
&
nve0_vp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_PPP
]
=
&
nvc0_ppp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_PPP
]
=
&
nvc0_ppp_oclass
;
...
@@ -108,6 +109,7 @@ nve0_identify(struct nouveau_device *device)
...
@@ -108,6 +109,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
&
nve0_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
&
nve0_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY1
]
=
&
nve0_copy1_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY1
]
=
&
nve0_copy1_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY2
]
=
&
nve0_copy2_oclass
;
device
->
oclass
[
NVDEV_ENGINE_BSP
]
=
&
nve0_bsp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_BSP
]
=
&
nve0_bsp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_VP
]
=
&
nve0_vp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_VP
]
=
&
nve0_vp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_PPP
]
=
&
nvc0_ppp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_PPP
]
=
&
nvc0_ppp_oclass
;
...
@@ -137,6 +139,7 @@ nve0_identify(struct nouveau_device *device)
...
@@ -137,6 +139,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
&
nve0_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_DISP
]
=
&
nve0_disp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY0
]
=
&
nve0_copy0_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY1
]
=
&
nve0_copy1_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY1
]
=
&
nve0_copy1_oclass
;
device
->
oclass
[
NVDEV_ENGINE_COPY2
]
=
&
nve0_copy2_oclass
;
device
->
oclass
[
NVDEV_ENGINE_BSP
]
=
&
nve0_bsp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_BSP
]
=
&
nve0_bsp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_VP
]
=
&
nve0_vp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_VP
]
=
&
nve0_vp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_PPP
]
=
&
nvc0_ppp_oclass
;
device
->
oclass
[
NVDEV_ENGINE_PPP
]
=
&
nvc0_ppp_oclass
;
...
...
drivers/gpu/drm/nouveau/core/include/core/device.h
View file @
b0bc5304
...
@@ -49,6 +49,7 @@ enum nv_subdev_type {
...
@@ -49,6 +49,7 @@ enum nv_subdev_type {
NVDEV_ENGINE_PPP
,
NVDEV_ENGINE_PPP
,
NVDEV_ENGINE_COPY0
,
NVDEV_ENGINE_COPY0
,
NVDEV_ENGINE_COPY1
,
NVDEV_ENGINE_COPY1
,
NVDEV_ENGINE_COPY2
,
NVDEV_ENGINE_UNK1C1
,
NVDEV_ENGINE_UNK1C1
,
NVDEV_ENGINE_VENC
,
NVDEV_ENGINE_VENC
,
NVDEV_ENGINE_DISP
,
NVDEV_ENGINE_DISP
,
...
...
drivers/gpu/drm/nouveau/core/include/engine/copy.h
View file @
b0bc5304
...
@@ -8,5 +8,6 @@ extern struct nouveau_oclass nvc0_copy0_oclass;
...
@@ -8,5 +8,6 @@ extern struct nouveau_oclass nvc0_copy0_oclass;
extern
struct
nouveau_oclass
nvc0_copy1_oclass
;
extern
struct
nouveau_oclass
nvc0_copy1_oclass
;
extern
struct
nouveau_oclass
nve0_copy0_oclass
;
extern
struct
nouveau_oclass
nve0_copy0_oclass
;
extern
struct
nouveau_oclass
nve0_copy1_oclass
;
extern
struct
nouveau_oclass
nve0_copy1_oclass
;
extern
struct
nouveau_oclass
nve0_copy2_oclass
;
#endif
#endif
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