Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
R128
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ermine
R128
Commits
111af5c1
Commit
111af5c1
authored
13 years ago
by
Ben Skeggs
Browse files
Options
Downloads
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
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
drivers/gpu/drm/nouveau/nouveau_bo.c
+2
-4
2 additions, 4 deletions
drivers/gpu/drm/nouveau/nouveau_bo.c
with
2 additions
and
4 deletions
drivers/gpu/drm/nouveau/nouveau_bo.c
+
2
−
4
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
!=
vma
->
vm
->
spg_shift
)
{
nouveau_vm_unmap
(
vma
);
vma
=
&
node
->
tmp_vma
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment