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
21fa60ed
Commit
21fa60ed
authored
Oct 25, 2006
by
=?utf-8?q?Michel_D=C3=A4nzer?=
Committed by
airlied
Dec 07, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm: i915: Only return EBUSY after we've established we need to schedule a new swap.
Signed-off-by:
Dave Airlie
<
airlied@linux.ie
>
parent
2dbb232c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
drivers/char/drm/i915_irq.c
drivers/char/drm/i915_irq.c
+5
-5
No files found.
drivers/char/drm/i915_irq.c
View file @
21fa60ed
...
@@ -392,11 +392,6 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
...
@@ -392,11 +392,6 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
return
DRM_ERR
(
EINVAL
);
return
DRM_ERR
(
EINVAL
);
}
}
if
(
dev_priv
->
swaps_pending
>=
100
)
{
DRM_DEBUG
(
"Too many swaps queued
\n
"
);
return
DRM_ERR
(
EBUSY
);
}
DRM_COPY_FROM_USER_IOCTL
(
swap
,
(
drm_i915_vblank_swap_t
__user
*
)
data
,
DRM_COPY_FROM_USER_IOCTL
(
swap
,
(
drm_i915_vblank_swap_t
__user
*
)
data
,
sizeof
(
swap
));
sizeof
(
swap
));
...
@@ -461,6 +456,11 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
...
@@ -461,6 +456,11 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
spin_unlock_irqrestore
(
&
dev_priv
->
swaps_lock
,
irqflags
);
spin_unlock_irqrestore
(
&
dev_priv
->
swaps_lock
,
irqflags
);
if
(
dev_priv
->
swaps_pending
>=
100
)
{
DRM_DEBUG
(
"Too many swaps queued
\n
"
);
return
DRM_ERR
(
EBUSY
);
}
vbl_swap
=
drm_calloc
(
1
,
sizeof
(
vbl_swap
),
DRM_MEM_DRIVER
);
vbl_swap
=
drm_calloc
(
1
,
sizeof
(
vbl_swap
),
DRM_MEM_DRIVER
);
if
(
!
vbl_swap
)
{
if
(
!
vbl_swap
)
{
...
...
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