diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-04-24 17:54:37 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-05 04:56:55 -0400 |
commit | 0d56bf0b65e6930ea00060d4107414b8d74c9055 (patch) | |
tree | e90dfb3b55642c9b44dfe8684f68ed45641307d7 | |
parent | 98ec77397a5c68ce753dc283aaa6f4742328bcdd (diff) |
drm/i915: Make encoder->mode_set callbacks optional
For a bunch of reasons we want to move away from the ->mode_set
callbacks: All hw state setup needs to move into ->enable hooks (so
that DOMS can do runtime pm) and all the configuration setup needs to
move into the compute_config functions.
To start with this make the enocer->mode_set callback optional.
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4dbbda2970d4..d3e72639a449 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -7210,7 +7210,9 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, | |||
7210 | encoder->base.base.id, | 7210 | encoder->base.base.id, |
7211 | drm_get_encoder_name(&encoder->base), | 7211 | drm_get_encoder_name(&encoder->base), |
7212 | mode->base.id, mode->name); | 7212 | mode->base.id, mode->name); |
7213 | encoder->mode_set(encoder); | 7213 | |
7214 | if (encoder->mode_set) | ||
7215 | encoder->mode_set(encoder); | ||
7214 | } | 7216 | } |
7215 | 7217 | ||
7216 | return 0; | 7218 | return 0; |