Commit 354d3508 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/kms/nv50: ensure encoder normal power state is enabled at startup

To handle low-power DPMS states, we currently change an OR's (Output
Resource) normal (active) power state to be off, leaving the rest of
the display configured as usual.

Under atomic modesetting, we will instead be doing a full modeset to
tear down the pipe fully when entering a low-power state.

As we'll no longer be touching the OR's PWR registers during runtime
operation, we need to ensure the normal power state is set correctly
during initialisation.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent accdea2e
...@@ -3790,6 +3790,7 @@ int ...@@ -3790,6 +3790,7 @@ int
nv50_display_init(struct drm_device *dev) nv50_display_init(struct drm_device *dev)
{ {
struct nv50_disp *disp = nv50_disp(dev); struct nv50_disp *disp = nv50_disp(dev);
struct drm_encoder *encoder;
struct drm_plane *plane; struct drm_plane *plane;
struct drm_crtc *crtc; struct drm_crtc *crtc;
u32 *push; u32 *push;
...@@ -3809,6 +3810,24 @@ nv50_display_init(struct drm_device *dev) ...@@ -3809,6 +3810,24 @@ nv50_display_init(struct drm_device *dev)
evo_data(push, nv50_mast(dev)->base.sync.handle); evo_data(push, nv50_mast(dev)->base.sync.handle);
evo_kick(push, nv50_mast(dev)); evo_kick(push, nv50_mast(dev));
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (encoder->encoder_type != DRM_MODE_ENCODER_DPMST) {
const struct drm_encoder_helper_funcs *help;
struct nouveau_encoder *nv_encoder;
nv_encoder = nouveau_encoder(encoder);
if (nv_encoder->dcb->type == DCB_OUTPUT_DP)
nv_encoder->dcb->type = DCB_OUTPUT_EOL;
help = encoder->helper_private;
if (help && help->dpms)
help->dpms(encoder, DRM_MODE_DPMS_ON);
if (nv_encoder->dcb->type == DCB_OUTPUT_EOL)
nv_encoder->dcb->type = DCB_OUTPUT_DP;
}
}
drm_for_each_plane(plane, dev) { drm_for_each_plane(plane, dev) {
struct nv50_wndw *wndw = nv50_wndw(plane); struct nv50_wndw *wndw = nv50_wndw(plane);
if (plane->funcs != &nv50_wndw) if (plane->funcs != &nv50_wndw)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment