Commit af5676f1 authored by Daniel Vetter's avatar Daniel Vetter

drm/i915: rip out helper->disable noop functions

Now that the driver is in control of whether it needs to disable
everything at take-over or not, we can rip this all out.
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 76a39dbf
...@@ -685,7 +685,6 @@ static void intel_crt_reset(struct drm_connector *connector) ...@@ -685,7 +685,6 @@ static void intel_crt_reset(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs crt_encoder_funcs = { static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
.mode_fixup = intel_crt_mode_fixup, .mode_fixup = intel_crt_mode_fixup,
.mode_set = intel_crt_mode_set, .mode_set = intel_crt_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_crt_connector_funcs = { static const struct drm_connector_funcs intel_crt_connector_funcs = {
......
...@@ -1481,7 +1481,6 @@ static const struct drm_encoder_funcs intel_ddi_funcs = { ...@@ -1481,7 +1481,6 @@ static const struct drm_encoder_funcs intel_ddi_funcs = {
static const struct drm_encoder_helper_funcs intel_ddi_helper_funcs = { static const struct drm_encoder_helper_funcs intel_ddi_helper_funcs = {
.mode_fixup = intel_ddi_mode_fixup, .mode_fixup = intel_ddi_mode_fixup,
.mode_set = intel_ddi_mode_set, .mode_set = intel_ddi_mode_set,
.disable = intel_encoder_noop,
}; };
void intel_ddi_init(struct drm_device *dev, enum port port) void intel_ddi_init(struct drm_device *dev, enum port port)
......
...@@ -3718,10 +3718,6 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc) ...@@ -3718,10 +3718,6 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
intel_crtc_update_sarea(crtc, enable); intel_crtc_update_sarea(crtc, enable);
} }
static void intel_crtc_noop(struct drm_crtc *crtc)
{
}
static void intel_crtc_disable(struct drm_crtc *crtc) static void intel_crtc_disable(struct drm_crtc *crtc)
{ {
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
...@@ -3770,10 +3766,6 @@ void intel_modeset_disable(struct drm_device *dev) ...@@ -3770,10 +3766,6 @@ void intel_modeset_disable(struct drm_device *dev)
} }
} }
void intel_encoder_noop(struct drm_encoder *encoder)
{
}
void intel_encoder_destroy(struct drm_encoder *encoder) void intel_encoder_destroy(struct drm_encoder *encoder)
{ {
struct intel_encoder *intel_encoder = to_intel_encoder(encoder); struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
...@@ -7277,7 +7269,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, ...@@ -7277,7 +7269,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
static struct drm_crtc_helper_funcs intel_helper_funcs = { static struct drm_crtc_helper_funcs intel_helper_funcs = {
.mode_set_base_atomic = intel_pipe_set_base_atomic, .mode_set_base_atomic = intel_pipe_set_base_atomic,
.load_lut = intel_crtc_load_lut, .load_lut = intel_crtc_load_lut,
.disable = intel_crtc_noop,
}; };
bool intel_encoder_check_is_cloned(struct intel_encoder *encoder) bool intel_encoder_check_is_cloned(struct intel_encoder *encoder)
......
...@@ -2561,7 +2561,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder) ...@@ -2561,7 +2561,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = { static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
.mode_fixup = intel_dp_mode_fixup, .mode_fixup = intel_dp_mode_fixup,
.mode_set = intel_dp_mode_set, .mode_set = intel_dp_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_dp_connector_funcs = { static const struct drm_connector_funcs intel_dp_connector_funcs = {
......
...@@ -521,7 +521,6 @@ extern void intel_modeset_disable(struct drm_device *dev); ...@@ -521,7 +521,6 @@ extern void intel_modeset_disable(struct drm_device *dev);
extern void intel_crtc_restore_mode(struct drm_crtc *crtc); extern void intel_crtc_restore_mode(struct drm_crtc *crtc);
extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_crtc_load_lut(struct drm_crtc *crtc);
extern void intel_crtc_update_dpms(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_destroy(struct drm_encoder *encoder); extern void intel_encoder_destroy(struct drm_encoder *encoder);
extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode); extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);
extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder); extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder);
......
...@@ -345,7 +345,6 @@ static void intel_dvo_destroy(struct drm_connector *connector) ...@@ -345,7 +345,6 @@ static void intel_dvo_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = { static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
.mode_fixup = intel_dvo_mode_fixup, .mode_fixup = intel_dvo_mode_fixup,
.mode_set = intel_dvo_mode_set, .mode_set = intel_dvo_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_dvo_connector_funcs = { static const struct drm_connector_funcs intel_dvo_connector_funcs = {
......
...@@ -258,9 +258,6 @@ void intel_fbdev_initial_config(struct drm_device *dev) ...@@ -258,9 +258,6 @@ void intel_fbdev_initial_config(struct drm_device *dev)
{ {
drm_i915_private_t *dev_priv = dev->dev_private; drm_i915_private_t *dev_priv = dev->dev_private;
/* disable all the possible outputs/crtcs before entering KMS mode */
drm_helper_disable_unused_functions(dev);
/* Due to peculiar init order wrt to hpd handling this is separate. */ /* Due to peculiar init order wrt to hpd handling this is separate. */
drm_fb_helper_initial_config(&dev_priv->fbdev->helper, 32); drm_fb_helper_initial_config(&dev_priv->fbdev->helper, 32);
} }
......
...@@ -972,7 +972,6 @@ static void intel_hdmi_destroy(struct drm_connector *connector) ...@@ -972,7 +972,6 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = { static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
.mode_fixup = intel_hdmi_mode_fixup, .mode_fixup = intel_hdmi_mode_fixup,
.mode_set = intel_hdmi_mode_set, .mode_set = intel_hdmi_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_hdmi_connector_funcs = { static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
......
...@@ -656,7 +656,6 @@ static int intel_lvds_set_property(struct drm_connector *connector, ...@@ -656,7 +656,6 @@ static int intel_lvds_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = { static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
.mode_fixup = intel_lvds_mode_fixup, .mode_fixup = intel_lvds_mode_fixup,
.mode_set = intel_lvds_mode_set, .mode_set = intel_lvds_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = { static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
......
...@@ -2043,7 +2043,6 @@ intel_sdvo_set_property(struct drm_connector *connector, ...@@ -2043,7 +2043,6 @@ intel_sdvo_set_property(struct drm_connector *connector,
static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = { static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
.mode_fixup = intel_sdvo_mode_fixup, .mode_fixup = intel_sdvo_mode_fixup,
.mode_set = intel_sdvo_mode_set, .mode_set = intel_sdvo_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_sdvo_connector_funcs = { static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
......
...@@ -1487,7 +1487,6 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop ...@@ -1487,7 +1487,6 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop
static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = { static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = {
.mode_fixup = intel_tv_mode_fixup, .mode_fixup = intel_tv_mode_fixup,
.mode_set = intel_tv_mode_set, .mode_set = intel_tv_mode_set,
.disable = intel_encoder_noop,
}; };
static const struct drm_connector_funcs intel_tv_connector_funcs = { static const struct drm_connector_funcs intel_tv_connector_funcs = {
......
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