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
3eee8646
Commit
3eee8646
authored
Sep 15, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/gt214-/kms: perform hda codec setup on displayport too
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
a5229461
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/nouveau/nv50_display.c
+2
-2
No files found.
drivers/gpu/drm/nouveau/nv50_display.c
View file @
3eee8646
...
@@ -1750,8 +1750,6 @@ nv50_hdmi_disconnect(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
...
@@ -1750,8 +1750,6 @@ nv50_hdmi_disconnect(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)
(
0x0100
<<
nv_crtc
->
index
),
(
0x0100
<<
nv_crtc
->
index
),
};
};
nv50_audio_disconnect
(
encoder
);
nvif_mthd
(
disp
->
disp
,
0
,
&
args
,
sizeof
(
args
));
nvif_mthd
(
disp
->
disp
,
0
,
&
args
,
sizeof
(
args
));
}
}
...
@@ -1860,6 +1858,7 @@ nv50_sor_disconnect(struct drm_encoder *encoder)
...
@@ -1860,6 +1858,7 @@ nv50_sor_disconnect(struct drm_encoder *encoder)
if
(
nv_crtc
)
{
if
(
nv_crtc
)
{
nv50_crtc_prepare
(
&
nv_crtc
->
base
);
nv50_crtc_prepare
(
&
nv_crtc
->
base
);
nv50_sor_ctrl
(
nv_encoder
,
1
<<
nv_crtc
->
index
,
0
);
nv50_sor_ctrl
(
nv_encoder
,
1
<<
nv_crtc
->
index
,
0
);
nv50_audio_disconnect
(
encoder
);
nv50_hdmi_disconnect
(
&
nv_encoder
->
base
.
base
,
nv_crtc
);
nv50_hdmi_disconnect
(
&
nv_encoder
->
base
.
base
,
nv_crtc
);
}
}
}
}
...
@@ -1959,6 +1958,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,
...
@@ -1959,6 +1958,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,
proto
=
0x8
;
proto
=
0x8
;
else
else
proto
=
0x9
;
proto
=
0x9
;
nv50_audio_mode_set
(
encoder
,
mode
);
break
;
break
;
default:
default:
BUG_ON
(
1
);
BUG_ON
(
1
);
...
...
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