aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-20 17:28:14 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-02-13 18:07:54 -0500
commitaf5676f1f91585cabe811b8f697e32015e2be826 (patch)
tree41ea6bb741664c2185e6219400ff54b507002df4
parent76a39dbfb2d1bc45219839e5a95d4ceaf6ca114f (diff)
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: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat
-rw-r--r--drivers/gpu/drm/i915/intel_crt.c1
-rw-r--r--drivers/gpu/drm/i915/intel_ddi.c1
-rw-r--r--drivers/gpu/drm/i915/intel_display.c9
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c1
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h1
-rw-r--r--drivers/gpu/drm/i915/intel_dvo.c1
-rw-r--r--drivers/gpu/drm/i915/intel_fb.c3
-rw-r--r--drivers/gpu/drm/i915/intel_hdmi.c1
-rw-r--r--drivers/gpu/drm/i915/intel_lvds.c1
-rw-r--r--drivers/gpu/drm/i915/intel_sdvo.c1
-rw-r--r--drivers/gpu/drm/i915/intel_tv.c1
11 files changed, 0 insertions, 21 deletions
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 68e79f32e100..729dd1a3fe72 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -685,7 +685,6 @@ static void intel_crt_reset(struct drm_connector *connector)
685static const struct drm_encoder_helper_funcs crt_encoder_funcs = { 685static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
686 .mode_fixup = intel_crt_mode_fixup, 686 .mode_fixup = intel_crt_mode_fixup,
687 .mode_set = intel_crt_mode_set, 687 .mode_set = intel_crt_mode_set,
688 .disable = intel_encoder_noop,
689}; 688};
690 689
691static const struct drm_connector_funcs intel_crt_connector_funcs = { 690static const struct drm_connector_funcs intel_crt_connector_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index cedf4ab5ff16..a259e09eb6a8 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1481,7 +1481,6 @@ static const struct drm_encoder_funcs intel_ddi_funcs = {
1481static const struct drm_encoder_helper_funcs intel_ddi_helper_funcs = { 1481static const struct drm_encoder_helper_funcs intel_ddi_helper_funcs = {
1482 .mode_fixup = intel_ddi_mode_fixup, 1482 .mode_fixup = intel_ddi_mode_fixup,
1483 .mode_set = intel_ddi_mode_set, 1483 .mode_set = intel_ddi_mode_set,
1484 .disable = intel_encoder_noop,
1485}; 1484};
1486 1485
1487void intel_ddi_init(struct drm_device *dev, enum port port) 1486void intel_ddi_init(struct drm_device *dev, enum port port)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0dfecaf599ff..24f2654338d2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3718,10 +3718,6 @@ void intel_crtc_update_dpms(struct drm_crtc *crtc)
3718 intel_crtc_update_sarea(crtc, enable); 3718 intel_crtc_update_sarea(crtc, enable);
3719} 3719}
3720 3720
3721static void intel_crtc_noop(struct drm_crtc *crtc)
3722{
3723}
3724
3725static void intel_crtc_disable(struct drm_crtc *crtc) 3721static void intel_crtc_disable(struct drm_crtc *crtc)
3726{ 3722{
3727 struct drm_device *dev = crtc->dev; 3723 struct drm_device *dev = crtc->dev;
@@ -3770,10 +3766,6 @@ void intel_modeset_disable(struct drm_device *dev)
3770 } 3766 }
3771} 3767}
3772 3768
3773void intel_encoder_noop(struct drm_encoder *encoder)
3774{
3775}
3776
3777void intel_encoder_destroy(struct drm_encoder *encoder) 3769void intel_encoder_destroy(struct drm_encoder *encoder)
3778{ 3770{
3779 struct intel_encoder *intel_encoder = to_intel_encoder(encoder); 3771 struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
@@ -7277,7 +7269,6 @@ free_work:
7277static struct drm_crtc_helper_funcs intel_helper_funcs = { 7269static struct drm_crtc_helper_funcs intel_helper_funcs = {
7278 .mode_set_base_atomic = intel_pipe_set_base_atomic, 7270 .mode_set_base_atomic = intel_pipe_set_base_atomic,
7279 .load_lut = intel_crtc_load_lut, 7271 .load_lut = intel_crtc_load_lut,
7280 .disable = intel_crtc_noop,
7281}; 7272};
7282 7273
7283bool intel_encoder_check_is_cloned(struct intel_encoder *encoder) 7274bool intel_encoder_check_is_cloned(struct intel_encoder *encoder)
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 56e408b2e3c8..13c1536a8bb2 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2561,7 +2561,6 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder)
2561static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = { 2561static const struct drm_encoder_helper_funcs intel_dp_helper_funcs = {
2562 .mode_fixup = intel_dp_mode_fixup, 2562 .mode_fixup = intel_dp_mode_fixup,
2563 .mode_set = intel_dp_mode_set, 2563 .mode_set = intel_dp_mode_set,
2564 .disable = intel_encoder_noop,
2565}; 2564};
2566 2565
2567static const struct drm_connector_funcs intel_dp_connector_funcs = { 2566static const struct drm_connector_funcs intel_dp_connector_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 13afb37d8dec..a2ec01c49f40 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -521,7 +521,6 @@ extern void intel_modeset_disable(struct drm_device *dev);
521extern void intel_crtc_restore_mode(struct drm_crtc *crtc); 521extern void intel_crtc_restore_mode(struct drm_crtc *crtc);
522extern void intel_crtc_load_lut(struct drm_crtc *crtc); 522extern void intel_crtc_load_lut(struct drm_crtc *crtc);
523extern void intel_crtc_update_dpms(struct drm_crtc *crtc); 523extern void intel_crtc_update_dpms(struct drm_crtc *crtc);
524extern void intel_encoder_noop(struct drm_encoder *encoder);
525extern void intel_encoder_destroy(struct drm_encoder *encoder); 524extern void intel_encoder_destroy(struct drm_encoder *encoder);
526extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode); 525extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode);
527extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder); 526extern bool intel_encoder_check_is_cloned(struct intel_encoder *encoder);
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 15da99533e5b..00e70dbe82da 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -345,7 +345,6 @@ static void intel_dvo_destroy(struct drm_connector *connector)
345static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = { 345static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
346 .mode_fixup = intel_dvo_mode_fixup, 346 .mode_fixup = intel_dvo_mode_fixup,
347 .mode_set = intel_dvo_mode_set, 347 .mode_set = intel_dvo_mode_set,
348 .disable = intel_encoder_noop,
349}; 348};
350 349
351static const struct drm_connector_funcs intel_dvo_connector_funcs = { 350static const struct drm_connector_funcs intel_dvo_connector_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index e67061249934..1c510da04d16 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -258,9 +258,6 @@ void intel_fbdev_initial_config(struct drm_device *dev)
258{ 258{
259 drm_i915_private_t *dev_priv = dev->dev_private; 259 drm_i915_private_t *dev_priv = dev->dev_private;
260 260
261 /* disable all the possible outputs/crtcs before entering KMS mode */
262 drm_helper_disable_unused_functions(dev);
263
264 /* Due to peculiar init order wrt to hpd handling this is separate. */ 261 /* Due to peculiar init order wrt to hpd handling this is separate. */
265 drm_fb_helper_initial_config(&dev_priv->fbdev->helper, 32); 262 drm_fb_helper_initial_config(&dev_priv->fbdev->helper, 32);
266} 263}
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 5b4efd64c2f9..3883bed80faa 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -972,7 +972,6 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
972static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = { 972static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
973 .mode_fixup = intel_hdmi_mode_fixup, 973 .mode_fixup = intel_hdmi_mode_fixup,
974 .mode_set = intel_hdmi_mode_set, 974 .mode_set = intel_hdmi_mode_set,
975 .disable = intel_encoder_noop,
976}; 975};
977 976
978static const struct drm_connector_funcs intel_hdmi_connector_funcs = { 977static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 5e3f08e3fd8b..feb43fd7debf 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -656,7 +656,6 @@ static int intel_lvds_set_property(struct drm_connector *connector,
656static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = { 656static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
657 .mode_fixup = intel_lvds_mode_fixup, 657 .mode_fixup = intel_lvds_mode_fixup,
658 .mode_set = intel_lvds_mode_set, 658 .mode_set = intel_lvds_mode_set,
659 .disable = intel_encoder_noop,
660}; 659};
661 660
662static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = { 661static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index f01063a2323a..33b46d9694ea 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -2043,7 +2043,6 @@ done:
2043static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = { 2043static const struct drm_encoder_helper_funcs intel_sdvo_helper_funcs = {
2044 .mode_fixup = intel_sdvo_mode_fixup, 2044 .mode_fixup = intel_sdvo_mode_fixup,
2045 .mode_set = intel_sdvo_mode_set, 2045 .mode_set = intel_sdvo_mode_set,
2046 .disable = intel_encoder_noop,
2047}; 2046};
2048 2047
2049static const struct drm_connector_funcs intel_sdvo_connector_funcs = { 2048static const struct drm_connector_funcs intel_sdvo_connector_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 984a113c5d13..d808421c1c80 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1487,7 +1487,6 @@ out:
1487static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = { 1487static const struct drm_encoder_helper_funcs intel_tv_helper_funcs = {
1488 .mode_fixup = intel_tv_mode_fixup, 1488 .mode_fixup = intel_tv_mode_fixup,
1489 .mode_set = intel_tv_mode_set, 1489 .mode_set = intel_tv_mode_set,
1490 .disable = intel_encoder_noop,
1491}; 1490};
1492 1491
1493static const struct drm_connector_funcs intel_tv_connector_funcs = { 1492static const struct drm_connector_funcs intel_tv_connector_funcs = {
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-26 20:52:37 -0400