| 257,16 → 257,10 |
|---|
| { |
| struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; |
| |
| if (encoder->bridge) |
| encoder->bridge->funcs->disable(encoder->bridge); |
| |
| if (encoder_funcs->disable) |
| (*encoder_funcs->disable)(encoder); |
| else |
| (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF); |
| |
| if (encoder->bridge) |
| encoder->bridge->funcs->post_disable(encoder->bridge); |
| } |
| |
| /** |
| 430,16 → 424,6 |
|---|
| |
| if (encoder->crtc != crtc) |
| continue; |
| |
| if (encoder->bridge && encoder->bridge->funcs->mode_fixup) { |
| ret = encoder->bridge->funcs->mode_fixup( |
| encoder->bridge, mode, adjusted_mode); |
| if (!ret) { |
| DRM_DEBUG_KMS("Bridge fixup failed\n"); |
| goto done; |
| } |
| } |
| |
| encoder_funcs = encoder->helper_private; |
| if (!(ret = encoder_funcs->mode_fixup(encoder, mode, |
| adjusted_mode))) { |
| 459,16 → 443,9 |
|---|
| |
| if (encoder->crtc != crtc) |
| continue; |
| |
| if (encoder->bridge) |
| encoder->bridge->funcs->disable(encoder->bridge); |
| |
| encoder_funcs = encoder->helper_private; |
| /* Disable the encoders as the first thing we do. */ |
| encoder_funcs->prepare(encoder); |
| |
| if (encoder->bridge) |
| encoder->bridge->funcs->post_disable(encoder->bridge); |
| } |
| |
| drm_crtc_prepare_encoders(dev); |
| 492,10 → 469,6 |
|---|
| mode->base.id, mode->name); |
| encoder_funcs = encoder->helper_private; |
| encoder_funcs->mode_set(encoder, mode, adjusted_mode); |
| |
| if (encoder->bridge && encoder->bridge->funcs->mode_set) |
| encoder->bridge->funcs->mode_set(encoder->bridge, mode, |
| adjusted_mode); |
| } |
| |
| /* Now enable the clocks, plane, pipe, and connectors that we set up. */ |
| 506,14 → 479,9 |
|---|
| if (encoder->crtc != crtc) |
| continue; |
| |
| if (encoder->bridge) |
| encoder->bridge->funcs->pre_enable(encoder->bridge); |
| |
| encoder_funcs = encoder->helper_private; |
| encoder_funcs->commit(encoder); |
| |
| if (encoder->bridge) |
| encoder->bridge->funcs->enable(encoder->bridge); |
| } |
| |
| /* Store real post-adjustment hardware mode. */ |
| 862,31 → 830,6 |
|---|
| return dpms; |
| } |
| |
| /* Helper which handles bridge ordering around encoder dpms */ |
| static void drm_helper_encoder_dpms(struct drm_encoder *encoder, int mode) |
| { |
| struct drm_bridge *bridge = encoder->bridge; |
| struct drm_encoder_helper_funcs *encoder_funcs; |
| |
| if (bridge) { |
| if (mode == DRM_MODE_DPMS_ON) |
| bridge->funcs->pre_enable(bridge); |
| else |
| bridge->funcs->disable(bridge); |
| } |
| |
| encoder_funcs = encoder->helper_private; |
| if (encoder_funcs->dpms) |
| encoder_funcs->dpms(encoder, mode); |
| |
| if (bridge) { |
| if (mode == DRM_MODE_DPMS_ON) |
| bridge->funcs->enable(bridge); |
| else |
| bridge->funcs->post_disable(bridge); |
| } |
| } |
| |
| static int drm_helper_choose_crtc_dpms(struct drm_crtc *crtc) |
| { |
| int dpms = DRM_MODE_DPMS_OFF; |
| 914,7 → 857,7 |
|---|
| { |
| struct drm_encoder *encoder = connector->encoder; |
| struct drm_crtc *crtc = encoder ? encoder->crtc : NULL; |
| int old_dpms, encoder_dpms = DRM_MODE_DPMS_OFF; |
| int old_dpms; |
| |
| if (mode == connector->dpms) |
| return; |
| 922,9 → 865,6 |
|---|
| old_dpms = connector->dpms; |
| connector->dpms = mode; |
| |
| if (encoder) |
| encoder_dpms = drm_helper_choose_encoder_dpms(encoder); |
| |
| /* from off to on, do crtc then encoder */ |
| if (mode < old_dpms) { |
| if (crtc) { |
| 933,14 → 873,22 |
|---|
| (*crtc_funcs->dpms) (crtc, |
| drm_helper_choose_crtc_dpms(crtc)); |
| } |
| if (encoder) |
| drm_helper_encoder_dpms(encoder, encoder_dpms); |
| if (encoder) { |
| struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; |
| if (encoder_funcs->dpms) |
| (*encoder_funcs->dpms) (encoder, |
| drm_helper_choose_encoder_dpms(encoder)); |
| } |
| } |
| |
| /* from on to off, do encoder then crtc */ |
| if (mode > old_dpms) { |
| if (encoder) |
| drm_helper_encoder_dpms(encoder, encoder_dpms); |
| if (encoder) { |
| struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private; |
| if (encoder_funcs->dpms) |
| (*encoder_funcs->dpms) (encoder, |
| drm_helper_choose_encoder_dpms(encoder)); |
| } |
| if (crtc) { |
| struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; |
| if (crtc_funcs->dpms) |
| 976,8 → 924,9 |
|---|
| { |
| struct drm_crtc *crtc; |
| struct drm_encoder *encoder; |
| struct drm_encoder_helper_funcs *encoder_funcs; |
| struct drm_crtc_helper_funcs *crtc_funcs; |
| int ret, encoder_dpms; |
| int ret; |
| |
| list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |
| |
| 997,10 → 946,10 |
|---|
| if(encoder->crtc != crtc) |
| continue; |
| |
| encoder_dpms = drm_helper_choose_encoder_dpms( |
| encoder); |
| |
| drm_helper_encoder_dpms(encoder, encoder_dpms); |
| encoder_funcs = encoder->helper_private; |
| if (encoder_funcs->dpms) |
| (*encoder_funcs->dpms) (encoder, |
| drm_helper_choose_encoder_dpms(encoder)); |
| } |
| |
| crtc_funcs = crtc->helper_private; |