From owner-freebsd-current@freebsd.org Tue Jul 9 05:43:46 2019 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F71D15D00E4 for ; Tue, 9 Jul 2019 05:43:46 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A2D9F77F0C for ; Tue, 9 Jul 2019 05:43:45 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-io1-xd41.google.com with SMTP id q22so18746219iog.4 for ; Mon, 08 Jul 2019 22:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=U8r01wHpDBBT2dxBi3v97PMox/pIMyzgZ4hXofcSv2U=; b=awn4o6MzJp+Pg35Wh8NH0W+NjUKixGk99ha79yLCctFLWKXHMFLUtYCbdlaw2cPyC/ tp1A0QNm+nQ4gAz8mFHKlLVDq5AnpLgRk1u+H33oGqI7YEtvPxM5xPYgxWgdzEdtqbPW DWgaMR2GmiqI1CLhLy45Pj5R8Dei/XoOq+CsJCS6T7j0ztXpBDbE4WxeNmtVNQvVxcz7 DbWYaGAA+EuS6R9h5xOzl6jXutPppcbfyVN1Kvv6tsmUIaZoioZv6dLRuqGHaeraRmbW PjTSGsQK0lzQoiSwLCzT7XFQe74A4YbZLyC5qTHc4rpzGr1NOSvZkYJhFM+F590aqlqq DgQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=U8r01wHpDBBT2dxBi3v97PMox/pIMyzgZ4hXofcSv2U=; b=Bd22sLPGH2T/oMk+9ecUpo9eacdIFhFoCyYPMUXJfnv1jXhsDl6TQ+Jm25E4dH/3RN hkyqT2ReRGR7KYIyvW/6HDTa30JnNLjOgB5VrLpvaJFangvWtSQHBFn2uQBMTHcCG8i3 nkzr3ldtfwIMwjWMS5fsk9vCLyhDiODWj38bBCDN3VpiJgVLmXlHYgJbNUrlxVCpWvpf uuKkQuFO4V+CoQX0wNibBd6YGIqOThpartGWQ5CxdJ6I1c0J6W2wh29syz9aALmUb83f /Vzb80M7GQJ/zUqK90ph2Ky20X9bsfZOWwlgqRzF6Hyi+bwftSgSM7RwrhTjNqWfiQVI 30RA== X-Gm-Message-State: APjAAAVcL5MNl1T/VY9IpfCrZdVDFCdRGtEqGcRlASmv1BIR9sKs0dfy jR2HTv/3dEscUs/nZjQ2zT4bCzUT X-Google-Smtp-Source: APXvYqxLBKKx2LP3s4H9OxlGsckP0NpxP6+FPlt16GiKiRUv6GhRwfXD3CwVs+ZmIKaDP8RwtplUwQ== X-Received: by 2002:a02:c9d8:: with SMTP id c24mr26769967jap.38.1562651024952; Mon, 08 Jul 2019 22:43:44 -0700 (PDT) Received: from raichu (toroon0560w-lp140-05-70-29-85-38.dsl.bell.ca. [70.29.85.38]) by smtp.gmail.com with ESMTPSA id n2sm12970066ioa.27.2019.07.08.22.43.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 22:43:44 -0700 (PDT) Sender: Mark Johnston Date: Tue, 9 Jul 2019 01:43:42 -0400 From: Mark Johnston To: Steve Kargl Cc: freebsd-current@freebsd.org Subject: Re: vm_page_hold() and drm-legacy-kmod Message-ID: <20190709054342.GF41568@raichu> References: <20190709043058.GA63004@troutmask.apl.washington.edu> <20190709043505.GC63004@troutmask.apl.washington.edu> <20190709044336.GA63186@troutmask.apl.washington.edu> <20190709050400.GA63317@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190709050400.GA63317@troutmask.apl.washington.edu> User-Agent: Mutt/1.12.1 (2019-06-15) X-Rspamd-Queue-Id: A2D9F77F0C X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=awn4o6Mz; spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::d41 as permitted sender) smtp.mailfrom=markjdb@gmail.com X-Spamd-Result: default: False [-3.49 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[1.4.d.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.81)[ip: (1.60), ipnet: 2607:f8b0::/32(-3.16), asn: 15169(-2.41), country: US(-0.06)]; MID_RHS_NOT_FQDN(0.50)[] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jul 2019 05:43:46 -0000 On Mon, Jul 08, 2019 at 10:04:00PM -0700, Steve Kargl wrote: > On Mon, Jul 08, 2019 at 09:43:36PM -0700, Steve Kargl wrote: > > On Mon, Jul 08, 2019 at 09:35:05PM -0700, Steve Kargl wrote: > > > On Mon, Jul 08, 2019 at 09:31:12PM -0700, Steve Kargl wrote: > > > > It seems the recent flurry of vm commits has > > > > broken the graphics/drm-legacy-kmod port. > > > > vm_page_hold() no longer exists. How do I > > > > fix the port? > > > > > > > > > > Whoops. The missing function is vm_page_unhold(). > > > Anywhoo, how do I fix this? > > > > > The code in question is > > > > for (i = 0; i < vsg->num_pages; i++) { > > m = vsg->pages[i]; > > vm_page_lock(m); > > vm_page_wire(m); > > vm_page_unhold(m); > > vm_page_unlock(m); > > } > > This was broken by r349846 committed by markj. Please try this patch. If it works for you I will submit a pull request to the drm-legacy repo. diff --git a/src/dev/drm/via_dmablit.c b/src/dev/drm/via_dmablit.c index e8096f2..aa57944 100644 --- a/src/dev/drm/via_dmablit.c +++ b/src/dev/drm/via_dmablit.c @@ -222,8 +222,10 @@ static int via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) { unsigned long first_pfn = VIA_PFN(xfer->mem_addr); +#if __FreeBSD_version < 1300035 vm_page_t m; int i; +#endif vsg->num_pages = VIA_PFN(xfer->mem_addr + (xfer->num_lines * xfer->mem_stride -1)) - first_pfn + 1; @@ -239,6 +241,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) VM_PROT_READ | VM_PROT_WRITE, vsg->pages, vsg->num_pages) < 0) return -EACCES; +#if __FreeBSD_version < 1300035 for (i = 0; i < vsg->num_pages; i++) { m = vsg->pages[i]; vm_page_lock(m); @@ -246,6 +249,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg, drm_via_dmablit_t *xfer) vm_page_unhold(m); vm_page_unlock(m); } +#endif vsg->state = dr_via_pages_locked; DRM_DEBUG("DMA pages locked\n");