UBUNTU: SAUCE: i915_bpo: Revert passing plane/encoder name

BugLink: http://bugs.launchpad.net/bugs/1540390
Revert ubuntu/i915 modifications from commits:

commit 13a3d91f17a5f7ed2acd275d18b6acfdb131fb15
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Dec 9 16:20:18 2015 +0200

    drm: Pass 'name' to drm_encoder_init()

commit b0b3b7951114315d65398c27648705ca1c322faa
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Dec 9 16:19:55 2015 +0200

    drm: Pass 'name' to drm_universal_plane_init()

commit f98828769c8838f526703ef180b3088a714af2f9
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date:   Wed Dec 9 16:19:31 2015 +0200

    drm: Pass 'name' to drm_crtc_init_with_planes()

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/ubuntu/i915/intel_crt.c b/ubuntu/i915/intel_crt.c
index ad5dfabc452ec6be29f012ed6d3a7ad8818dbf0a..f37ecb7f99aa89c06a5c3f7bb8018348a35ab4cf 100644 (file)
--- a/ubuntu/i915/intel_crt.c
+++ b/ubuntu/i915/intel_crt.c
@@ -828,7 +828,7 @@ void intel_crt_init(struct drm_device *dev)
                           &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
 
        drm_encoder_init(dev, &crt->base.base, &intel_crt_enc_funcs,
-                        DRM_MODE_ENCODER_DAC, NULL);
+                        DRM_MODE_ENCODER_DAC);
 
        intel_connector_attach_encoder(intel_connector, &crt->base);
 

diff --git a/ubuntu/i915/intel_ddi.c b/ubuntu/i915/intel_ddi.c
index cdf2e14aa45daf46f5215732e41ec5c205c4ab3a..4a75166df72715f939be340c1aa7cbf483ccf202 100644 (file)
--- a/ubuntu/i915/intel_ddi.c
+++ b/ubuntu/i915/intel_ddi.c
@@ -3269,7 +3269,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port)
        encoder = &intel_encoder->base;
 
        drm_encoder_init(dev, encoder, &intel_ddi_funcs,
-                        DRM_MODE_ENCODER_TMDS, NULL);
+                        DRM_MODE_ENCODER_TMDS);
 
        intel_encoder->compute_config = intel_ddi_compute_config;
        intel_encoder->enable = intel_enable_ddi;

diff --git a/ubuntu/i915/intel_display.c b/ubuntu/i915/intel_display.c
index 836bbdc239b67c9caf53f11094e10883159a461b..eb8c51e4366f7f9f6705a710d787a81b3f2a20a8 100644 (file)
--- a/ubuntu/i915/intel_display.c
+++ b/ubuntu/i915/intel_display.c
@@ -14065,7 +14065,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
        drm_universal_plane_init(dev, &primary->base, 0,
                                 &intel_plane_funcs,
                                 intel_primary_formats, num_formats,
-                                DRM_PLANE_TYPE_PRIMARY, NULL);
+                                DRM_PLANE_TYPE_PRIMARY);
 
        if (INTEL_INFO(dev)->gen >= 4)
                intel_create_rotation_property(dev, primary);
@@ -14216,7 +14216,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
                                 &intel_plane_funcs,
                                 intel_cursor_formats,
                                 ARRAY_SIZE(intel_cursor_formats),
-                                DRM_PLANE_TYPE_CURSOR, NULL);
+                                DRM_PLANE_TYPE_CURSOR);
 
        if (INTEL_INFO(dev)->gen >= 4) {
                if (!dev->mode_config.rotation_property)
@@ -14293,7 +14293,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe)
                goto fail;
 
        ret = drm_crtc_init_with_planes(dev, &intel_crtc->base, primary,
-                                       cursor, &intel_crtc_funcs, NULL);
+                                       cursor, &intel_crtc_funcs);
        if (ret)
                goto fail;
 

diff --git a/ubuntu/i915/intel_dp.c b/ubuntu/i915/intel_dp.c
index 388ee02c5efddf3f430d5489a8d0ad4879f31dfa..022ab30fec59a9133a918a70e0f15ea2cf33bcb2 100644 (file)
--- a/ubuntu/i915/intel_dp.c
+++ b/ubuntu/i915/intel_dp.c
@@ -6020,7 +6020,7 @@ intel_dp_init(struct drm_device *dev,
        encoder = &intel_encoder->base;
 
        if (drm_encoder_init(dev, &intel_encoder->base, &intel_dp_enc_funcs,
-                            DRM_MODE_ENCODER_TMDS, NULL))
+                            DRM_MODE_ENCODER_TMDS))
                goto err_encoder_init;
 
        intel_encoder->compute_config = intel_dp_compute_config;

diff --git a/ubuntu/i915/intel_dp_mst.c b/ubuntu/i915/intel_dp_mst.c
index a2bd698fe2f78f801813c99b097d7576e2f0c869..44c6d21b566f9dd5ecc19a82183391f892ecb351 100644 (file)
--- a/ubuntu/i915/intel_dp_mst.c
+++ b/ubuntu/i915/intel_dp_mst.c
@@ -565,7 +565,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum
        intel_mst->primary = intel_dig_port;
 
        drm_encoder_init(dev, &intel_encoder->base, &intel_dp_mst_enc_funcs,
-                        DRM_MODE_ENCODER_DPMST, NULL);
+                        DRM_MODE_ENCODER_DPMST);
 
        intel_encoder->type = INTEL_OUTPUT_DP_MST;
        intel_encoder->crtc_mask = 0x7;

