Bug 9437 - [mach64] Keep pci mach64 only
Summary: [mach64] Keep pci mach64 only
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Driver/mach64 (show other bugs)
Version: git
Hardware: x86 (IA32) Linux (All)
: high normal
Assignee: Xorg Project Team
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 9600
  Show dependency treegraph
 
Reported: 2006-12-24 03:30 UTC by George -
Modified: 2007-02-05 09:45 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments
keep pci mach64 only (75.40 KB, application/x-compressed-tar)
2006-12-24 03:31 UTC, George -
no flags Details
keep pci mach64 only - try 1 (76.61 KB, application/x-compressed-tar)
2006-12-27 08:23 UTC, George -
no flags Details
keep pci mach64 only - try 1 (76.61 KB, application/x-compressed-tar)
2006-12-27 08:23 UTC, George -
no flags Details
keep pci mach64 only - try 2 (77.64 KB, application/x-compressed-tar)
2006-12-27 11:27 UTC, George -
no flags Details
keep pci mach64 only - try 3 (77.75 KB, application/x-compressed-tar)
2006-12-31 06:44 UTC, George -
no flags Details
keep pci mach64 only - try 4 (77.62 KB, application/x-compressed-tar)
2007-01-07 09:16 UTC, George -
no flags Details
keep pci mach64 only - try 5 (77.97 KB, application/x-compressed-tar)
2007-01-15 06:48 UTC, George -
no flags Details
keep pci mach64 only - try 6 (77.79 KB, application/x-compressed-tar)
2007-01-19 12:55 UTC, George -
no flags Details

Description George - 2006-12-24 03:30:33 UTC
The attached patchset drops support for pre-mach64 and non-pci cards from
xf86-video-ati. Is it based on the work by Luc Verhaegen, but focuses on code
deletions:

  4 files changed,   3 insertions(+),   87 deletions(-)
  5 files changed,  23 insertions(+),    0 deletions(-)
  4 files changed, 368 insertions(+),  662 deletions(-) <- sane probe
  1 files changed,   1 insertions(+),  222 deletions(-)
  3 files changed,  26 insertions(+),   35 deletions(-)
  9 files changed,  24 insertions(+), 1051 deletions(-)
  7 files changed,  41 insertions(+),  285 deletions(-)
 12 files changed,  26 insertions(+),  378 deletions(-)
 21 files changed,  33 insertions(+),  258 deletions(-)
  9 files changed,  12 insertions(+),  184 deletions(-)
 38 files changed,  61 insertions(+), 3281 deletions(-) <- pci mach64 only
  2 files changed,   2 insertions(+),  342 deletions(-)

I think it's decent, except for a (ridiculously) big commit, trying to split
that results in partially deleting code that soon gets deleted in whole. Also,
it has been tested only on an ATI Rage Pro.

Please document what you think.
Comment 1 George - 2006-12-24 03:31:44 UTC
Created attachment 8205 [details]
keep pci mach64 only

tgz patchset
Comment 2 Luc Verhaegen 2006-12-24 03:48:17 UTC
Is this that version you once showed me where you took my code, dropped Mach64
CX and GX support and merged it with recent changes?
Comment 3 George - 2006-12-24 04:15:15 UTC
(In reply to comment #2)
> Is this that version you once showed me where you took my code, dropped Mach64
> CX and GX support and merged it with recent changes?

yes, it's the same version with the CX and GX support back in.
Comment 4 Luc Verhaegen 2006-12-24 06:56:39 UTC
Oh, i see.

Heh. History repeating (no, not the CX/GX stuff).
Comment 5 George - 2006-12-27 08:23:00 UTC
Created attachment 8227 [details]
keep pci mach64 only - try 1

split big commit a little, not it is:

 38 files changed, 42 insertions(+), 2121 deletions(-)
Comment 6 George - 2006-12-27 08:23:26 UTC
Created attachment 8228 [details]
keep pci mach64 only - try 1

split big commit a little, now it is:

 38 files changed, 42 insertions(+), 2121 deletions(-)
Comment 7 George - 2006-12-27 11:27:48 UTC
Created attachment 8229 [details]
keep pci mach64 only - try 2

split the big commit once again, but this time it is along the files touched
rather than functionality:

 15 files changed, 26 insertions(+), 1395 deletions(-)
Comment 8 George - 2006-12-31 06:44:40 UTC
Created attachment 8250 [details]
keep pci mach64 only - try 3

cosmetic.
Comment 9 George - 2007-01-07 09:16:24 UTC
Created attachment 8322 [details]
keep pci mach64 only - try 4

drop a superfluous function.
Comment 10 George - 2007-01-15 06:48:59 UTC
Created attachment 8400 [details]
keep pci mach64 only - try 5

rebase to master.
Comment 11 George - 2007-01-19 12:55:14 UTC
Created attachment 8460 [details]
keep pci mach64 only - try 6

minor cosmetic
Comment 12 Michel Dänzer 2007-01-21 04:46:43 UTC
The master branch is open for development, and you're the de facto atimisc
maintainer...
Comment 13 George - 2007-01-21 10:27:58 UTC
Comment on attachment 8460 [details]
keep pci mach64 only - try 6

This is now tracked in the mach64-pci branch of xf86-video-ati:

http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=shortlog;h=ma
ch64-pci
Comment 14 George - 2007-01-21 10:39:17 UTC
I guess the branch has to receive some testing on some other card/architecure
before merging to master as it has been only tested on RagePro/i386.

Also, it probably needs some kind of consent from distro people. My line here
goes like: the AVOID_NON_PCI configure variable is always set since X.org 7.0
because of a typo in configure.ac and mach32 is not accelerated, so the only
effective functionality loss should be mach32 video modes. Lastly, there is a
quirk in that sparse I/O conflict avoidance was dropped and replaced with the
"probe_sparse" option.
Comment 15 George - 2007-01-27 16:06:40 UTC
This is now tracked in:

http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-ati.git;a=shortlog;h=mach64-pci-1

Put all the grep-based commits first.
Comment 16 George - 2007-02-05 09:45:25 UTC
Merged to master (9d77aabdff919360f0c9333105436c31f1f5749a).


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.