thr3ads.net - freebsd stable - [CFT] radeon_suspend/resume patch [Jun 2012]

If this information is useful, please help other people find it:
Share via:

Mitsuru IWASAKI

2012-Jun-25 14:06 UTC

[CFT] radeon_suspend/resume patch

Hi,

I created the patches for drm/radeon in order to restore the graphic
state on resuming (ported from NetBSD code).

http://people.freebsd.org/~iwasaki/acpi/drm-radeon_suspend-20120623.diff

Unfortunately, I don't have the machine to test the patches.
Can anyone test this?

Thanks!

Volodymyr Kostyrko

2012-Jun-25 14:13 UTC

head link

[CFT] radeon_suspend/resume patch

Mitsuru IWASAKI wrote:> I created the patches for drm/radeon in order to restore the graphic
> state on resuming (ported from NetBSD code).
>
> http://people.freebsd.org/~iwasaki/acpi/drm-radeon_suspend-20120623.diff
>
> Unfortunately, I don't have the machine to test the patches.
> Can anyone test this?
I have a desktop with Radeon 9550 AS. How can I trigger suspend/resume 
on that one manually?

-- 
Sphinx of black quartz judge my vow.

Lawrence Stewart

2012-Jun-25 15:37 UTC

head link

[CFT] radeon_suspend/resume patch

On 06/26/12 00:06, Mitsuru IWASAKI wrote:> Hi,
> 
> I created the patches for drm/radeon in order to restore the graphic
> state on resuming (ported from NetBSD code).
> 
> http://people.freebsd.org/~iwasaki/acpi/drm-radeon_suspend-20120623.diff
> 
> Unfortunately, I don't have the machine to test the patches.
> Can anyone test this?
root@lstewart1# sysctl hw.acpi.supported_sleep_state
hw.acpi.supported_sleep_state: S3 S4 S5

root@lstewart1# kenv smbios.system.product ; kenv smbios.bios.version
HP Z400 Workstation
786G3 v03.54

root@lstewart1# dmesg | grep drm
drm0: <ATI Radeon X1300/X1550> on vgapci0
info: [drm] MSI enabled 1 message(s)
info: [drm] Initialized radeon 1.31.0 20080613
info: [drm] Setting GART location based on new memory map
info: [drm] Loading R500 Microcode
info: [drm] Num pipes: 1
info: [drm] writeback test succeeded in 1 usecs

root@lstewart1# kldstat
Id Refs Address            Size     Name
 1   38 0xffffffff80200000 1317428  kernel
 3    3 0xffffffff8151e000 4f068    vboxdrv.ko
 4    1 0xffffffff81612000 134393   zfs.ko
 5    1 0xffffffff81747000 2f96     opensolaris.ko
 6    1 0xffffffff8174a000 3dfa     linprocfs.ko
 7    1 0xffffffff8174e000 1f38a    linux.ko
 8    2 0xffffffff8176e000 2931     vboxnetflt.ko
 9    2 0xffffffff81771000 87b2     netgraph.ko
10    1 0xffffffff8177a000 1579     ng_ether.ko
11    1 0xffffffff8177c000 3f8a     vboxnetadp.ko
12    1 0xffffffff81780000 a9bb     fuse.ko
13    1 0xffffffff8178b000 64939    radeon.ko
14    1 0xffffffff817f0000 13531    drm.ko

root@lstewart1# cd /usr/src/

root@lstewart1# svn info
Path: .
Working Copy Root Path: /usr/src
URL: http://svn.freebsd.org/base/stable/9
Repository Root: http://svn.freebsd.org/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 237154
Node Kind: directory
Schedule: normal
Last Changed Author: kib
Last Changed Rev: 237150
Last Changed Date: 2012-06-16 09:07:51 +1000 (Sat, 16 Jun 2012)

root@lstewart1# cd /usr/src/sys/dev/drm

