From owner-dev-commits-src-main@freebsd.org Fri Feb 19 20:56:11 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6C9C753CF25; Fri, 19 Feb 2021 20:56:11 +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 4Dj3lH2hWlz3HR5; Fri, 19 Feb 2021 20:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4F47A12857; Fri, 19 Feb 2021 20:56:11 +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 11JKuBrf072357; Fri, 19 Feb 2021 20:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11JKuBlj072356; Fri, 19 Feb 2021 20:56:11 GMT (envelope-from git) Date: Fri, 19 Feb 2021 20:56:11 GMT Message-Id: <202102192056.11JKuBlj072356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: a78bb831a17f - main - fbio: Use appropriate types for the physical and virtual framebuffer address MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78bb831a17f9ba4b3d833ae6a9c2ce4f5cb5d1e Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2021 20:56:11 -0000 The branch main has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=a78bb831a17f9ba4b3d833ae6a9c2ce4f5cb5d1e commit a78bb831a17f9ba4b3d833ae6a9c2ce4f5cb5d1e Author: Alfredo Dal'Ava Junior AuthorDate: 2021-02-19 23:50:50 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2021-02-19 23:55:54 +0000 fbio: Use appropriate types for the physical and virtual framebuffer address Use appropriate types for the physical and virtual framebuffer address. Fixes framebuffers mapped above 4G physical on 32-bit systems that support physical address extensions like i386 and Book-E powerpc. Patch developed by bdragon Reviewed by: bdragon, luporl Relnotes: yes Differential Revision: https://reviews.freebsd.org/D28604 --- sys/sys/fbio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index 4cc0cc6debba..3b47b11345cf 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -136,8 +136,8 @@ struct fb_info { fb_leave_t *leave; fb_setblankmode_t *setblankmode; - uintptr_t fb_pbase; /* For FB mmap. */ - uintptr_t fb_vbase; /* if NULL, use fb_write/fb_read. */ + vm_paddr_t fb_pbase; /* For FB mmap. */ + vm_offset_t fb_vbase; /* if NULL, use fb_write/fb_read. */ void *fb_priv; /* First argument for read/write. */ const char *fb_name; uint32_t fb_flags;