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
f42c5707
Commit
f42c5707
authored
May 01, 2017
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/kms/nv50: remove pointless argument to window atomic_check_acquire()
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
271393ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/nouveau/nv50_display.c
+6
-7
No files found.
drivers/gpu/drm/nouveau/nv50_display.c
View file @
f42c5707
...
...
@@ -831,8 +831,7 @@ nv50_wndw_atomic_check_release(struct nv50_wndw *wndw,
static
int
nv50_wndw_atomic_check_acquire
(
struct
nv50_wndw
*
wndw
,
struct
nv50_wndw_atom
*
asyw
,
struct
nv50_head_atom
*
asyh
,
u32
pflip_flags
)
struct
nv50_head_atom
*
asyh
)
{
struct
nouveau_framebuffer
*
fb
=
nouveau_framebuffer
(
asyw
->
state
.
fb
);
struct
nouveau_drm
*
drm
=
nouveau_drm
(
wndw
->
plane
.
dev
);
...
...
@@ -848,7 +847,10 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw,
asyw
->
image
.
h
=
fb
->
base
.
height
;
asyw
->
image
.
kind
=
(
fb
->
nvbo
->
tile_flags
&
0x0000ff00
)
>>
8
;
asyw
->
interval
=
pflip_flags
&
DRM_MODE_PAGE_FLIP_ASYNC
?
0
:
1
;
if
(
asyh
->
state
.
pageflip_flags
&
DRM_MODE_PAGE_FLIP_ASYNC
)
asyw
->
interval
=
0
;
else
asyw
->
interval
=
1
;
if
(
asyw
->
image
.
kind
)
{
asyw
->
image
.
layout
=
0
;
...
...
@@ -887,7 +889,6 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
struct
nv50_head_atom
*
harm
=
NULL
,
*
asyh
=
NULL
;
bool
varm
=
false
,
asyv
=
false
,
asym
=
false
;
int
ret
;
u32
pflip_flags
=
0
;
NV_ATOMIC
(
drm
,
"%s atomic_check
\n
"
,
plane
->
name
);
if
(
asyw
->
state
.
crtc
)
{
...
...
@@ -896,7 +897,6 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
return
PTR_ERR
(
asyh
);
asym
=
drm_atomic_crtc_needs_modeset
(
&
asyh
->
state
);
asyv
=
asyh
->
state
.
active
;
pflip_flags
=
asyh
->
state
.
pageflip_flags
;
}
if
(
armw
->
state
.
crtc
)
{
...
...
@@ -913,8 +913,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
asyw
->
set
.
point
=
true
;
if
(
!
varm
||
asym
||
armw
->
state
.
fb
!=
asyw
->
state
.
fb
)
{
ret
=
nv50_wndw_atomic_check_acquire
(
wndw
,
asyw
,
asyh
,
pflip_flags
);
ret
=
nv50_wndw_atomic_check_acquire
(
wndw
,
asyw
,
asyh
);
if
(
ret
)
return
ret
;
}
...
...
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