root@lstewart1# patch -p0 < ../../../drm-radeon_suspend-20120623.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: drmP.h
|==================================================================|RCS file:
/home/ncvs/src/sys/dev/drm/drmP.h,v
|retrieving revision 1.47.2.1
|diff -u -r1.47.2.1 drmP.h
|--- drmP.h     23 Sep 2011 00:51:37 -0000      1.47.2.1
|+++ drmP.h     22 Jun 2012 22:23:29 -0000
--------------------------
Patching file drmP.h using Plan A...
Hunk #1 succeeded at 731.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: drm_fops.c
|==================================================================|RCS file:
/home/ncvs/src/sys/dev/drm/drm_fops.c,v
|retrieving revision 1.8.2.1
|diff -u -r1.8.2.1 drm_fops.c
|--- drm_fops.c 23 Sep 2011 00:51:37 -0000      1.8.2.1
|+++ drm_fops.c 22 Jun 2012 22:22:10 -0000
--------------------------
Patching file drm_fops.c using Plan A...
Hunk #1 succeeded at 39.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: radeon_drv.c
|==================================================================|RCS file:
/home/ncvs/src/sys/dev/drm/radeon_drv.c,v
|retrieving revision 1.20.4.1
|diff -u -r1.20.4.1 radeon_drv.c
|--- radeon_drv.c       23 Sep 2011 00:51:37 -0000      1.20.4.1
|+++ radeon_drv.c       22 Jun 2012 22:34:07 -0000
--------------------------
Patching file radeon_drv.c using Plan A...
Hunk #1 succeeded at 99.
Hunk #2 succeeded at 145.
done

root@lstewart1# cd /usr/src

root@lstewart1# make -s -j12 -DNO_CLEAN buildkernel
-------------------------------------------------------------->>> Kernel build for GENERIC started on Tue Jun 26 00:56:24 EST 2012--------------------------------------------------------------
===> GENERIC
[...]
-------------------------------------------------------------->>> Kernel build for GENERIC completed on Tue Jun 26 00:57:29 EST 2012--------------------------------------------------------------

root@lstewart1# make -s installkernel
-------------------------------------------------------------->>> Installing kernel GENERIC--------------------------------------------------------------
[...]

root@lstewart1# shutdown -r now





I rebooted into X with Fluxbox as my window manager. Ran "sudo acpiconf
-s3" from an xterm. Machine correctly went to sleep. I waiting 30s and
then pressed the power button. Machine came back, loaded X up correctly
and everything kept working. Amazing!

I've been looking forward to working S3 support on my desktop for over
12 months now. Thank you very much for your work!

Cheers,
Lawrence

Volodymyr Kostyrko

2012-Jun-26 08:04 UTC

head link

[CFT] radeon_suspend/resume patch

Mitsuru IWASAKI wrote:> I created the patches for drm/radeon in order to restore the graphic
> state on resuming (ported from NetBSD code).
>
> http://people.freebsd.org/~iwasaki/acpi/drm-radeon_suspend-20120623.diff
>
> Unfortunately, I don't have the machine to test the patches.
> Can anyone test this?
 > uname -a
FreeBSD limbo.xim.bz 9.0-STABLE FreeBSD 9.0-STABLE #0 r237562M: Tue Jun 
26 03:35:06 EEST 2012 
arcade@limbo.xim.bz:/usr/obj/usr/src/sys/MINIMALx32  i386

vgapci0@pci0:1:0:0:     class=0x030000 card=0x40501458 chip=0x41531002 
rev=0x00 hdr=0x00
     vendor     = 'ATI Technologies Inc'
     device     = 'RV350 AS [Radeon 9550]'
     class      = display
     subclass   = VGA
vgapci1@pci0:1:0:1:     class=0x038000 card=0x40511458 chip=0x41731002 
rev=0x00 hdr=0x00
     vendor     = 'ATI Technologies Inc'
     device     = 'RV350 AS [Radeon 9550] (Secondary)'
     class      = display

 > kldstat
Id Refs Address    Size     Name
  1  166 0x83400000 5898bc   kernel
  2    1 0x8398a000 5900     atavia.ko
  3    2 0x83990000 6990     ataahci.ko
  4    3 0x83997000 80b0     atapci.ko
  5    1 0x839a0000 18d7f0   zfs.ko
  6    2 0x83b2e000 165f0    krpc.ko
  7    2 0x83b45000 3ffc     opensolaris.ko
  8    1 0x83b4a000 dae4     ahci.ko
  9    1 0x88507000 a000     tmpfs.ko
