Date: Sun, 4 Oct 2020 20:20:32 +0200 From: =?UTF-8?B?VMSzbA==?= Coosemans <tijl@FreeBSD.org> To: x11@FreeBSD.org Subject: Re: drm-current-kmod 5.4 missing 4.16 patches Message-ID: <20201004202032.5bb0f810@FreeBSD.org> In-Reply-To: <20201004162857.7980a25d@FreeBSD.org> References: <20201004162857.7980a25d@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 4 Oct 2020 16:28:57 +0200 T=C4=B3l Coosemans <tijl@FreeBSD.org> wro= te: > 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 >=20 > 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 >=20 > 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. I also found a difference between these commits: Extend pause in firmware loading https://github.com/FreeBSDDesktop/kms-drm/commit/71a473b81e5bd4d92b9a574eb9= 0c8604742584ce https://github.com/freebsd/drm-kmod/commit/c20c542484f982e1ba26ddf69a673f7d= eca9c62f There are two more commits to i915_debugfs.c that are not in 5.4: Fix debugfs to output gpu info and error state without crash https://github.com/FreeBSDDesktop/kms-drm/commit/a0614d5ad4deaaabe0c7966af4= 8cb5f2dfb26171 Increase buffer size for gpu info debug output https://github.com/FreeBSDDesktop/kms-drm/commit/993d966f0d5546476ff9870e9d= c7c4fbb658d2c5 I can't tell if they are needed so I didn't include them in the patch set.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201004202032.5bb0f810>