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
51a506c0
Commit
51a506c0
authored
May 13, 2013
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/core: remove nouveau_mm.mutex, no more users
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
4e67bee8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
5 deletions
+2
-5
drivers/gpu/drm/nouveau/core/core/mm.c
drivers/gpu/drm/nouveau/core/core/mm.c
+0
-1
drivers/gpu/drm/nouveau/core/include/core/mm.h
drivers/gpu/drm/nouveau/core/include/core/mm.h
+0
-2
drivers/gpu/drm/nouveau/nouveau_ttm.c
drivers/gpu/drm/nouveau/nouveau_ttm.c
+2
-2
No files found.
drivers/gpu/drm/nouveau/core/core/mm.c
View file @
51a506c0
...
@@ -208,7 +208,6 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block)
...
@@ -208,7 +208,6 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block)
struct
nouveau_mm_node
*
node
;
struct
nouveau_mm_node
*
node
;
if
(
block
)
{
if
(
block
)
{
mutex_init
(
&
mm
->
mutex
);
INIT_LIST_HEAD
(
&
mm
->
nodes
);
INIT_LIST_HEAD
(
&
mm
->
nodes
);
INIT_LIST_HEAD
(
&
mm
->
free
);
INIT_LIST_HEAD
(
&
mm
->
free
);
mm
->
block_size
=
block
;
mm
->
block_size
=
block
;
...
...
drivers/gpu/drm/nouveau/core/include/core/mm.h
View file @
51a506c0
...
@@ -15,8 +15,6 @@ struct nouveau_mm {
...
@@ -15,8 +15,6 @@ struct nouveau_mm {
struct
list_head
nodes
;
struct
list_head
nodes
;
struct
list_head
free
;
struct
list_head
free
;
struct
mutex
mutex
;
u32
block_size
;
u32
block_size
;
int
heap_nodes
;
int
heap_nodes
;
};
};
...
...
drivers/gpu/drm/nouveau/nouveau_ttm.c
View file @
51a506c0
...
@@ -111,7 +111,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
...
@@ -111,7 +111,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
struct
nouveau_mm_node
*
r
;
struct
nouveau_mm_node
*
r
;
u32
total
=
0
,
free
=
0
;
u32
total
=
0
,
free
=
0
;
mutex_lock
(
&
mm
->
mutex
);
mutex_lock
(
&
nv_subdev
(
pfb
)
->
mutex
);
list_for_each_entry
(
r
,
&
mm
->
nodes
,
nl_entry
)
{
list_for_each_entry
(
r
,
&
mm
->
nodes
,
nl_entry
)
{
printk
(
KERN_DEBUG
"%s %d: 0x%010llx 0x%010llx
\n
"
,
printk
(
KERN_DEBUG
"%s %d: 0x%010llx 0x%010llx
\n
"
,
prefix
,
r
->
type
,
((
u64
)
r
->
offset
<<
12
),
prefix
,
r
->
type
,
((
u64
)
r
->
offset
<<
12
),
...
@@ -121,7 +121,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
...
@@ -121,7 +121,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
if
(
!
r
->
type
)
if
(
!
r
->
type
)
free
+=
r
->
length
;
free
+=
r
->
length
;
}
}
mutex_unlock
(
&
mm
->
mutex
);
mutex_unlock
(
&
nv_subdev
(
pfb
)
->
mutex
);
printk
(
KERN_DEBUG
"%s total: 0x%010llx free: 0x%010llx
\n
"
,
printk
(
KERN_DEBUG
"%s total: 0x%010llx free: 0x%010llx
\n
"
,
prefix
,
(
u64
)
total
<<
12
,
(
u64
)
free
<<
12
);
prefix
,
(
u64
)
total
<<
12
,
(
u64
)
free
<<
12
);
...
...
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