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
092599da
Commit
092599da
authored
Jul 14, 2012
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nv50/instmem: remove use of nouveau_gpuobj_new_fake()
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
73a60c0d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
17 deletions
+2
-17
drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
+2
-17
No files found.
drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c
View file @
092599da
...
@@ -53,7 +53,6 @@ nv50_channel_del(struct nouveau_channel **pchan)
...
@@ -53,7 +53,6 @@ nv50_channel_del(struct nouveau_channel **pchan)
if
(
!
chan
)
if
(
!
chan
)
return
;
return
;
nouveau_gpuobj_ref
(
NULL
,
&
chan
->
ramfc
);
nouveau_vm_ref
(
NULL
,
&
chan
->
vm
,
chan
->
vm_pd
);
nouveau_vm_ref
(
NULL
,
&
chan
->
vm
,
chan
->
vm_pd
);
nouveau_gpuobj_ref
(
NULL
,
&
chan
->
vm_pd
);
nouveau_gpuobj_ref
(
NULL
,
&
chan
->
vm_pd
);
if
(
drm_mm_initialized
(
&
chan
->
ramin_heap
))
if
(
drm_mm_initialized
(
&
chan
->
ramin_heap
))
...
@@ -68,7 +67,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
...
@@ -68,7 +67,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
{
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
u32
pgd
=
(
dev_priv
->
chipset
==
0x50
)
?
0x1400
:
0x0200
;
u32
pgd
=
(
dev_priv
->
chipset
==
0x50
)
?
0x1400
:
0x0200
;
u32
fc
=
(
dev_priv
->
chipset
==
0x50
)
?
0x0000
:
0x4200
;
struct
nouveau_channel
*
chan
;
struct
nouveau_channel
*
chan
;
int
ret
,
i
;
int
ret
,
i
;
...
@@ -83,17 +81,13 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
...
@@ -83,17 +81,13 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
return
ret
;
return
ret
;
}
}
ret
=
drm_mm_init
(
&
chan
->
ramin_heap
,
0x6000
,
chan
->
ramin
->
size
-
0x6000
);
ret
=
drm_mm_init
(
&
chan
->
ramin_heap
,
pgd
,
chan
->
ramin
->
size
-
pgd
);
if
(
ret
)
{
if
(
ret
)
{
nv50_channel_del
(
&
chan
);
nv50_channel_del
(
&
chan
);
return
ret
;
return
ret
;
}
}
ret
=
nouveau_gpuobj_new_fake
(
dev
,
chan
->
ramin
->
pinst
==
~
0
?
~
0
:
ret
=
nouveau_gpuobj_new
(
dev
,
chan
,
0x4000
,
0
,
0
,
&
chan
->
vm_pd
);
chan
->
ramin
->
pinst
+
pgd
,
chan
->
ramin
->
vinst
+
pgd
,
0x4000
,
NVOBJ_FLAG_ZERO_ALLOC
,
&
chan
->
vm_pd
);
if
(
ret
)
{
if
(
ret
)
{
nv50_channel_del
(
&
chan
);
nv50_channel_del
(
&
chan
);
return
ret
;
return
ret
;
...
@@ -110,15 +104,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
...
@@ -110,15 +104,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm,
return
ret
;
return
ret
;
}
}
ret
=
nouveau_gpuobj_new_fake
(
dev
,
chan
->
ramin
->
pinst
==
~
0
?
~
0
:
chan
->
ramin
->
pinst
+
fc
,
chan
->
ramin
->
vinst
+
fc
,
0x100
,
NVOBJ_FLAG_ZERO_ALLOC
,
&
chan
->
ramfc
);
if
(
ret
)
{
nv50_channel_del
(
&
chan
);
return
ret
;
}
*
pchan
=
chan
;
*
pchan
=
chan
;
return
0
;
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