Date: Fri, 23 Oct 2015 07:29:37 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r289785 - stable/9/sys/dev/drm2/radeon Message-ID: <201510230729.t9N7TbmS064837@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Oct 23 07:29:37 2015 New Revision: 289785 URL: https://svnweb.freebsd.org/changeset/base/289785 Log: MFC r287673: radeon_suspend_kms: don't mess with pci state Patch adjusted for FREEBSD_WIP vs DUMBBELL_WIP. Modified: stable/9/sys/dev/drm2/radeon/radeon_device.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/drm2/radeon/radeon_device.c ============================================================================== --- stable/9/sys/dev/drm2/radeon/radeon_device.c Fri Oct 23 07:25:14 2015 (r289784) +++ stable/9/sys/dev/drm2/radeon/radeon_device.c Fri Oct 23 07:29:37 2015 (r289785) @@ -1316,14 +1316,10 @@ int radeon_suspend_kms(struct drm_device radeon_agp_suspend(rdev); - pci_save_state(device_get_parent(rdev->dev)); #ifdef DUMBBELL_WIP if (state.event == PM_EVENT_SUSPEND) { /* Shut down the device */ pci_disable_device(dev->pdev); -#endif /* DUMBBELL_WIP */ - pci_set_powerstate(dev->device, PCI_POWERSTATE_D3); -#ifdef DUMBBELL_WIP } console_lock(); #endif /* DUMBBELL_WIP */ @@ -1354,10 +1350,6 @@ int radeon_resume_kms(struct drm_device #ifdef DUMBBELL_WIP console_lock(); -#endif /* DUMBBELL_WIP */ - pci_set_powerstate(dev->device, PCI_POWERSTATE_D0); - pci_restore_state(device_get_parent(rdev->dev)); -#ifdef DUMBBELL_WIP if (pci_enable_device(dev->pdev)) { console_unlock(); return -1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510230729.t9N7TbmS064837>