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
0c4dd906
Commit
0c4dd906
authored
Dec 19, 2006
by
Dave Airlie
Committed by
Dave Airlie
Dec 19, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm: make kernel context switch same as for drm git tree.
Signed-off-by:
Dave Airlie
<
airlied@linux.ie
>
parent
94bb598e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
drivers/char/drm/drmP.h
drivers/char/drm/drmP.h
+1
-2
drivers/char/drm/drm_lock.c
drivers/char/drm/drm_lock.c
+1
-1
No files found.
drivers/char/drm/drmP.h
View file @
0c4dd906
...
@@ -561,8 +561,7 @@ struct drm_driver {
...
@@ -561,8 +561,7 @@ struct drm_driver {
int
(
*
context_dtor
)
(
struct
drm_device
*
dev
,
int
context
);
int
(
*
context_dtor
)
(
struct
drm_device
*
dev
,
int
context
);
int
(
*
kernel_context_switch
)
(
struct
drm_device
*
dev
,
int
old
,
int
(
*
kernel_context_switch
)
(
struct
drm_device
*
dev
,
int
old
,
int
new
);
int
new
);
void
(
*
kernel_context_switch_unlock
)
(
struct
drm_device
*
dev
,
void
(
*
kernel_context_switch_unlock
)
(
struct
drm_device
*
dev
);
drm_lock_t
*
lock
);
int
(
*
vblank_wait
)
(
struct
drm_device
*
dev
,
unsigned
int
*
sequence
);
int
(
*
vblank_wait
)
(
struct
drm_device
*
dev
,
unsigned
int
*
sequence
);
int
(
*
vblank_wait2
)
(
struct
drm_device
*
dev
,
unsigned
int
*
sequence
);
int
(
*
vblank_wait2
)
(
struct
drm_device
*
dev
,
unsigned
int
*
sequence
);
int
(
*
dri_library_name
)
(
struct
drm_device
*
dev
,
char
*
buf
);
int
(
*
dri_library_name
)
(
struct
drm_device
*
dev
,
char
*
buf
);
...
...
drivers/char/drm/drm_lock.c
View file @
0c4dd906
...
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
...
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
* modules but is required by the Sparc driver.
* modules but is required by the Sparc driver.
*/
*/
if
(
dev
->
driver
->
kernel_context_switch_unlock
)
if
(
dev
->
driver
->
kernel_context_switch_unlock
)
dev
->
driver
->
kernel_context_switch_unlock
(
dev
,
&
lock
);
dev
->
driver
->
kernel_context_switch_unlock
(
dev
);
else
{
else
{
drm_lock_transfer
(
dev
,
&
dev
->
lock
.
hw_lock
->
lock
,
drm_lock_transfer
(
dev
,
&
dev
->
lock
.
hw_lock
->
lock
,
DRM_KERNEL_CONTEXT
);
DRM_KERNEL_CONTEXT
);
...
...
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