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
nexedi
linux
Commits
aedf43d5
Commit
aedf43d5
authored
Aug 10, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: use ioctl interface for abi16 gpuobj free
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
3bdda04f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
drivers/gpu/drm/nouveau/nouveau_abi16.c
drivers/gpu/drm/nouveau/nouveau_abi16.c
+15
-3
No files found.
drivers/gpu/drm/nouveau/nouveau_abi16.c
View file @
aedf43d5
...
...
@@ -490,9 +490,22 @@ int
nouveau_abi16_ioctl_gpuobj_free
(
ABI16_IOCTL_ARGS
)
{
struct
drm_nouveau_gpuobj_free
*
fini
=
data
;
struct
{
struct
nvif_ioctl_v0
ioctl
;
struct
nvif_ioctl_del
del
;
}
args
=
{
.
ioctl
.
owner
=
NVDRM_OBJECT_ABI16
,
.
ioctl
.
type
=
NVIF_IOCTL_V0_DEL
,
.
ioctl
.
path_nr
=
4
,
.
ioctl
.
path
[
3
]
=
NOUVEAU_ABI16_CLIENT
,
.
ioctl
.
path
[
2
]
=
NOUVEAU_ABI16_DEVICE
,
.
ioctl
.
path
[
1
]
=
NOUVEAU_ABI16_CHAN
(
fini
->
channel
),
.
ioctl
.
path
[
0
]
=
fini
->
handle
,
};
struct
nouveau_abi16
*
abi16
=
nouveau_abi16_get
(
file_priv
,
dev
);
struct
nouveau_abi16_chan
*
chan
;
struct
nouveau_abi16_ntfy
*
ntfy
;
struct
nvif_client
*
client
;
int
ret
;
if
(
unlikely
(
!
abi16
))
...
...
@@ -501,13 +514,12 @@ nouveau_abi16_ioctl_gpuobj_free(ABI16_IOCTL_ARGS)
chan
=
nouveau_abi16_chan
(
abi16
,
fini
->
channel
);
if
(
!
chan
)
return
nouveau_abi16_put
(
abi16
,
-
ENOENT
);
client
=
nvif_client
(
nvif_object
(
&
abi16
->
device
));
/* synchronize with the user channel and destroy the gpu object */
nouveau_channel_idle
(
chan
->
chan
);
/*XXX*/
ret
=
nouveau_object_del
(
nv_object
(
nvkm_client
(
&
abi16
->
device
.
base
)),
chan
->
chan
->
object
->
handle
,
fini
->
handle
);
ret
=
nvif_client_ioctl
(
client
,
&
args
,
sizeof
(
args
));
if
(
ret
)
return
nouveau_abi16_put
(
abi16
,
ret
);
...
...
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