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
d9184fa9
Commit
d9184fa9
authored
Feb 16, 2010
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: use mutex for vbios lock
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
13876c6e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
drivers/gpu/drm/nouveau/nouveau_bios.c
drivers/gpu/drm/nouveau/nouveau_bios.c
+3
-4
drivers/gpu/drm/nouveau/nouveau_bios.h
drivers/gpu/drm/nouveau/nouveau_bios.h
+1
-1
No files found.
drivers/gpu/drm/nouveau/nouveau_bios.c
View file @
d9184fa9
...
...
@@ -5861,13 +5861,12 @@ nouveau_bios_run_init_table(struct drm_device *dev, uint16_t table,
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nvbios
*
bios
=
&
dev_priv
->
VBIOS
;
struct
init_exec
iexec
=
{
true
,
false
};
unsigned
long
flags
;
spin_lock_irqsave
(
&
bios
->
lock
,
flags
);
mutex_lock
(
&
bios
->
lock
);
bios
->
display
.
output
=
dcbent
;
parse_init_table
(
bios
,
table
,
&
iexec
);
bios
->
display
.
output
=
NULL
;
spin_unlock_irqrestore
(
&
bios
->
lock
,
flags
);
mutex_unlock
(
&
bios
->
lock
);
}
static
bool
NVInitVBIOS
(
struct
drm_device
*
dev
)
...
...
@@ -5876,7 +5875,7 @@ static bool NVInitVBIOS(struct drm_device *dev)
struct
nvbios
*
bios
=
&
dev_priv
->
VBIOS
;
memset
(
bios
,
0
,
sizeof
(
struct
nvbios
));
spin_lock
_init
(
&
bios
->
lock
);
mutex
_init
(
&
bios
->
lock
);
bios
->
dev
=
dev
;
if
(
!
NVShadowVBIOS
(
dev
,
bios
->
data
))
...
...
drivers/gpu/drm/nouveau/nouveau_bios.h
View file @
d9184fa9
...
...
@@ -205,7 +205,7 @@ struct nvbios {
struct
drm_device
*
dev
;
struct
nouveau_bios_info
pub
;
s
pinlock_t
lock
;
s
truct
mutex
lock
;
uint8_t
data
[
NV_PROM_SIZE
];
unsigned
int
length
;
...
...
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