korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-19 00:54:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: rip out encoder->prepare/commit

Browse Source 
With the new infrastructure we're doing this when enabling/disabling
the entire display pipe.

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:21:35 +02:00
parent 821112aa41
commit c9deac9776
9 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_crt.c
View File

@ -617,8 +617,6 @@ static void intel_crt_reset(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
.mode_fixup = intel_crt_mode_fixup,
.prepare = intel_encoder_noop,
.commit = intel_encoder_noop,
.mode_set = intel_crt_mode_set,
.disable = intel_encoder_disable,
};

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

@ -3527,10 +3527,6 @@ static void intel_crtc_disable(struct drm_crtc *crtc)
}
}
void intel_encoder_noop(struct drm_encoder *encoder)
{
}
void intel_encoder_disable(struct drm_encoder *encoder)
{
struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
@ -6701,16 +6697,6 @@ bool intel_set_mode(struct drm_crtc *crtc,
}
DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
/* Prepare the encoders and CRTCs before setting the mode. */
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (encoder->crtc != crtc)
continue;
encoder_funcs = encoder->helper_private;
/* Disable the encoders as the first thing we do. */
encoder_funcs->prepare(encoder);
}
intel_crtc_prepare_encoders(dev);
crtc_funcs->prepare(crtc);
@ -6737,16 +6723,6 @@ bool intel_set_mode(struct drm_crtc *crtc,
/* Now enable the clocks, plane, pipe, and connectors that we set up. */
crtc_funcs->commit(crtc);
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
if (encoder->crtc != crtc)
continue;
encoder_funcs = encoder->helper_private;
encoder_funcs->commit(encoder);
}
/* Store real post-adjustment hardware mode. */
crtc->hwmode = *adjusted_mode;

2
drivers/gpu/drm/i915/intel_dp.c
View File

@ -2348,9 +2348,7 @@ static void intel_dp_encoder_destroy(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
.mode_fixup = intel_dp_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_dp_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable,
};

1
drivers/gpu/drm/i915/intel_drv.h
View File

@ -414,7 +414,6 @@ extern bool intel_set_mode(struct drm_crtc *crtc, struct drm_display_mode *mode,
int x, int y, struct drm_framebuffer *old_fb);
extern void intel_crtc_load_lut(struct drm_crtc *crtc);
extern void intel_crtc_update_dpms(struct drm_crtc *crtc);
extern void intel_encoder_noop(struct drm_encoder *encoder);
extern void intel_encoder_disable(struct drm_encoder *encoder);
extern void intel_encoder_destroy(struct drm_encoder *encoder);
extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);

2
drivers/gpu/drm/i915/intel_dvo.c
View File

@ -318,9 +318,7 @@ static void intel_dvo_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
.mode_fixup = intel_dvo_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_dvo_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable,
};

4
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -885,17 +885,13 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs_hsw = {
.mode_fixup = intel_hdmi_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_ddi_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable,
};
static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
.mode_fixup = intel_hdmi_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_hdmi_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable,
};

2
drivers/gpu/drm/i915/intel_lvds.c
View File

@ -570,9 +570,7 @@ static int intel_lvds_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
.mode_fixup = intel_lvds_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_lvds_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable,
};

2
drivers/gpu/drm/i915/intel_sdvo.c
View File

@ -1889,9 +1889,7 @@ done:
static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
.mode_fixup = intel_sdvo_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_sdvo_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable
};

2
drivers/gpu/drm/i915/intel_tv.c
View File

@ -1479,9 +1479,7 @@ out:
static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = {
.mode_fixup = intel_tv_mode_fixup,
.prepare = intel_encoder_noop,
.mode_set = intel_tv_mode_set,
.commit = intel_encoder_noop,
.disable = intel_encoder_disable,
};