10    2 0x88520000 6000     procfs.ko
11    2 0x8852e000 7000     pseudofs.ko
12    1 0x8853d000 4000     fdescfs.ko
13    1 0x88563000 8000     linprocfs.ko
14    1 0x8858f000 2a000    linux.ko
15    1 0x88916000 4000     usb_quirk.ko
16    7 0x88951000 2b000    usb.ko
17    1 0x889b0000 2000     accf_http.ko
18    1 0x889c1000 8000     aio.ko
19    1 0x889db000 d000     ehci.ko
20    1 0x88a23000 b000     if_re.ko
21    1 0x88a5d000 1f000    miibus.ko
22    1 0x88abb000 3000     speaker.ko
23    1 0x88ace000 a000     uhci.ko
24    1 0x88d4a000 5000     ums.ko
25    1 0x88f44000 9000     umass.ko
26    1 0x88fa2000 6000     ng_ubt.ko
27   11 0x88fc9000 c000     netgraph.ko
28    1 0x88fe3000 b000     ng_hci.ko
29    3 0x88fe1000 2000     ng_bluetooth.ko
30    1 0x8908a000 a000     ukbd.ko
31    1 0x89182000 f000     ng_l2cap.ko
32    1 0x8920b000 20000    ng_btsocket.ko
33    1 0x8929f000 4000     ng_socket.ko
34    1 0x89963000 3000     ng_mppc.ko
35    1 0x89967000 2000     rc4.ko
36    1 0x8998b000 3000     ng_iface.ko
37    1 0x899a6000 7000     ng_ppp.ko
38    1 0x899d3000 2000     ng_tee.ko
39    1 0x89a34000 4000     ng_ether.ko
40    1 0x89abd000 6000     ng_pppoe.ko
41    1 0x89b05000 e000     fuse.ko
42    1 0x8a008000 23000    snd_au8830.ko
43    1 0x8a084000 4c000    sound.ko
44    1 0x8af79000 52000    radeon.ko
45    1 0x8b024000 15000    drm.ko
46    1 0x8b057000 18000    agp.ko

Jun 26 08:15:03 limbo acpi: suspend at 20120626 08:15:03
Jun 26 08:15:06 limbo kernel: info: [drm] Num pipes: 1
Jun 26 08:15:08 limbo kernel: uhub1: at usbus1, port 1, addr 1 
(disconnected)
Jun 26 08:15:08 limbo kernel: ugen1.2: <Logitech> at usbus1 (disconnected)
Jun 26 08:15:08 limbo kernel: ums0: at uhub1, port 2, addr 2 (disconnected)
Jun 26 08:15:08 limbo kernel: uhub2: at usbus2, port 1, addr 1 
(disconnected)
Jun 26 08:15:31 limbo kernel: uhub3: at usbus3, port 1, addr 1 
(disconnected)
Jun 26 08:15:31 limbo kernel: ugen3.2: <Broadcom> at usbus3 (disconnected)
Jun 26 08:15:31 limbo kernel: uhub4: at uhub3, port 1, addr 2 (disconnected)
Jun 26 08:15:31 limbo kernel: ugen3.3: <vendor 0x0a12> at usbus3 
(disconnected)
Jun 26 08:15:31 limbo kernel: ubt0: at uhub4, port 1, addr 3 
(disconnected) 

Jun 26 08:15:31 limbo kernel: ugen3.4: <vendor 0x0a5c> at usbus3 
(disconnected) 

Jun 26 08:15:31 limbo kernel: ukbd0: at uhub4, port 2, addr 4 
(disconnected) 

Jun 26 08:15:31 limbo kernel: ugen3.5: <vendor 0x0a5c> at usbus3 
(disconnected) 

Jun 26 08:15:31 limbo kernel: ums1: at uhub4, port 3, addr 5 
(disconnected) 

Jun 26 08:15:31 limbo kernel: uhub0: at usbus0, port 1, addr 1 
(disconnected) 

Jun 26 08:15:31 limbo kernel: ugen0.2: <Kingston> at usbus0 
(disconnected) 

Jun 26 08:15:31 limbo kernel: umass0: at uhub0, port 6, addr 2 
(disconnected) 

Jun 26 08:15:31 limbo kernel: (da0:umass-sim0:0:0:0): lost device - 0 
outstanding, 0 refs 

Jun 26 08:15:31 limbo kernel: (da0:umass-sim0:0:0:0): removing device 
entry 

Jun 26 08:15:31 limbo kernel: wakeup from sleeping state (slept 
00:00:19) 

Jun 26 08:15:31 limbo kernel: re0: link state changed to DOWN 
 

Jun 26 08:15:31 limbo kernel: uhub0: <VIA EHCI root HUB, class 9/0, rev 
2.00/1.00, addr 1> on usbus0 

Jun 26 08:15:31 limbo kernel: uhub1: <VIA UHCI root HUB, class 9/0, rev 
1.00/1.00, addr 1> on usbus2 

Jun 26 08:15:31 limbo kernel: uhub2: <VIA UHCI root HUB, class 9/0, rev 
1.00/1.00, addr 1> on usbus1 

Jun 26 08:15:31 limbo kernel: uhub3: <VIA UHCI root HUB, class 9/0, rev 
1.00/1.00, addr 1> on usbus3 

Jun 26 08:15:31 limbo kernel: uhub1: 2 ports with 2 removable, self 
powered 

Jun 26 08:15:31 limbo kernel: uhub2: 2 ports with 2 removable, self 
powered 

