| radeon_device.c (254885) | radeon_device.c (255573) |
|---|---|
| 1/* 2 * Copyright 2008 Advanced Micro Devices, Inc. 3 * Copyright 2008 Red Hat Inc. 4 * Copyright 2009 Jerome Glisse. 5 * 6 * Permission is hereby granted, free of charge, to any person obtaining a 7 * copy of this software and associated documentation files (the "Software"), 8 * to deal in the Software without restriction, including without limitation --- 13 unchanged lines hidden (view full) --- 22 * OTHER DEALINGS IN THE SOFTWARE. 23 * 24 * Authors: Dave Airlie 25 * Alex Deucher 26 * Jerome Glisse 27 */ 28 29#include <sys/cdefs.h> | 1/* 2 * Copyright 2008 Advanced Micro Devices, Inc. 3 * Copyright 2008 Red Hat Inc. 4 * Copyright 2009 Jerome Glisse. 5 * 6 * Permission is hereby granted, free of charge, to any person obtaining a 7 * copy of this software and associated documentation files (the "Software"), 8 * to deal in the Software without restriction, including without limitation --- 13 unchanged lines hidden (view full) --- 22 * OTHER DEALINGS IN THE SOFTWARE. 23 * 24 * Authors: Dave Airlie 25 * Alex Deucher 26 * Jerome Glisse 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: head/sys/dev/drm2/radeon/radeon_device.c 254885 2013-08-25 19:37:15Z dumbbell $"); | 30__FBSDID("$FreeBSD: head/sys/dev/drm2/radeon/radeon_device.c 255573 2013-09-14 17:24:41Z dumbbell $"); |
| 31 32#include <dev/drm2/drmP.h> 33#include <dev/drm2/drm_crtc_helper.h> 34#include <dev/drm2/radeon/radeon_drm.h> 35#include "radeon_reg.h" 36#include "radeon.h" 37#include "atom.h" 38 --- 1272 unchanged lines hidden (view full) --- 1311 radeon_pm_suspend(rdev); 1312 radeon_suspend(rdev); 1313 radeon_hpd_fini(rdev); 1314 /* evict remaining vram memory */ 1315 radeon_bo_evict_vram(rdev); 1316 1317 radeon_agp_suspend(rdev); 1318 | 31 32#include <dev/drm2/drmP.h> 33#include <dev/drm2/drm_crtc_helper.h> 34#include <dev/drm2/radeon/radeon_drm.h> 35#include "radeon_reg.h" 36#include "radeon.h" 37#include "atom.h" 38 --- 1272 unchanged lines hidden (view full) --- 1311 radeon_pm_suspend(rdev); 1312 radeon_suspend(rdev); 1313 radeon_hpd_fini(rdev); 1314 /* evict remaining vram memory */ 1315 radeon_bo_evict_vram(rdev); 1316 1317 radeon_agp_suspend(rdev); 1318 |
| 1319 pci_save_state(dev->device); | 1319 pci_save_state(device_get_parent(rdev->dev)); |
| 1320#ifdef DUMBBELL_WIP 1321 if (state.event == PM_EVENT_SUSPEND) { 1322 /* Shut down the device */ 1323 pci_disable_device(dev->pdev); 1324#endif /* DUMBBELL_WIP */ 1325 pci_set_powerstate(dev->device, PCI_POWERSTATE_D3); 1326#ifdef DUMBBELL_WIP 1327 } --- 23 unchanged lines hidden (view full) --- 1351 1352 if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) 1353 return 0; 1354 1355#ifdef DUMBBELL_WIP 1356 console_lock(); 1357#endif /* DUMBBELL_WIP */ 1358 pci_set_powerstate(dev->device, PCI_POWERSTATE_D0); | 1320#ifdef DUMBBELL_WIP 1321 if (state.event == PM_EVENT_SUSPEND) { 1322 /* Shut down the device */ 1323 pci_disable_device(dev->pdev); 1324#endif /* DUMBBELL_WIP */ 1325 pci_set_powerstate(dev->device, PCI_POWERSTATE_D3); 1326#ifdef DUMBBELL_WIP 1327 } --- 23 unchanged lines hidden (view full) --- 1351 1352 if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) 1353 return 0; 1354 1355#ifdef DUMBBELL_WIP 1356 console_lock(); 1357#endif /* DUMBBELL_WIP */ 1358 pci_set_powerstate(dev->device, PCI_POWERSTATE_D0); |
| 1359 pci_restore_state(dev->device); | 1359 pci_restore_state(device_get_parent(rdev->dev)); |
| 1360#ifdef DUMBBELL_WIP 1361 if (pci_enable_device(dev->pdev)) { 1362 console_unlock(); 1363 return -1; 1364 } 1365#endif /* DUMBBELL_WIP */ 1366 /* resume AGP if in use */ 1367 radeon_agp_resume(rdev); --- 184 unchanged lines hidden --- | 1360#ifdef DUMBBELL_WIP 1361 if (pci_enable_device(dev->pdev)) { 1362 console_unlock(); 1363 return -1; 1364 } 1365#endif /* DUMBBELL_WIP */ 1366 /* resume AGP if in use */ 1367 radeon_agp_resume(rdev); --- 184 unchanged lines hidden --- |