[src/trunk]: src/sys/arch/arm catch up with newer drm_encoder_init prototype

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/84d07ae91788
branches:  trunk
changeset: 1028604:84d07ae91788
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:25:39 2021 +0000

description:
catch up with newer drm_encoder_init prototype


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/arch/arm/nxp/imx6_dwhdmi.c |   6 +++---
 sys/arch/arm/rockchip/rk_drm.c |  25 ++-----------------------
 sys/arch/arm/sunxi/sunxi_drm.c |  25 ++-----------------------
 3 files changed, 7 insertions(+), 49 deletions(-)

diffs (147 lines):

diff -r de2abdbf8fcc -r 84d07ae91788 sys/arch/arm/nxp/imx6_dwhdmi.c
--- a/sys/arch/arm/nxp/imx6_dwhdmi.c    Sun Dec 19 11:25:32 2021 +0000
+++ b/sys/arch/arm/nxp/imx6_dwhdmi.c    Sun Dec 19 11:25:39 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_dwhdmi.c,v 1.3 2021/12/19 11:25:32 riastradh Exp $ */
+/* $NetBSD: imx6_dwhdmi.c,v 1.4 2021/12/19 11:25:39 riastradh Exp $ */
 /*-
  * Copyright (c) 2020 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_dwhdmi.c,v 1.3 2021/12/19 11:25:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_dwhdmi.c,v 1.4 2021/12/19 11:25:39 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -161,7 +161,7 @@
 
        sc->sc_encoder.possible_crtcs = 3; // 1U << drm_crtc_index(crtc); /* XXX */
        drm_encoder_init(crtc->dev, &sc->sc_encoder, &imx6_dwhdmi_encoder_funcs,
-           DRM_MODE_ENCODER_TMDS);
+           DRM_MODE_ENCODER_TMDS, NULL);
        drm_encoder_helper_add(&sc->sc_encoder, &imx6_dwhdmi_encoder_helper_funcs);
 
        sc->sc_base.sc_connector.base.connector_type = DRM_MODE_CONNECTOR_HDMIA;
diff -r de2abdbf8fcc -r 84d07ae91788 sys/arch/arm/rockchip/rk_drm.c
--- a/sys/arch/arm/rockchip/rk_drm.c    Sun Dec 19 11:25:32 2021 +0000
+++ b/sys/arch/arm/rockchip/rk_drm.c    Sun Dec 19 11:25:39 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.10 2021/12/19 11:01:21 riastradh Exp $ */
+/* $NetBSD: rk_drm.c,v 1.11 2021/12/19 11:25:48 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.10 2021/12/19 11:01:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.11 2021/12/19 11:25:48 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -75,8 +75,6 @@
 static void    rk_drm_init(device_t);
 static vmem_t  *rk_drm_alloc_cma_pool(struct drm_device *, size_t);
 
-static int     rk_drm_set_busid(struct drm_device *, struct drm_master *);
-
 static uint32_t        rk_drm_get_vblank_counter(struct drm_device *, unsigned int);
 static int     rk_drm_enable_vblank(struct drm_device *, unsigned int);
 static void    rk_drm_disable_vblank(struct drm_device *, unsigned int);
@@ -107,8 +105,6 @@
        .major = DRIVER_MAJOR,
        .minor = DRIVER_MINOR,
        .patchlevel = DRIVER_PATCHLEVEL,
-
-       .set_busid = rk_drm_set_busid,
 };
 
 CFATTACH_DECL_NEW(rk_drm, sizeof(struct rk_drm_softc),
@@ -200,23 +196,6 @@
 }
 
 static int
-rk_drm_set_busid(struct drm_device *ddev, struct drm_master *master)
-{
-       struct rk_drm_softc * const sc = rk_drm_private(ddev);
-       char id[32];
-
-       snprintf(id, sizeof(id), "platform:rk:%u", device_unit(sc->sc_dev));
-
-       master->unique = kzalloc(strlen(id) + 1, GFP_KERNEL);
-       if (master->unique == NULL)
-               return -ENOMEM;
-       strcpy(master->unique, id);
-       master->unique_len = strlen(master->unique);
-
-       return 0;
-}
-
-static int
 rk_drm_fb_create_handle(struct drm_framebuffer *fb,
     struct drm_file *file, unsigned int *handle)
 {
diff -r de2abdbf8fcc -r 84d07ae91788 sys/arch/arm/sunxi/sunxi_drm.c
--- a/sys/arch/arm/sunxi/sunxi_drm.c    Sun Dec 19 11:25:32 2021 +0000
+++ b/sys/arch/arm/sunxi/sunxi_drm.c    Sun Dec 19 11:25:39 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.20 2021/12/19 11:25:17 riastradh Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.21 2021/12/19 11:25:48 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.20 2021/12/19 11:25:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.21 2021/12/19 11:25:48 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -84,8 +84,6 @@
 static void    sunxi_drm_init(device_t);
 static vmem_t  *sunxi_drm_alloc_cma_pool(struct drm_device *, size_t);
 
-static int     sunxi_drm_set_busid(struct drm_device *, struct drm_master *);
-
 static uint32_t        sunxi_drm_get_vblank_counter(struct drm_device *, unsigned int);
 static int     sunxi_drm_enable_vblank(struct drm_device *, unsigned int);
 static void    sunxi_drm_disable_vblank(struct drm_device *, unsigned int);
@@ -116,8 +114,6 @@
        .major = DRIVER_MAJOR,
        .minor = DRIVER_MINOR,
        .patchlevel = DRIVER_PATCHLEVEL,
-
-       .set_busid = sunxi_drm_set_busid,
 };
 
 CFATTACH_DECL_NEW(sunxi_drm, sizeof(struct sunxi_drm_softc),
@@ -209,23 +205,6 @@
 }
 
 static int
-sunxi_drm_set_busid(struct drm_device *ddev, struct drm_master *master)
-{
-       struct sunxi_drm_softc * const sc = sunxi_drm_private(ddev);
-       char id[32];
-
-       snprintf(id, sizeof(id), "platform:sunxi:%u", device_unit(sc->sc_dev));
-
-       master->unique = kzalloc(strlen(id) + 1, GFP_KERNEL);
-       if (master->unique == NULL)
-               return -ENOMEM;
-       strcpy(master->unique, id);
-       master->unique_len = strlen(master->unique);
-
-       return 0;
-}
-
-static int
 sunxi_drm_fb_create_handle(struct drm_framebuffer *fb,
     struct drm_file *file, unsigned int *handle)
 {