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
4697fd6f
Commit
4697fd6f
authored
Oct 15, 2009
by
Len Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'launchpad-333386' into release
parents
fee807e8
3a1151e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
drivers/acpi/video.c
drivers/acpi/video.c
+6
-1
drivers/acpi/video_detect.c
drivers/acpi/video_detect.c
+1
-1
No files found.
drivers/acpi/video.c
View file @
4697fd6f
...
...
@@ -1109,7 +1109,12 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
*/
/* Does this device support video switching? */
if
(
video
->
cap
.
_DOS
)
{
if
(
video
->
cap
.
_DOS
||
video
->
cap
.
_DOD
)
{
if
(
!
video
->
cap
.
_DOS
)
{
printk
(
KERN_WARNING
FW_BUG
"ACPI(%s) defines _DOD but not _DOS
\n
"
,
acpi_device_bid
(
video
->
device
));
}
video
->
flags
.
multihead
=
1
;
status
=
0
;
}
...
...
drivers/acpi/video_detect.c
View file @
4697fd6f
...
...
@@ -84,7 +84,7 @@ long acpi_is_video_device(struct acpi_device *device)
return
0
;
/* Does this device able to support video switching ? */
if
(
ACPI_SUCCESS
(
acpi_get_handle
(
device
->
handle
,
"_DOD"
,
&
h_dummy
))
&&
if
(
ACPI_SUCCESS
(
acpi_get_handle
(
device
->
handle
,
"_DOD"
,
&
h_dummy
))
||
ACPI_SUCCESS
(
acpi_get_handle
(
device
->
handle
,
"_DOS"
,
&
h_dummy
)))
video_caps
|=
ACPI_VIDEO_OUTPUT_SWITCHING
;
...
...
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