Jun 26 08:15:31 limbo kernel: uhub3: 2 ports with 2 removable, self 
powered 

Jun 26 08:15:31 limbo acpi: resumed at 20120626 08:15:31 
 

Jun 26 08:15:31 limbo kernel: re0: link state changed to UP 
 

Jun 26 08:15:32 limbo kernel: info: [drm] Loading R300 Microcode 
 

Jun 26 08:15:32 limbo kernel: info: [drm] Num pipes: 1 
 

Jun 26 08:15:33 limbo kernel: uhub0: 6 ports with 6 removable, self 
powered 

Jun 26 08:15:34 limbo kernel: ugen1.2: <Logitech> at usbus1 
 

Jun 26 08:15:34 limbo kernel: ums0: <Logitech USB-PS2 Optical Mouse, 
class 0/0, rev 2.00/11.10, addr 2> on usbus1 

Jun 26 08:15:34 limbo kernel: ums0: 3 buttons and [XYZ] coordinates ID=0 
 

Jun 26 08:15:35 limbo kernel: ugen3.2: <Broadcom> at usbus3 
 

Jun 26 08:15:35 limbo kernel: uhub4: <Broadcom BCM2035B0, class 9/0, rev 
1.10/1.00, addr 2> on usbus3 

Jun 26 08:15:36 limbo kernel: ugen0.2: <Kingston> at usbus0
Jun 26 08:15:36 limbo kernel: umass0: <Kingston DataTraveler SE9, class 
0/0, rev 2.00/1.00, addr 2> on usbus0
Jun 26 08:15:36 limbo kernel: umass0:  SCSI over Bulk-Only; quirks = 0x4100
Jun 26 08:15:36 limbo kernel: umass0:5:0:-1: Attached to scbus5
Jun 26 08:15:36 limbo kernel: da0 at umass-sim0 bus 0 scbus5 target 0 lun 0
Jun 26 08:15:36 limbo kernel: da0: <Kingston DataTraveler SE9 PMAP> 
Removable Direct Access SCSI-0 device
Jun 26 08:15:36 limbo kernel: da0: 40.000MB/s transfers
Jun 26 08:15:36 limbo kernel: da0: 7441MB (15240576 512 byte sectors: 
255H 63S/T 948C)
Jun 26 08:15:36 limbo kernel: uhub4: 3 ports with 0 removable, bus powered
Jun 26 08:15:36 limbo kernel: ugen3.3: <vendor 0x0a12> at usbus3
Jun 26 08:15:36 limbo kernel: ubt0: <vendor 0x0a12 product 0x0001, class 
224/1, rev 1.10/1.01, addr 3> on usbus3
Jun 26 08:15:37 limbo kernel: ugen3.4: <vendor 0x0a5c> at usbus3
Jun 26 08:15:37 limbo kernel: ukbd0: <vendor 0x0a5c HIDK, class 0/0, rev 
1.10/1.00, addr 4> on usbus3
Jun 26 08:15:37 limbo kernel: kbd2 at ukbd0
Jun 26 08:15:38 limbo kernel: ugen3.5: <vendor 0x0a5c> at usbus3
Jun 26 08:15:38 limbo kernel: ums1: <vendor 0x0a5c HIDM, class 0/0, rev 
1.10/1.00, addr 5> on usbus3
Jun 26 08:15:38 limbo kernel: ums1: 3 buttons and [XY] coordinates ID=0
Jun 26 08:16:44 limbo kernel: ugen0.2: <Kingston> at usbus0 (disconnected)
Jun 26 08:16:44 limbo kernel: umass0: at uhub0, port 6, addr 2 
(disconnected)
Jun 26 08:16:44 limbo kernel: (da0:umass-sim0:0:0:0): lost device - 0 
outstanding, 0 refs
Jun 26 08:16:44 limbo kernel: (da0:umass-sim0:0:0:0): removing device entry
Jun 26 08:17:03 limbo kernel: info: [drm] Num pipes: 1
Jun 26 08:17:23 limbo kernel: info: [drm] Setting GART location based on 
new memory map
Jun 26 08:17:23 limbo kernel: info: [drm] Loading R300 Microcode
Jun 26 08:17:23 limbo kernel: info: [drm] Num pipes: 1
Jun 26 08:17:23 limbo kernel: info: [drm] writeback test succeeded in 1 
usecs

Works like a charm.

-- 
Sphinx of black quartz judge my vow.

freebsd stable - Jun 2012 - [CFT] radeon_suspend/resume patch

[CFT] radeon_suspend/resume patch

[CFT] radeon_suspend/resume patch

[CFT] radeon_suspend/resume patch

[CFT] radeon_suspend/resume patch