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
42aacfba
Commit
42aacfba
authored
Nov 25, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'drm-linus' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
parents
b3eb67a2
cf65f162
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
drivers/char/drm/drm_lock.c
drivers/char/drm/drm_lock.c
+11
-5
No files found.
drivers/char/drm/drm_lock.c
View file @
42aacfba
...
...
@@ -104,6 +104,10 @@ int drm_lock(struct inode *inode, struct file *filp,
__set_current_state
(
TASK_RUNNING
);
remove_wait_queue
(
&
dev
->
lock
.
lock_queue
,
&
entry
);
DRM_DEBUG
(
"%d %s
\n
"
,
lock
.
context
,
ret
?
"interrupted"
:
"has lock"
);
if
(
ret
)
return
ret
;
sigemptyset
(
&
dev
->
sigmask
);
sigaddset
(
&
dev
->
sigmask
,
SIGSTOP
);
sigaddset
(
&
dev
->
sigmask
,
SIGTSTP
);
...
...
@@ -116,8 +120,12 @@ int drm_lock(struct inode *inode, struct file *filp,
if
(
dev
->
driver
->
dma_ready
&&
(
lock
.
flags
&
_DRM_LOCK_READY
))
dev
->
driver
->
dma_ready
(
dev
);
if
(
dev
->
driver
->
dma_quiescent
&&
(
lock
.
flags
&
_DRM_LOCK_QUIESCENT
))
return
dev
->
driver
->
dma_quiescent
(
dev
);
if
(
dev
->
driver
->
dma_quiescent
&&
(
lock
.
flags
&
_DRM_LOCK_QUIESCENT
))
{
if
(
dev
->
driver
->
dma_quiescent
(
dev
))
{
DRM_DEBUG
(
"%d waiting for DMA quiescent
\n
"
,
lock
.
context
);
return
DRM_ERR
(
EBUSY
);
}
}
/* dev->driver->kernel_context_switch isn't used by any of the x86
* drivers but is used by the Sparc driver.
...
...
@@ -128,9 +136,7 @@ int drm_lock(struct inode *inode, struct file *filp,
dev
->
driver
->
kernel_context_switch
(
dev
,
dev
->
last_context
,
lock
.
context
);
}
DRM_DEBUG
(
"%d %s
\n
"
,
lock
.
context
,
ret
?
"interrupted"
:
"has lock"
);
return
ret
;
return
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