Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
9ddc8c52
Commit
9ddc8c52
authored
Dec 15, 2009
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: remove use of -ERESTART
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
81a54877
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
drivers/gpu/drm/nouveau/nouveau_fence.c
drivers/gpu/drm/nouveau/nouveau_fence.c
+1
-1
drivers/gpu/drm/nouveau/nouveau_gem.c
drivers/gpu/drm/nouveau/nouveau_gem.c
+0
-7
No files found.
drivers/gpu/drm/nouveau/nouveau_fence.c
View file @
9ddc8c52
...
@@ -205,7 +205,7 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
...
@@ -205,7 +205,7 @@ nouveau_fence_wait(void *sync_obj, void *sync_arg, bool lazy, bool intr)
schedule_timeout
(
1
);
schedule_timeout
(
1
);
if
(
intr
&&
signal_pending
(
current
))
{
if
(
intr
&&
signal_pending
(
current
))
{
ret
=
-
ERESTART
;
ret
=
-
ERESTART
SYS
;
break
;
break
;
}
}
}
}
...
...
drivers/gpu/drm/nouveau/nouveau_gem.c
View file @
9ddc8c52
...
@@ -342,8 +342,6 @@ retry:
...
@@ -342,8 +342,6 @@ retry:
}
}
ret
=
ttm_bo_wait_cpu
(
&
nvbo
->
bo
,
false
);
ret
=
ttm_bo_wait_cpu
(
&
nvbo
->
bo
,
false
);
if
(
ret
==
-
ERESTART
)
ret
=
-
EAGAIN
;
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
goto
retry
;
goto
retry
;
...
@@ -915,8 +913,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
...
@@ -915,8 +913,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
goto
out
;
goto
out
;
ret
=
ttm_bo_wait_cpu
(
&
nvbo
->
bo
,
no_wait
);
ret
=
ttm_bo_wait_cpu
(
&
nvbo
->
bo
,
no_wait
);
if
(
ret
==
-
ERESTART
)
ret
=
-
EAGAIN
;
if
(
ret
)
if
(
ret
)
goto
out
;
goto
out
;
}
}
...
@@ -925,9 +921,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
...
@@ -925,9 +921,6 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data,
ret
=
ttm_bo_wait
(
&
nvbo
->
bo
,
false
,
false
,
no_wait
);
ret
=
ttm_bo_wait
(
&
nvbo
->
bo
,
false
,
false
,
no_wait
);
}
else
{
}
else
{
ret
=
ttm_bo_synccpu_write_grab
(
&
nvbo
->
bo
,
no_wait
);
ret
=
ttm_bo_synccpu_write_grab
(
&
nvbo
->
bo
,
no_wait
);
if
(
ret
==
-
ERESTART
)
ret
=
-
EAGAIN
;
else
if
(
ret
==
0
)
if
(
ret
==
0
)
nvbo
->
cpu_filp
=
file_priv
;
nvbo
->
cpu_filp
=
file_priv
;
}
}
...
...
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