[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Radeon DRIVER



Robert Noland wrote:
Oops, I fixed it for the non r600+ case.

Please try,
http://people.freebsd.org/~rnoland/radeon-drm-next-r6-7xx-030609-2.patch

I applied this to a fresh RELENG_7 now. It applies with one error and some offsets, but my system is booting and detecting my HD3450:

------
vgapci0: <VGA-compatible display> port 0x2000-0x20ff mem 0xd0000000-0xdfffffff,0xe0200000-0xe020ffff irq 16 at device 0.0 on pci1
drm0: <ATI Radeon HD 3450> on vgapci0
vgapci0: child drm0 requested pci_enable_busmaster
info: [drm] Initialized radeon 1.29.0 20080528
------

Patch output is pasted below. The unsuccessful hunk in radeon_cp.c I wedged in by hand. In a few hours I hope to report on the results of upgrading to Xorg 7.4 and latest radeonhd-devel. Running Xorg 7.3 and video-ati-6.9.0 at the moment.



Regards,
Aragon



Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: conf/files
|===================================================================
|--- conf/files	(revision 189454)
|+++ conf/files	(working copy)
--------------------------
Patching file conf/files using Plan A...
Hunk #1 succeeded at 593 (offset -208 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: modules/drm/radeon/Makefile
|===================================================================
|--- modules/drm/radeon/Makefile	(revision 189454)
|+++ modules/drm/radeon/Makefile	(working copy)
--------------------------
Patching file modules/drm/radeon/Makefile using Plan A...
Hunk #1 succeeded at 2.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/drm/radeon_cp.c
|===================================================================
|--- dev/drm/radeon_cp.c	(revision 189454)
|+++ dev/drm/radeon_cp.c	(working copy)
--------------------------
Patching file dev/drm/radeon_cp.c using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 33.
Hunk #3 succeeded at 144.
Hunk #4 succeeded at 186.
Hunk #5 succeeded at 260.
Hunk #6 succeeded at 296.
Hunk #7 succeeded at 364.
Hunk #8 succeeded at 393.
Hunk #9 succeeded at 404.
Hunk #10 succeeded at 426.
Hunk #11 succeeded at 461.
Hunk #12 succeeded at 516.
Hunk #13 succeeded at 642.
Hunk #14 succeeded at 699.
Hunk #15 succeeded at 751.
Hunk #16 succeeded at 771.
Hunk #17 succeeded at 782.
Hunk #18 succeeded at 817.
Hunk #19 succeeded at 849.
Hunk #20 succeeded at 863.
Hunk #21 succeeded at 895.
Hunk #22 succeeded at 909.
Hunk #23 succeeded at 919.
Hunk #24 succeeded at 927.
Hunk #25 succeeded at 1044.
Hunk #26 succeeded at 1080.
Hunk #27 succeeded at 1134.
Hunk #28 succeeded at 1161.
Hunk #29 succeeded at 1219.
Hunk #30 succeeded at 1291.
Hunk #31 succeeded at 1304.
Hunk #32 succeeded at 1405.
Hunk #33 succeeded at 1416.
Hunk #34 succeeded at 1460.
Hunk #35 succeeded at 1533.
Hunk #36 succeeded at 1560.
Hunk #37 succeeded at 1583.
Hunk #38 succeeded at 1595.
Hunk #39 succeeded at 1607.
Hunk #40 succeeded at 1637.
Hunk #41 succeeded at 1671.
Hunk #42 succeeded at 1683.
Hunk #43 succeeded at 1705.
Hunk #44 succeeded at 1760.
Hunk #45 succeeded at 1781.
Hunk #46 succeeded at 1799.
Hunk #47 succeeded at 1878.
Hunk #48 succeeded at 1912.
Hunk #49 succeeded at 2082.
Hunk #50 failed at 2089.

        else
                dev_priv->flags |= RADEON_IS_PCI;

+       ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
+                        drm_get_resource_len(dev, 2), _DRM_REGISTERS,
+                        _DRM_READ_ONLY | _DRM_DRIVER, &dev_priv->mmio);
+       if (ret != 0)
+               return ret;
+
        ret = drm_vblank_init(dev, 2);
        if (ret) {
                radeon_driver_unload(dev);


Hunk #51 succeeded at 2111 (offset -6 lines).
Hunk #52 succeeded at 2126 (offset -6 lines).
1 out of 52 hunks failed--saving rejects to dev/drm/radeon_cp.c.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/drm/drm_pciids.h
|===================================================================
|--- dev/drm/drm_pciids.h	(revision 189454)
|+++ dev/drm/drm_pciids.h	(working copy)
--------------------------
Patching file dev/drm/drm_pciids.h using Plan A...
Hunk #1 succeeded at 240.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/drm/radeon_drv.h
|===================================================================
|--- dev/drm/radeon_drv.h	(revision 189454)
|+++ dev/drm/radeon_drv.h	(working copy)
--------------------------
Patching file dev/drm/radeon_drv.h using Plan A...
Hunk #1 succeeded at 41.
Hunk #2 succeeded at 103.
Hunk #3 succeeded at 129.
Hunk #4 succeeded at 138.
Hunk #5 succeeded at 174.
Hunk #6 succeeded at 184.
Hunk #7 succeeded at 231.
Hunk #8 succeeded at 255.
Hunk #9 succeeded at 297.
Hunk #10 succeeded at 321.
Hunk #11 succeeded at 365.
Hunk #12 succeeded at 397.
Hunk #13 succeeded at 408.
Hunk #14 succeeded at 419.
Hunk #15 succeeded at 434.
Hunk #16 succeeded at 460.
Hunk #17 succeeded at 486.
Hunk #18 succeeded at 512.
Hunk #19 succeeded at 530.
Hunk #20 succeeded at 610.
Hunk #21 succeeded at 743.
Hunk #22 succeeded at 777.
Hunk #23 succeeded at 851.
Hunk #24 succeeded at 863.
Hunk #25 succeeded at 1039.
Hunk #26 succeeded at 1079.
Hunk #27 succeeded at 1101.
Hunk #28 succeeded at 1272.
Hunk #29 succeeded at 1307.
Hunk #30 succeeded at 1732.
Hunk #31 succeeded at 1744.
Hunk #32 succeeded at 1851.
Hunk #33 succeeded at 1905.
Hunk #34 succeeded at 1934.
Hunk #35 succeeded at 1984.
Hunk #36 succeeded at 2009.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/drm/radeon_state.c
|===================================================================
|--- dev/drm/radeon_state.c	(revision 189454)
|+++ dev/drm/radeon_state.c	(working copy)
--------------------------
Patching file dev/drm/radeon_state.c using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 42.
Hunk #3 succeeded at 307.
Hunk #4 succeeded at 361.
Hunk #5 succeeded at 372.
Hunk #6 succeeded at 792.
Hunk #7 succeeded at 866.
Hunk #8 succeeded at 892.
Hunk #9 succeeded at 969.
Hunk #10 succeeded at 1017.
Hunk #11 succeeded at 1046.
Hunk #12 succeeded at 1101.
Hunk #13 succeeded at 1121.
Hunk #14 succeeded at 1216.
Hunk #15 succeeded at 1287.
Hunk #16 succeeded at 1330.
Hunk #17 succeeded at 1387.
Hunk #18 succeeded at 1407.
Hunk #19 succeeded at 1541.
Hunk #20 succeeded at 1550.
Hunk #21 succeeded at 1598.
Hunk #22 succeeded at 2098.
Hunk #23 succeeded at 2109.
Hunk #24 succeeded at 2142.
Hunk #25 succeeded at 2192.
Hunk #26 succeeded at 2203.
Hunk #27 succeeded at 2220.
Hunk #28 succeeded at 2274.
Hunk #29 succeeded at 2299.
Hunk #30 succeeded at 2366.
Hunk #31 succeeded at 2471.
Hunk #32 succeeded at 2506.
Hunk #33 succeeded at 2696.
Hunk #34 succeeded at 2844.
Hunk #35 succeeded at 2870.
Hunk #36 succeeded at 3000.
Hunk #37 succeeded at 3008.
Hunk #38 succeeded at 3050.
Hunk #39 succeeded at 3073.
Hunk #40 succeeded at 3091.
Hunk #41 succeeded at 3142.
Hunk #42 succeeded at 3155.
Hunk #43 succeeded at 3204.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/drm/r600_microcode.h
|===================================================================
|--- dev/drm/r600_microcode.h	(revision 0)
|+++ dev/drm/r600_microcode.h	(revision 0)
--------------------------
(Creating file dev/drm/r600_microcode.h...)
Patching file dev/drm/r600_microcode.h using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|Property changes on: dev/drm/r600_microcode.h
|___________________________________________________________________
|Added: svn:mime-type
|   + text/plain
|Added: svn:keywords
|   + FreeBSD=%H
|Added: svn:eol-style
|   + native
|
|Index: dev/drm/r600_cp.c
|===================================================================
|--- dev/drm/r600_cp.c	(revision 0)
|+++ dev/drm/r600_cp.c	(revision 0)
--------------------------
(Creating file dev/drm/r600_cp.c...)
Patching file dev/drm/r600_cp.c using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|Property changes on: dev/drm/r600_cp.c
|___________________________________________________________________
|Added: svn:mime-type
|   + text/plain
|Added: svn:keywords
|   + FreeBSD=%H
|Added: svn:eol-style
|   + native
|
|Index: dev/drm/radeon_drm.h
|===================================================================
|--- dev/drm/radeon_drm.h	(revision 189454)
|+++ dev/drm/radeon_drm.h	(working copy)
--------------------------
Patching file dev/drm/radeon_drm.h using Plan A...
Hunk #1 succeeded at 306.
Hunk #2 succeeded at 530.
Hunk #3 succeeded at 657.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/drm/radeon_irq.c
|===================================================================
|--- dev/drm/radeon_irq.c	(revision 189454)
|+++ dev/drm/radeon_irq.c	(working copy)
--------------------------
Patching file dev/drm/radeon_irq.c using Plan A...
Hunk #1 succeeded at 68.
Hunk #2 succeeded at 103.
Hunk #3 succeeded at 138.
Hunk #4 succeeded at 207 (offset -1 lines).
Hunk #5 succeeded at 271 (offset -27 lines).
Hunk #6 succeeded at 359 (offset -1 lines).
Hunk #7 succeeded at 370 (offset -22 lines).
done
_______________________________________________
freebsd-x11_(_at_)_freebsd_(_dot_)_org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-x11
To unsubscribe, send any mail to "freebsd-x11-unsubscribe_(_at_)_freebsd_(_dot_)_org"