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
4abb410a
Commit
4abb410a
authored
Jan 12, 2012
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: recognise DCB connector type for DP+DVI+VGA DMS-59
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
070be296
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
drivers/gpu/drm/nouveau/nouveau_bios.h
drivers/gpu/drm/nouveau/nouveau_bios.h
+2
-0
drivers/gpu/drm/nouveau/nouveau_connector.c
drivers/gpu/drm/nouveau/nouveau_connector.c
+5
-1
No files found.
drivers/gpu/drm/nouveau/nouveau_bios.h
View file @
4abb410a
...
@@ -75,6 +75,8 @@ enum dcb_connector_type {
...
@@ -75,6 +75,8 @@ enum dcb_connector_type {
DCB_CONNECTOR_eDP
=
0x47
,
DCB_CONNECTOR_eDP
=
0x47
,
DCB_CONNECTOR_HDMI_0
=
0x60
,
DCB_CONNECTOR_HDMI_0
=
0x60
,
DCB_CONNECTOR_HDMI_1
=
0x61
,
DCB_CONNECTOR_HDMI_1
=
0x61
,
DCB_CONNECTOR_DMS59_DP0
=
0x64
,
DCB_CONNECTOR_DMS59_DP1
=
0x65
,
DCB_CONNECTOR_NONE
=
0xff
DCB_CONNECTOR_NONE
=
0xff
};
};
...
...
drivers/gpu/drm/nouveau/nouveau_connector.c
View file @
4abb410a
...
@@ -858,6 +858,8 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb)
...
@@ -858,6 +858,8 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb)
case
DCB_CONNECTOR_DVI_D
:
return
DRM_MODE_CONNECTOR_DVID
;
case
DCB_CONNECTOR_DVI_D
:
return
DRM_MODE_CONNECTOR_DVID
;
case
DCB_CONNECTOR_LVDS
:
case
DCB_CONNECTOR_LVDS
:
case
DCB_CONNECTOR_LVDS_SPWG
:
return
DRM_MODE_CONNECTOR_LVDS
;
case
DCB_CONNECTOR_LVDS_SPWG
:
return
DRM_MODE_CONNECTOR_LVDS
;
case
DCB_CONNECTOR_DMS59_DP0
:
case
DCB_CONNECTOR_DMS59_DP1
:
case
DCB_CONNECTOR_DP
:
return
DRM_MODE_CONNECTOR_DisplayPort
;
case
DCB_CONNECTOR_DP
:
return
DRM_MODE_CONNECTOR_DisplayPort
;
case
DCB_CONNECTOR_eDP
:
return
DRM_MODE_CONNECTOR_eDP
;
case
DCB_CONNECTOR_eDP
:
return
DRM_MODE_CONNECTOR_eDP
;
case
DCB_CONNECTOR_HDMI_0
:
case
DCB_CONNECTOR_HDMI_0
:
...
@@ -1002,7 +1004,9 @@ nouveau_connector_create(struct drm_device *dev, int index)
...
@@ -1002,7 +1004,9 @@ nouveau_connector_create(struct drm_device *dev, int index)
nv_connector
->
type
==
DCB_CONNECTOR_DVI_I
||
nv_connector
->
type
==
DCB_CONNECTOR_DVI_I
||
nv_connector
->
type
==
DCB_CONNECTOR_HDMI_0
||
nv_connector
->
type
==
DCB_CONNECTOR_HDMI_0
||
nv_connector
->
type
==
DCB_CONNECTOR_HDMI_1
||
nv_connector
->
type
==
DCB_CONNECTOR_HDMI_1
||
nv_connector
->
type
==
DCB_CONNECTOR_DP
))
{
nv_connector
->
type
==
DCB_CONNECTOR_DP
||
nv_connector
->
type
==
DCB_CONNECTOR_DMS59_DP0
||
nv_connector
->
type
==
DCB_CONNECTOR_DMS59_DP1
))
{
drm_connector_attach_property
(
connector
,
drm_connector_attach_property
(
connector
,
disp
->
underscan_property
,
disp
->
underscan_property
,
UNDERSCAN_OFF
);
UNDERSCAN_OFF
);
...
...
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