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
111af5c1
Commit
111af5c1
authored
Jun 03, 2011
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: skip move_notify() if bo does not have a vma attached
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6e32fedc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_bo.c
+2
-4
No files found.
drivers/gpu/drm/nouveau/nouveau_bo.c
View file @
111af5c1
...
...
@@ -842,13 +842,11 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
static
void
nouveau_bo_move_ntfy
(
struct
ttm_buffer_object
*
bo
,
struct
ttm_mem_reg
*
new_mem
)
{
struct
drm_nouveau_private
*
dev_priv
=
nouveau_bdev
(
bo
->
bdev
);
struct
nouveau_mem
*
node
=
new_mem
->
mm_node
;
struct
nouveau_bo
*
nvbo
=
nouveau_bo
(
bo
);
struct
nouveau_vma
*
vma
=
&
nvbo
->
vma
;
struct
nouveau_vm
*
vm
=
vma
->
vm
;
if
(
dev_priv
->
card_type
<
NV_50
)
if
(
!
vma
->
vm
)
return
;
switch
(
new_mem
->
mem_type
)
{
...
...
@@ -856,7 +854,7 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)
nouveau_vm_map
(
vma
,
node
);
break
;
case
TTM_PL_TT
:
if
(
vma
->
node
->
type
!=
vm
->
spg_shift
)
{
if
(
vma
->
node
->
type
!=
vm
a
->
vm
->
spg_shift
)
{
nouveau_vm_unmap
(
vma
);
vma
=
&
node
->
tmp_vma
;
}
...
...
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