From owner-freebsd-x11@freebsd.org Mon Oct 5 07:43:49 2020 Return-Path: Delivered-To: freebsd-x11@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 A751B3FAD2B for ; Mon, 5 Oct 2020 07:43:49 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4XfF2JpTz4nXL for ; Mon, 5 Oct 2020 07:43:49 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: by mailman.nyi.freebsd.org (Postfix) id 4F5363FB527; Mon, 5 Oct 2020 07:43:49 +0000 (UTC) Delivered-To: x11@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 4F1C53FB050 for ; Mon, 5 Oct 2020 07:43:49 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (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 "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4XfD502nz4ntK; Mon, 5 Oct 2020 07:43:48 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1601883821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=npIG6NSo3jHGLHKcPLRst+jED02PETyOvYLZWi8q1KQ=; b=tfoQUYiIJJiM8D+zmhEXsfuSvIpyJTmY6tUV93iySVWozJh6X2Un782/ywL4wXgcRlhXDN WS6mSQaxuL2OwPhZnf4KvPAvdZqOTZlKBje6JUWmMmfCI2SdAkaW85a6kzsDhQ3aboy6/V NSgDMezJLBKY569MmOmzmTFawfcgNgQ= Received: from amy.home (lfbn-idf2-1-288-247.w82-123.abo.wanadoo.fr [82.123.126.247]) by mx.blih.net (OpenSMTPD) with ESMTPSA id c9f8c6ba (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 5 Oct 2020 07:43:41 +0000 (UTC) Date: Mon, 5 Oct 2020 09:43:41 +0200 From: Emmanuel Vadot To: =?ISO-8859-1?Q?T=3Fl?= Coosemans Cc: x11@FreeBSD.org Subject: Re: drm-current-kmod 5.4 missing 4.16 patches Message-Id: <20201005094341.4bd911fcf151b1e17740cefa@bidouilliste.com> In-Reply-To: <20201004162857.7980a25d@FreeBSD.org> References: <20201004162857.7980a25d@FreeBSD.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4C4XfD502nz4ntK X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:212.83.128.0/19, country:FR] X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 07:43:49 -0000 On Sun, 4 Oct 2020 16:28:57 +0200 T?l Coosemans wrote: > Hi, >=20 > I noticed some patches that were applied to drm-current-kmod 4.16 are > missing from 5.4. I went over this list (minus the upstream commits): > https://github.com/FreeBSDDesktop/kms-drm/compare/drm-v5.1...drm-v4.16 Might be a stupid question but does those patches fixes anything for you ? > I attached the ones that were missing. They have been reworked a bit to > apply to https://github.com/freebsd/drm-kmod/tree/5.4-lts They should be applied on master and then cherry-picked to 5.4-lts > They don't apply to the master branch because it is missing things that > are in 5.4-lts. In fact master is currently 273 commits behind 5.4-lts > which in turn is 49 commits behind master. You seem to be applying > patches to both branches instead of applying them to one branch and then > merging the branches. If you happen to forget about the other branch > that's how patches get lost. master is following linux master (kinda) and right now it's at 5.4 while 5.4-lts follow the lts release of the 5.4 linux branch, that's why it's ahead of master on some parts. The master branch was created from the drm-v5.0 branch on FreeBSDDesktop and if you check this one you can see that the changes (at least some of them) aren't there. Now on the patch themselves, if they solve something for you (or others) I don't mind adding them but please open a merge request on github. I'm not sure that commiting the agp patches make much sense in 2020 tbh, I hesitated a few times to ship drm-kmod without CONFIG_DRM_LEGACY enabled and this remove everything agp related and the old way of handling buffer (among other stuff). Cheers, --=20 Emmanuel Vadot