drm: Nuke drm_atomic_helper_plane_set_property

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / sti / sti_gdp.c

diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
index 88f16cdf6a4bcee03adc0c1145eaae317eb7d2ef..b65eea4f2c973ea9b416ac275a08f00cf3496cda 100644 (file)
--- a/drivers/gpu/drm/sti/sti_gdp.c
+++ b/drivers/gpu/drm/sti/sti_gdp.c
@@ -149,7 +149,7 @@ static void gdp_dbg_ctl(struct seq_file *s, int val)
        seq_puts(s, "\tColor:");
        for (i = 0; i < ARRAY_SIZE(gdp_format_to_str); i++) {
                if (gdp_format_to_str[i].format == (val & 0x1F)) {
-                       seq_printf(s, gdp_format_to_str[i].name);
+                       seq_puts(s, gdp_format_to_str[i].name);
                        break;
                }
        }
@@ -266,8 +266,7 @@ static void gdp_node_dump_node(struct seq_file *s, struct sti_gdp_node *node)
        seq_printf(s, "\n\tKEY2 0x%08X", node->gam_gdp_key2);
        seq_printf(s, "\n\tPPT  0x%08X", node->gam_gdp_ppt);
        gdp_dbg_ppt(s, node->gam_gdp_ppt);
-       seq_printf(s, "\n\tCML  0x%08X", node->gam_gdp_cml);
-       seq_puts(s, "\n");
+       seq_printf(s, "\n\tCML  0x%08X\n", node->gam_gdp_cml);
 }
 
 static int gdp_node_dbg_show(struct seq_file *s, void *arg)
@@ -896,7 +895,6 @@ static const struct drm_plane_funcs sti_gdp_plane_helpers_funcs = {
        .update_plane = drm_atomic_helper_update_plane,
        .disable_plane = drm_atomic_helper_disable_plane,
        .destroy = sti_gdp_destroy,
-       .set_property = drm_atomic_helper_plane_set_property,
        .reset = sti_plane_reset,
        .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
        .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
@@ -932,7 +930,7 @@ struct drm_plane *sti_gdp_create(struct drm_device *drm_dev,
                                       &sti_gdp_plane_helpers_funcs,
                                       gdp_supported_formats,
                                       ARRAY_SIZE(gdp_supported_formats),
-                                      type, NULL);
+                                      NULL, type, NULL);
        if (res) {
                DRM_ERROR("Failed to initialize universal plane\n");
                goto err;