From nobody Thu Feb 16 11:56:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PHYLv54wJz3q5Zj; Thu, 16 Feb 2023 11:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHYLv22ZKz49qd; Thu, 16 Feb 2023 11:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X4cRXHv4gF1AGu5TR0CIxqPmhfKxsLeM0nOS2BF3GJc=; b=v8W+hLlSOXEALX9JYv5XuV9kxy0d36138xGwyXxm655Wd0WIXXfzWf8790sn5AeJap1nWW 1qH/RFp1DfvUphKAgrIshAI97ACgJc+/4LO/VAsSXW6X8DzB/9EwkqBIzlbys8q3kq7mWt LoWC8rIkwymCV//piv7WQhK6Nb3beCbZFqF13MzMcAOYvUNSJ+U/TQBqVpAYCPAhrK3p0U 5gL60ZXcl8UHs29smDRysC7O/xUDTzS+OoaQ7IAk/W5NW/0e5Ziz1SdvZ1moOLfpivFrrV YGe4nTZ/mGApHywpNigzBmoHl0S9CRveinlR4G/p7GnloVRRUaAobBCJgq4/KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X4cRXHv4gF1AGu5TR0CIxqPmhfKxsLeM0nOS2BF3GJc=; b=pcs7hc0+uE5xw5SeH82ohubc+FObP3fGXcHNeZs0wuAryK/kWdIjmmIkbKXpfOX+Dw6BFC FZebHgKHFO6nuztLP5lba/qZNyMPpuvHv9oAuYvQxmxRL6rwYOUzApTEYs3QG+lR73oqSI UMIN32vcC1dNYf+h+Zv5pCPMlH3bz+chbLkF8AGoKY2txM6iLSliElvUd+4k44LPWy3Ct6 VMfZQMqY3ncqok9jYkAVmFw4UJISikgDhVW3pc9kQj6Y+Qg8MSSXSytqY8IV6h+jOmL0+f cxvblk9nd92To5JP+GzRNwOVLEH+U60RCXp5WVg40D/fJtkZwkDCwvZXFhDMqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548583; a=rsa-sha256; cv=none; b=TsxQsZzPpdnhvygHNvND8FPkLv8kaqDEgP2VFGNoaHw26mB96WLgqkx6jHjhVj0BBJySsO CzD2CWLZAXIwAmzrTGFc2rXx0b11oxh5pjcswhhma2/6Dzhjdk6nOwlTnt2ucBSBl5JoF1 XhszwtR79gBWiHrvbUrykx0zJvrtdkpt2gR5zTaJU/cOo2lHI5vh/CGaticshUdHAJpmtp zaT0CqkLL19Oznqe1pKJ8dLgBqR8HSsYVElzcbvnowbKU0q+fTaaAwI/5a+/mV+gck7oI1 6vu9hrGZHt2s9Aoy3/MsXJHIxvSADeFtpPS9QSHRv5uUNRDCWgxQoJp3/mq1wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PHYLt6ttNz137h; Thu, 16 Feb 2023 11:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31GBuMGP056048; Thu, 16 Feb 2023 11:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBuM0M056047; Thu, 16 Feb 2023 11:56:22 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:22 GMT Message-Id: <202302161156.31GBuM0M056047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: d94ab63c1102 - stable/13 - linuxkpi: Update `vga_client_register()` and add `vga_client_unregister()` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d94ab63c110262283277f3522d190eeea5006089 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=d94ab63c110262283277f3522d190eeea5006089 commit d94ab63c110262283277f3522d190eeea5006089 Author: Jean-Sébastien Pédron AuthorDate: 2023-02-08 17:53:57 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:18 +0000 linuxkpi: Update `vga_client_register()` and add `vga_client_unregister()` For `vga_client_register()`, the API is modified twice in a row. To keep the API compatible with all commits in the DRM driver, we introduce two `LINUXKPI_VERSION` version bumps. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38533 (cherry picked from commit 1c6d8146fdec8267712615c261bf6c8800f8ecfe) --- sys/compat/linuxkpi/common/include/linux/vgaarb.h | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/vgaarb.h b/sys/compat/linuxkpi/common/include/linux/vgaarb.h index 853927f1c049..d43a88136864 100644 --- a/sys/compat/linuxkpi/common/include/linux/vgaarb.h +++ b/sys/compat/linuxkpi/common/include/linux/vgaarb.h @@ -239,16 +239,43 @@ static inline int vga_conflicts(struct pci_dev *p1, struct pci_dev *p2) * by userspace since we some older X servers have issues. */ #if defined(CONFIG_VGA_ARB) +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51501 +int vga_client_register(struct pci_dev *pdev, + unsigned int (*set_vga_decode)(struct pci_dev *pdev, bool state)); +#elif defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51500 +int vga_client_register(struct pci_dev *pdev, void *cookie, + unsigned int (*set_vga_decode)(void *cookie, bool state)); +#else int vga_client_register(struct pci_dev *pdev, void *cookie, void (*irq_set_state)(void *cookie, bool state), unsigned int (*set_vga_decode)(void *cookie, bool state)); +#endif +#else +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51501 +static inline int vga_client_register(struct pci_dev *pdev, + unsigned int (*set_vga_decode)(struct pci_dev *pdev, bool state)) +#elif defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51500 +static inline int vga_client_register(struct pci_dev *pdev, void *cookie, + unsigned int (*set_vga_decode)(void *cookie, bool state)) #else static inline int vga_client_register(struct pci_dev *pdev, void *cookie, void (*irq_set_state)(void *cookie, bool state), unsigned int (*set_vga_decode)(void *cookie, bool state)) +#endif { return 0; } + +static inline int vga_client_unregister(struct pci_dev *pdev) +{ +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51501 + return (vga_client_register(NULL, NULL)); +#elif defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51500 + return (vga_client_register(NULL, NULL, NULL)); +#else + return (vga_client_register(NULL, NULL, NULL, NULL)); +#endif +} #endif #endif /* _LINUXKPI_LINUX_VGA_H_ */