diff --git a/ubuntu/i915/intel_dsi.c b/ubuntu/i915/intel_dsi.c
index 378f879f40153439eba54569f7c66866240fd421..b4009517757f83635adfb9efbffcefc54adeb6d6 100644 (file)
--- a/ubuntu/i915/intel_dsi.c
+++ b/ubuntu/i915/intel_dsi.c
@@ -1138,8 +1138,7 @@ void intel_dsi_init(struct drm_device *dev)
 
        connector = &intel_connector->base;
 
-       drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI,
-                        NULL);
+       drm_encoder_init(dev, encoder, &intel_dsi_funcs, DRM_MODE_ENCODER_DSI);
 
        intel_encoder->compute_config = intel_dsi_compute_config;
        intel_encoder->pre_enable = intel_dsi_pre_enable;

diff --git a/ubuntu/i915/intel_dvo.c b/ubuntu/i915/intel_dvo.c
index 286baec979c84098321cf9039729f96480400fa0..7161deb2aed8b39bc1e5f0029f07ea45bafc0d48 100644 (file)
--- a/ubuntu/i915/intel_dvo.c
+++ b/ubuntu/i915/intel_dvo.c
@@ -429,7 +429,7 @@ void intel_dvo_init(struct drm_device *dev)
 
        intel_encoder = &intel_dvo->base;
        drm_encoder_init(dev, &intel_encoder->base,
-                        &intel_dvo_enc_funcs, encoder_type, NULL);
+                        &intel_dvo_enc_funcs, encoder_type);
 
        intel_encoder->disable = intel_disable_dvo;
        intel_encoder->enable = intel_enable_dvo;

diff --git a/ubuntu/i915/intel_hdmi.c b/ubuntu/i915/intel_hdmi.c
index edb7e901ba4abfb809f363cf1351505002fc05e4..1d0f3e95ca3aa48b78776090392015274b2aea5a 100755 (executable)
--- a/ubuntu/i915/intel_hdmi.c
+++ b/ubuntu/i915/intel_hdmi.c
@@ -2177,7 +2177,7 @@ void intel_hdmi_init(struct drm_device *dev,
        intel_encoder = &intel_dig_port->base;
 
        drm_encoder_init(dev, &intel_encoder->base, &intel_hdmi_enc_funcs,
-                        DRM_MODE_ENCODER_TMDS, NULL);
+                        DRM_MODE_ENCODER_TMDS);
 
        intel_encoder->compute_config = intel_hdmi_compute_config;
        if (HAS_PCH_SPLIT(dev)) {

diff --git a/ubuntu/i915/intel_lvds.c b/ubuntu/i915/intel_lvds.c
index 811ddf7799f0c0f381ac650f64b166c2a17c812a..ff907af400f3a4be10c6bcdd3ec38f5850890706 100644 (file)
--- a/ubuntu/i915/intel_lvds.c
+++ b/ubuntu/i915/intel_lvds.c
@@ -1026,7 +1026,7 @@ void intel_lvds_init(struct drm_device *dev)
                           DRM_MODE_CONNECTOR_LVDS);
 
        drm_encoder_init(dev, &intel_encoder->base, &intel_lvds_enc_funcs,
-                        DRM_MODE_ENCODER_LVDS, NULL);
+                        DRM_MODE_ENCODER_LVDS);
 
        intel_encoder->enable = intel_enable_lvds;
        intel_encoder->pre_enable = intel_pre_enable_lvds;

diff --git a/ubuntu/i915/intel_sdvo.c b/ubuntu/i915/intel_sdvo.c
index 4ecc076c40417c668e7ded7c7b51cfadac4104d7..73e8778603016ade4fca303568c5c526c32e0fce 100644 (file)
--- a/ubuntu/i915/intel_sdvo.c
+++ b/ubuntu/i915/intel_sdvo.c
@@ -2982,8 +2982,7 @@ bool intel_sdvo_init(struct drm_device *dev,
        /* encoder type will be decided later */
        intel_encoder = &intel_sdvo->base;
        intel_encoder->type = INTEL_OUTPUT_SDVO;
-       drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0,
-                        NULL);
+       drm_encoder_init(dev, &intel_encoder->base, &intel_sdvo_enc_funcs, 0);
 
        /* Read the regs to test if we can talk to the device */
        for (i = 0; i < 0x40; i++) {

diff --git a/ubuntu/i915/intel_sprite.c b/ubuntu/i915/intel_sprite.c
index a2582c455b3623a13e32bc32ac49b5b5c0bf6149..87b97070a1ac773b0a55ed77510a7dbb86ddf4b9 100644 (file)
--- a/ubuntu/i915/intel_sprite.c
+++ b/ubuntu/i915/intel_sprite.c
@@ -1110,7 +1110,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
        ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
                                       &intel_plane_funcs,
                                       plane_formats, num_plane_formats,
-                                      DRM_PLANE_TYPE_OVERLAY, NULL);
+                                      DRM_PLANE_TYPE_OVERLAY);
        if (ret) {
                kfree(intel_plane);
                goto out;

diff --git a/ubuntu/i915/intel_tv.c b/ubuntu/i915/intel_tv.c
index d21f75bda96e0aa173ff077d6335286845c556a3..7d5552efafe7f96c91a09f289ad1b3a411b5bc60 100644 (file)
--- a/ubuntu/i915/intel_tv.c
+++ b/ubuntu/i915/intel_tv.c
@@ -1650,7 +1650,7 @@ intel_tv_init(struct drm_device *dev)
                           DRM_MODE_CONNECTOR_SVIDEO);
 
        drm_encoder_init(dev, &intel_encoder->base, &intel_tv_enc_funcs,
-                        DRM_MODE_ENCODER_TVDAC, NULL);
+                        DRM_MODE_ENCODER_TVDAC);
 
        intel_encoder->compute_config = intel_tv_compute_config;
        intel_encoder->get_config = intel_tv_get_config;