Alex Deucher c940b4476f drm/radeon: fix pm handling in radeon_gpu_reset ...

pm_suspend is handled in the radeon_suspend callbacks.
pm_resume has special handling depending on whether
dpm or legacy pm is enabled.  Change radeon_gpu_reset
to mirror the behavior in the suspend and resume
pathes.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org

2014-08-19 11:29:21 -04:00

..

accessibility

…

acpi

Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-08-14 18:13:46 -06:00

amba

…

ata

Merge branch 'akpm' (patchbomb from Andrew Morton)

2014-08-06 21:14:42 -07:00

atm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-08-13 18:27:40 -06:00

auxdisplay

…

base

Merge branch 'akpm' (patchbomb from Andrew Morton)

2014-08-06 21:14:42 -07:00

bcma

bcma: use NS prefix for names of Northstar specific cores

2014-07-31 13:45:32 -04:00

block

Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-08-14 18:10:33 -06:00

bluetooth

Bluetooth: Fix crash in the Marvell driver initialization codepath

2014-07-31 01:07:28 +02:00

bus

Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:34:32 -07:00

cdrom

…

char

virtio: rng: add derating factor for use by hwrng core

2014-08-15 10:26:01 +05:30

clk

Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:14:29 -07:00

clocksource

Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:14:29 -07:00

connector

…

cpufreq

Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-08-14 18:13:46 -06:00

cpuidle

Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-08-14 18:13:46 -06:00

crypto

Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-08-14 18:10:33 -06:00

dca

…

devfreq

…

dio

…

dma

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2014-08-11 07:14:01 -07:00

dma-buf

…

edac

Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

2014-08-15 17:56:45 -06:00

eisa

…

extcon

…

firewire

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2014-08-06 09:38:14 -07:00

firmware

kexec: support kexec/kdump on EFI systems

2014-08-08 15:57:33 -07:00

fmc

…

gpio

Merge tag 'gpio-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

2014-08-08 18:00:35 -07:00

gpu

drm/radeon: fix pm handling in radeon_gpu_reset

2014-08-19 11:29:21 -04:00

hid

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2014-08-15 18:16:28 -06:00

hsi

Merge tag 'hsi-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

2014-08-06 20:06:14 -07:00

hv

Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2014-08-04 17:32:24 -07:00

hwmon

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

2014-08-14 09:55:13 -06:00

hwspinlock

…

i2c

Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2014-08-09 09:15:07 -07:00

ide

ide: use module_platform_driver()

2014-08-05 21:16:46 -07:00

idle

intel_idle: Broadwell support

2014-08-15 17:06:40 -04:00

iio

Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2014-08-04 18:36:12 -07:00

infiniband

Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-08-14 18:10:33 -06:00

input

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2014-08-15 18:16:28 -06:00

iommu

Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:00:26 -07:00

ipack

…

irqchip

Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:14:29 -07:00

isdn

net: filter: split 'struct sk_filter' into socket and bpf parts

2014-08-02 15:03:58 -07:00

leds

Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:34:32 -07:00

lguest

mm/vmalloc.c: clean up map_vm_area third argument

2014-08-06 18:01:19 -07:00

macintosh

Merge tag 'backlight-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

2014-08-07 17:23:16 -07:00

mailbox

…

mcb

…

md

Merge tag 'dm-3.17-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

2014-08-14 09:17:56 -06:00

media

media: use pci_zalloc_consistent

2014-08-08 15:57:28 -07:00

memory

…

memstick

…

message

…

mfd

drivers/mfd/rtsx_usb.c: export device table

2014-08-14 10:56:15 -06:00

misc

Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:34:32 -07:00

mmc

Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-08-14 18:10:33 -06:00

mtd

Merge tag 'upstream-3.17-rc1' of git://git.infradead.org/linux-ubifs

2014-08-13 17:42:11 -06:00

net

Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-08-14 18:10:33 -06:00

nfc

…

ntb

…

nubus

…

of

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

2014-08-14 09:53:39 -06:00

oprofile

…

parisc

…

parport

drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO

2014-08-08 15:57:25 -07:00

pci

Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-08-14 18:10:33 -06:00

pcmcia

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2014-08-07 08:50:34 -07:00

phy

Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:34:32 -07:00

pinctrl

Merge tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:34:32 -07:00

platform

platform/x86: Enable build support for toshiba_haps

2014-08-16 01:23:56 -07:00

pnp

…

power

Merge tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:14:29 -07:00

powercap

…

pps

…

ps3

…

ptp

PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

2014-08-12 12:15:14 -06:00

pwm

Merge tag 'pwm/for-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2014-08-08 18:06:29 -07:00

rapidio

PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

2014-08-12 12:15:14 -06:00

ras

…

regulator

Merge tag 'mfd-for-linus-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2014-08-07 17:17:39 -07:00

remoteproc

…

reset

…

rpmsg

…

rtc

Merge branch 'akpm' (second patchbomb from Andrew Morton)

2014-08-08 15:57:47 -07:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2014-08-07 08:41:00 -07:00

sbus

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

2014-08-05 18:57:18 -07:00

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2014-08-15 18:28:58 -06:00

sfi

…

sh

…

sn

…

soc

…

spi

Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2014-08-08 11:00:26 -07:00

spmi

…

ssb

…

staging

Merge branch 'akpm' (second patchbomb from Andrew Morton)

2014-08-08 15:57:47 -07:00

target

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2014-08-06 20:10:32 -07:00

tc

…

thermal

…

thunderbolt

…

tty

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

2014-08-14 09:53:39 -06:00

uio

…

usb

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2014-08-06 21:03:53 -07:00

uwb

uwb/whci: use correct structure type name in sizeof

2014-08-01 15:48:08 -07:00

vfio

drivers/vfio: Enable VFIO if EEH is not supported

2014-08-08 10:39:16 -06:00

vhost

…

video

PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

2014-08-12 12:15:14 -06:00

virt

…

virtio

…

vlynq

…

vme

vme: bridges: use pci_zalloc_consistent

2014-08-08 15:57:30 -07:00

w1

…

watchdog

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2014-08-07 08:47:00 -07:00

xen

PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use

2014-08-12 12:15:14 -06:00

zorro

…

Kconfig

Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2014-08-04 17:32:24 -07:00

Makefile

Merge tag 'driver-core-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2014-08-04 18:34:04 -07:00