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
b2b75eea
Commit
b2b75eea
authored
Nov 04, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/kms: prepare to support legacy connector dpms with atomic
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
56182b8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
3 deletions
+14
-3
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_connector.c
+14
-3
No files found.
drivers/gpu/drm/nouveau/nouveau_connector.c
View file @
b2b75eea
...
...
@@ -1074,9 +1074,17 @@ nouveau_connector_helper_funcs = {
.
best_encoder
=
nouveau_connector_best_encoder
,
};
static
int
nouveau_connector_dpms
(
struct
drm_connector
*
connector
,
int
mode
)
{
if
(
connector
->
dev
->
mode_config
.
funcs
->
atomic_commit
)
return
drm_atomic_helper_connector_dpms
(
connector
,
mode
);
return
drm_helper_connector_dpms
(
connector
,
mode
);
}
static
const
struct
drm_connector_funcs
nouveau_connector_funcs
=
{
.
dpms
=
drm_helper
_connector_dpms
,
.
dpms
=
nouveau
_connector_dpms
,
.
reset
=
nouveau_conn_reset
,
.
detect
=
nouveau_connector_detect
,
.
force
=
nouveau_connector_force
,
...
...
@@ -1091,7 +1099,7 @@ nouveau_connector_funcs = {
static
const
struct
drm_connector_funcs
nouveau_connector_funcs_lvds
=
{
.
dpms
=
drm_helper
_connector_dpms
,
.
dpms
=
nouveau
_connector_dpms
,
.
reset
=
nouveau_conn_reset
,
.
detect
=
nouveau_connector_detect_lvds
,
.
force
=
nouveau_connector_force
,
...
...
@@ -1335,7 +1343,10 @@ nouveau_connector_create(struct drm_device *dev, int index)
return
ERR_PTR
(
ret
);
}
funcs
=
&
nouveau_connector_funcs_dp
;
if
(
dev
->
mode_config
.
funcs
->
atomic_commit
)
funcs
=
&
nouveau_connector_funcs
;
else
funcs
=
&
nouveau_connector_funcs_dp
;
break
;
default:
funcs
=
&
nouveau_connector_funcs
;
...
...
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