openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: simplify intel_crtc_prepare_encoders 

- We don't have the ->get_crtc callback.
- Call intel_encoder->disable directly.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter 2012-07-02 10:16:35 +02:00
parent a6778b3cfd
commit 821112aa41
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/drm/i915/intel_display.c
View File

@ -6635,32 +6635,15 @@ intel_crtc_helper_disable(struct drm_crtc *crtc)
return 0; return 0;
} }
static void
intel_encoder_disable_helper(struct drm_encoder *encoder)
{
struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
if (encoder_funcs->disable)
(*encoder_funcs->disable)(encoder);
else
(*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
}
static void static void
intel_crtc_prepare_encoders(struct drm_device *dev) intel_crtc_prepare_encoders(struct drm_device *dev)
{ {
struct drm_encoder_helper_funcs *encoder_funcs; struct intel_encoder *encoder;
struct drm_encoder *encoder;
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { list_for_each_entry(encoder, &dev->mode_config.encoder_list, base.head) {
encoder_funcs = encoder->helper_private;
/* Disable unused encoders */ /* Disable unused encoders */
if (encoder->crtc == NULL) if (encoder->base.crtc == NULL)
intel_encoder_disable_helper(encoder); encoder->disable(encoder);
/* Disable encoders whose CRTC is about to change */
if (encoder_funcs->get_crtc &&
encoder->crtc != (*encoder_funcs->get_crtc)(encoder))
intel_encoder_disable_helper(encoder);
} }
} }