Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
nexedi
linux
Commits
6be4421a
Commit
6be4421a
authored
7 years ago
by
Ben Skeggs
Browse files
Options
Download
Email Patches
Plain Diff
drm/nouveau: consolidate identical functions in nouveau_ttm.c
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
792067e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
46 deletions
+17
-46
drivers/gpu/drm/nouveau/nouveau_ttm.c
drivers/gpu/drm/nouveau/nouveau_ttm.c
+17
-46
No files found.
drivers/gpu/drm/nouveau/nouveau_ttm.c
View file @
6be4421a
...
...
@@ -33,17 +33,23 @@
#include <core/tegra.h>
static
int
nouveau_
vram_
manager_init
(
struct
ttm_mem_type_manager
*
man
,
unsigned
long
psize
)
nouveau_manager_init
(
struct
ttm_mem_type_manager
*
man
,
unsigned
long
psize
)
{
return
0
;
}
static
int
nouveau_
vram_
manager_fini
(
struct
ttm_mem_type_manager
*
man
)
nouveau_manager_fini
(
struct
ttm_mem_type_manager
*
man
)
{
return
0
;
}
static
void
nouveau_manager_debug
(
struct
ttm_mem_type_manager
*
man
,
struct
drm_printer
*
printer
)
{
}
static
inline
void
nvkm_mem_node_cleanup
(
struct
nvkm_mem
*
node
)
{
...
...
@@ -103,24 +109,13 @@ nouveau_vram_manager_new(struct ttm_mem_type_manager *man,
}
const
struct
ttm_mem_type_manager_func
nouveau_vram_manager
=
{
.
init
=
nouveau_
vram_
manager_init
,
.
takedown
=
nouveau_
vram_
manager_fini
,
.
init
=
nouveau_manager_init
,
.
takedown
=
nouveau_manager_fini
,
.
get_node
=
nouveau_vram_manager_new
,
.
put_node
=
nouveau_vram_manager_del
,
.
debug
=
nouveau_manager_debug
,
};
static
int
nouveau_gart_manager_init
(
struct
ttm_mem_type_manager
*
man
,
unsigned
long
psize
)
{
return
0
;
}
static
int
nouveau_gart_manager_fini
(
struct
ttm_mem_type_manager
*
man
)
{
return
0
;
}
static
void
nouveau_gart_manager_del
(
struct
ttm_mem_type_manager
*
man
,
struct
ttm_mem_reg
*
reg
)
...
...
@@ -172,32 +167,14 @@ nouveau_gart_manager_new(struct ttm_mem_type_manager *man,
return
0
;
}
static
void
nouveau_gart_manager_debug
(
struct
ttm_mem_type_manager
*
man
,
struct
drm_printer
*
printer
)
{
}
const
struct
ttm_mem_type_manager_func
nouveau_gart_manager
=
{
.
init
=
nouveau_
gart_
manager_init
,
.
takedown
=
nouveau_
gart_
manager_fini
,
.
init
=
nouveau_manager_init
,
.
takedown
=
nouveau_manager_fini
,
.
get_node
=
nouveau_gart_manager_new
,
.
put_node
=
nouveau_gart_manager_del
,
.
debug
=
nouveau_
gart_
manager_debug
.
debug
=
nouveau_manager_debug
};
static
int
nv04_gart_manager_init
(
struct
ttm_mem_type_manager
*
man
,
unsigned
long
psize
)
{
return
0
;
}
static
int
nv04_gart_manager_fini
(
struct
ttm_mem_type_manager
*
man
)
{
return
0
;
}
static
void
nv04_gart_manager_del
(
struct
ttm_mem_type_manager
*
man
,
struct
ttm_mem_reg
*
reg
)
{
...
...
@@ -241,18 +218,12 @@ nv04_gart_manager_new(struct ttm_mem_type_manager *man,
return
0
;
}
static
void
nv04_gart_manager_debug
(
struct
ttm_mem_type_manager
*
man
,
struct
drm_printer
*
printer
)
{
}
const
struct
ttm_mem_type_manager_func
nv04_gart_manager
=
{
.
init
=
n
v04_gart
_manager_init
,
.
takedown
=
n
v04_gart
_manager_fini
,
.
init
=
n
ouveau
_manager_init
,
.
takedown
=
n
ouveau
_manager_fini
,
.
get_node
=
nv04_gart_manager_new
,
.
put_node
=
nv04_gart_manager_del
,
.
debug
=
n
v04_gart
_manager_debug
.
debug
=
n
ouveau
_manager_debug
};
int
...
...
This diff is collapsed.
Click to expand it.
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