Backported patch annotations for nv, etc.
Branden Robinson wrote:
> Consolidate most patches that were in 000_stolen_from_HEAD into
> 0000_backport_from_upstream.
Can we find a *good* name for this patch?
We want:
(a) a name for the patch for pieces ported from the upstream *release branch*
(currently empty, but will no doubt reappear sometime)
(b) a name for the patch for pieces ported from upstream *head*
in that order.
The name backport_from_upstream doesn't clearly distinguish which it is,
although it's (b).
> Improve documentation and provide better
> examples of how to backport patches (including upstream commit log messge
> describing what backported patches actually do -> good).
>
> This regresses some post-6.8.2 updates to xf86PciInfo.h and the ati and nv
> drivers relative to Ubuntu, mainly because it was difficult to tell exactly
> which upstream commits were backported. Add TODO item so that we restore
> this functionality before releasing to unstable.
Ahem. You don't read my messages, I guess. We know exactly which upstream
commits to the NV drivers were backported, although I haven't checked the
ChangeLog for all of them. Two clearly belong in, one clearly doesn't.
NV commits backported:
+ * programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c: [@ 1.6]
+ Bugzilla #2533 (https://bugs.freedesktop.org/show_bug.cgi?id=2533)
+ Feb. 3, 2005 "nv" driver update from Mark Vojkovich
+ (Mainly driver updates for nVidia cards with
+ ((pNv->Chipset & 0xfff0) == 0x0090) )
+
+2005-01-25 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c: [@ 1.10]
+ * programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c: [@ 1.5]
+ Jan. 2005 nv chipset update from Mark Vojkovich
+ Bug #2380 <https://bugs.freedesktop.org/show_bug.cgi?id=2380>
+ Patch #1752 <https://bugs.freedesktop.org/attachment.cgi?id=1752>
+
+[programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c @ 1.6]
+ Bug #1192: Remove cfb support from drivers where its use is an option.
+ Delete xf24_32bpp, as s3virge was the last user. Fix up some comments
+ to refer to fb rather than cfb.
+ [comment change only!]
Reply to: