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
d5288c88
Commit
d5288c88
authored
May 25, 2017
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch compat_drm_wait_vblank() to drm_ioctl_kernel()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
1a36bf1d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
16 deletions
+10
-16
drivers/gpu/drm/drm_ioc32.c
drivers/gpu/drm/drm_ioc32.c
+10
-16
No files found.
drivers/gpu/drm/drm_ioc32.c
View file @
d5288c88
...
@@ -837,29 +837,23 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
...
@@ -837,29 +837,23 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
{
{
drm_wait_vblank32_t
__user
*
argp
=
(
void
__user
*
)
arg
;
drm_wait_vblank32_t
__user
*
argp
=
(
void
__user
*
)
arg
;
drm_wait_vblank32_t
req32
;
drm_wait_vblank32_t
req32
;
union
drm_wait_vblank
__user
*
request
;
union
drm_wait_vblank
req
;
int
err
;
int
err
;
if
(
copy_from_user
(
&
req32
,
argp
,
sizeof
(
req32
)))
if
(
copy_from_user
(
&
req32
,
argp
,
sizeof
(
req32
)))
return
-
EFAULT
;
return
-
EFAULT
;
request
=
compat_alloc_user_space
(
sizeof
(
*
request
));
req
.
request
.
type
=
req32
.
request
.
type
;
if
(
!
request
req
.
request
.
sequence
=
req32
.
request
.
sequence
;
||
__put_user
(
req32
.
request
.
type
,
&
request
->
request
.
type
)
req
.
request
.
signal
=
req32
.
request
.
signal
;
||
__put_user
(
req32
.
request
.
sequence
,
&
request
->
request
.
sequence
)
err
=
drm_ioctl_kernel
(
file
,
drm_wait_vblank
,
&
req
,
DRM_UNLOCKED
);
||
__put_user
(
req32
.
request
.
signal
,
&
request
->
request
.
signal
))
return
-
EFAULT
;
err
=
drm_ioctl
(
file
,
DRM_IOCTL_WAIT_VBLANK
,
(
unsigned
long
)
request
);
if
(
err
)
if
(
err
)
return
err
;
return
err
;
if
(
__get_user
(
req32
.
reply
.
type
,
&
request
->
reply
.
type
)
req32
.
reply
.
type
=
req
.
reply
.
type
;
||
__get_user
(
req32
.
reply
.
sequence
,
&
request
->
reply
.
sequence
)
req32
.
reply
.
sequence
=
req
.
reply
.
sequence
;
||
__get_user
(
req32
.
reply
.
tval_sec
,
&
request
->
reply
.
tval_sec
)
req32
.
reply
.
tval_sec
=
req
.
reply
.
tval_sec
;
||
__get_user
(
req32
.
reply
.
tval_usec
,
&
request
->
reply
.
tval_usec
))
req32
.
reply
.
tval_usec
=
req
.
reply
.
tval_usec
;
return
-
EFAULT
;
if
(
copy_to_user
(
argp
,
&
req32
,
sizeof
(
req32
)))
if
(
copy_to_user
(
argp
,
&
req32
,
sizeof
(
req32
)))
return
-
EFAULT
;
return
-
EFAULT
;
...
@@ -960,7 +954,7 @@ static struct {
...
@@ -960,7 +954,7 @@ static struct {
#if defined(CONFIG_X86) || defined(CONFIG_IA64)
#if defined(CONFIG_X86) || defined(CONFIG_IA64)
DRM_IOCTL32_DEF
(
DRM_IOCTL_UPDATE_DRAW
,
compat_drm_update_draw
),
DRM_IOCTL32_DEF
(
DRM_IOCTL_UPDATE_DRAW
,
compat_drm_update_draw
),
#endif
#endif
[
DRM_IOCTL_NR
(
DRM_IOCTL_WAIT_VBLANK32
)].
fn
=
compat_drm_wait_vblank
,
DRM_IOCTL32_DEF
(
DRM_IOCTL_WAIT_VBLANK
,
compat_drm_wait_vblank
)
,
#if defined(CONFIG_X86) || defined(CONFIG_IA64)
#if defined(CONFIG_X86) || defined(CONFIG_IA64)
[
DRM_IOCTL_NR
(
DRM_IOCTL_MODE_ADDFB232
)].
fn
=
compat_drm_mode_addfb2
,
[
DRM_IOCTL_NR
(
DRM_IOCTL_MODE_ADDFB232
)].
fn
=
compat_drm_mode_addfb2
,
#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