Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:25:48 UTC 2021
Modified Files:
src/sys/arch/arm/rockchip: rk_drm.c
src/sys/arch/arm/sunxi: sunxi_drm.c
Log Message:
catch up with newer drm_encoder_init prototype
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rk_drm.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/sunxi/sunxi_drm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_drm.c
diff -u src/sys/arch/arm/rockchip/rk_drm.c:1.10 src/sys/arch/arm/rockchip/rk_drm.c:1.11
--- src/sys/arch/arm/rockchip/rk_drm.c:1.10 Sun Dec 19 11:01:21 2021
+++ src/sys/arch/arm/rockchip/rk_drm.c Sun Dec 19 11:25:48 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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_attach(device_t, devi
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 @@ static struct drm_driver rk_drm_driver =
.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 @@ rk_drm_alloc_cma_pool(struct drm_device
}
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)
{
Index: src/sys/arch/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.20 src/sys/arch/arm/sunxi/sunxi_drm.c:1.21
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.20 Sun Dec 19 11:25:17 2021
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Sun Dec 19 11:25:48 2021
@@ -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 <jmcne...@invisible.ca>
@@ -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_attach(device_t, d
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 @@ static struct drm_driver sunxi_drm_drive
.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 @@ sunxi_drm_alloc_cma_pool(struct drm_devi
}
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)
{
