From nobody Mon Oct 11 17:51:08 2021 X-Original-To: freebsd-current@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 746D617FDD24 for ; Mon, 11 Oct 2021 17:51:20 +0000 (UTC) (envelope-from imb@protected-networks.net) Received: from mail.protected-networks.net (mail.protected-networks.net [202.12.127.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mail.protected-networks.net", Issuer "R3" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HSmZ02N6fz4rrF for ; Mon, 11 Oct 2021 17:51:20 +0000 (UTC) (envelope-from imb@protected-networks.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= protected-networks.net; h=content-transfer-encoding:content-type :content-type:in-reply-to:from:from:references:content-language :subject:subject:user-agent:mime-version:date:date:message-id; s=201508; t=1633974669; bh=LP7SCKo/EmJTuyfs/jBC6jc1qoqQjtXWhpmF 10xZotg=; b=SqayWorZAuqQ4pL6f0jYJadCYKYlIaCMZ+pMEwQkJI5McyDefAZ2 AMXPp9E4uAslKrxUhVVc1vrrDmI/Ts4YDWipaWDePhDneBquThU295o9dkBTx/3f 524vNZdWjjx4OO2JrRYLtQjI2xVUUJOM/WVamqwWQluU+FDRAFW3JKA= Received: from [192.168.1.10] (toshi.auburn.protected-networks.net [192.168.1.10]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (Client did not present a certificate) (Authenticated sender: imb@mail.protected-networks.net) by mail.protected-networks.net (Postfix) with ESMTPSA id 26DA146994; Mon, 11 Oct 2021 13:51:09 -0400 (EDT) Message-ID: <12599410-d74c-b87d-2bd7-103e6beeb6c3@protected-networks.net> Date: Mon, 11 Oct 2021 13:51:08 -0400 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: drm-devel-kmod build failures Content-Language: en-NZ To: Mateusz Guzik Cc: freebsd-current References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4HSmZ02N6fz4rrF X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Reply-To: imb@protected-networks.net From: Michael Butler via freebsd-current X-Original-From: Michael Butler X-ThisMailContainsUnwantedMimeParts: N Thanks - that works :-) On 10/11/21 13:31, Mateusz Guzik wrote: > This should do it (untested): > > diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c > index 37b268afa..f05de73fa 100644 > --- a/drivers/dma-buf/dma-buf.c > +++ b/drivers/dma-buf/dma-buf.c > @@ -117,9 +117,15 @@ dma_buf_close(struct file *fp, struct thread *td) > return (0); > } > > +#if __FreeBSD_version >= 1400037 > +static int > +dma_buf_stat(struct file *fp, struct stat *sb, > + struct ucred *active_cred __unused) > +#else > static int > dma_buf_stat(struct file *fp, struct stat *sb, > struct ucred *active_cred __unused, struct thread *td __unused) > +#endif > { > > /* XXX need to define flags for st_mode */ > > > On 10/11/21, Michael Butler via freebsd-current > wrote: >> After the latest freebsd version bump in param.h, I tried to rebuild the >> DRM modules. It failed with .. >> >> --- dma-buf.o --- >> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/drivers/dma-buf//dma-buf.c:121:1: >> >> error: conflicting types for 'dma_buf_stat' >> dma_buf_stat(struct file *fp, struct stat *sb, >> ^ >> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/drivers/dma-buf//dma-buf.c:70:18: >> >> note: previous declaration is here >> static fo_stat_t dma_buf_stat; >> ^ >> 1 error generated. >> *** [dma-buf.o] Error code 1 >> >> make[3]: stopped in >> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/linuxkpi >> 1 error >> >> make[3]: stopped in >> /usr/ports/graphics/drm-devel-kmod/work/drm-kmod-drm_v5.5.19_4/linuxkpi >> >> I get a similar error with drm-current-kmod. What changed? >> >> imb >> >> > >