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
4894f662
Commit
4894f662
authored
Oct 20, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: a, somehow, missed hunk of "fix regression on agp boards"
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
f9fc3661
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
drivers/gpu/drm/nouveau/nouveau_chan.c
drivers/gpu/drm/nouveau/nouveau_chan.c
+1
-6
No files found.
drivers/gpu/drm/nouveau/nouveau_chan.c
View file @
4894f662
...
@@ -285,7 +285,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
...
@@ -285,7 +285,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
struct
nouveau_software_chan
*
swch
;
struct
nouveau_software_chan
*
swch
;
struct
nv_dma_v0
args
=
{};
struct
nv_dma_v0
args
=
{};
int
ret
,
i
;
int
ret
,
i
;
bool
save
;
nvif_object_map
(
chan
->
object
);
nvif_object_map
(
chan
->
object
);
...
@@ -387,11 +386,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
...
@@ -387,11 +386,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
}
}
/* initialise synchronisation */
/* initialise synchronisation */
save
=
cli
->
base
.
super
;
return
nouveau_fence
(
chan
->
drm
)
->
context_new
(
chan
);
cli
->
base
.
super
=
true
;
/* hack until fencenv50 fixed */
ret
=
nouveau_fence
(
chan
->
drm
)
->
context_new
(
chan
);
cli
->
base
.
super
=
save
;
return
ret
;
}
}
int
int
...
...
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