From 804fcafaaa5ef046d7daa5e46c651a6a032c3e38 Mon Sep 17 00:00:00 2001 From: jsg Date: Sun, 10 Sep 2023 06:25:09 +0000 Subject: [PATCH] don't error on WSDISPLAYIO_SVIDEO/WSDISPLAYIO_GVIDEO in drm drivers it is handled by wsdisplay(4) ok dlg@ --- sys/dev/fdt/rkdrm.c | 5 ++++- sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c | 3 +++ sys/dev/pci/drm/i915/i915_driver.c | 3 +++ sys/dev/pci/drm/radeon/radeon_drv.c | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/fdt/rkdrm.c b/sys/dev/fdt/rkdrm.c index ff88bfb908a..824ce12450d 100644 --- a/sys/dev/fdt/rkdrm.c +++ b/sys/dev/fdt/rkdrm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkdrm.c,v 1.15 2023/01/01 01:34:33 jsg Exp $ */ +/* $OpenBSD: rkdrm.c,v 1.16 2023/09/10 06:25:09 jsg Exp $ */ /* $NetBSD: rk_drm.c,v 1.3 2019/12/15 01:00:58 mrg Exp $ */ /*- * Copyright (c) 2019 Jared D. McNeill @@ -283,6 +283,9 @@ rkdrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) case WSDISPLAYIO_LINEBYTES: *(u_int *)data = ri->ri_stride; return 0; + case WSDISPLAYIO_SVIDEO: + case WSDISPLAYIO_GVIDEO: + return 0; } return (-1); diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c index 1e2c32dd8e2..57144ac7b6b 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c @@ -3349,6 +3349,9 @@ amdgpu_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) return 0; } break; + case WSDISPLAYIO_SVIDEO: + case WSDISPLAYIO_GVIDEO: + return 0; } return (-1); diff --git a/sys/dev/pci/drm/i915/i915_driver.c b/sys/dev/pci/drm/i915/i915_driver.c index 28c3770a621..4585d2324a7 100644 --- a/sys/dev/pci/drm/i915/i915_driver.c +++ b/sys/dev/pci/drm/i915/i915_driver.c @@ -2256,6 +2256,9 @@ inteldrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) return 0; } break; + case WSDISPLAYIO_SVIDEO: + case WSDISPLAYIO_GVIDEO: + return 0; } return (-1); diff --git a/sys/dev/pci/drm/radeon/radeon_drv.c b/sys/dev/pci/drm/radeon/radeon_drv.c index 8d3e97f1ef5..dd14e790e34 100644 --- a/sys/dev/pci/drm/radeon/radeon_drv.c +++ b/sys/dev/pci/drm/radeon/radeon_drv.c @@ -843,6 +843,9 @@ radeondrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) if (ws_set_param == NULL) return 0; return ws_set_param(dp); + case WSDISPLAYIO_SVIDEO: + case WSDISPLAYIO_GVIDEO: + return 0; default: return -1; } -- 2.20.1