projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/radeon: Store PCI controller in struct radeon_device.hose
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_kms.c
diff --git
a/drivers/gpu/drm/radeon/radeon_kms.c
b/drivers/gpu/drm/radeon/radeon_kms.c
index
50cee48
..
2479d6a
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_kms.c
+++ b/
drivers/gpu/drm/radeon/radeon_kms.c
@@
-76,7
+76,7
@@
void radeon_driver_unload_kms(struct drm_device *dev)
}
radeon_acpi_fini(rdev);
}
radeon_acpi_fini(rdev);
-
+
radeon_modeset_fini(rdev);
radeon_device_fini(rdev);
radeon_modeset_fini(rdev);
radeon_device_fini(rdev);
@@
-105,6
+105,7
@@
done_free:
*/
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
{
*/
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
{
+ struct pci_dev *pdev = to_pci_dev(dev->dev);
struct radeon_device *rdev;
int r, acpi_status;
struct radeon_device *rdev;
int r, acpi_status;
@@
-114,10
+115,14
@@
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
}
dev->dev_private = (void *)rdev;
}
dev->dev_private = (void *)rdev;
+#ifdef __alpha__
+ rdev->hose = pdev->sysdata;
+#endif
+
/* update BUS flag */
/* update BUS flag */
- if (pci_find_capability(
dev->
pdev, PCI_CAP_ID_AGP)) {
+ if (pci_find_capability(pdev, PCI_CAP_ID_AGP)) {
flags |= RADEON_IS_AGP;
flags |= RADEON_IS_AGP;
- } else if (pci_is_pcie(
dev->
pdev)) {
+ } else if (pci_is_pcie(pdev)) {
flags |= RADEON_IS_PCIE;
} else {
flags |= RADEON_IS_PCI;
flags |= RADEON_IS_PCIE;
} else {
flags |= RADEON_IS_PCI;
@@
-126,7
+131,7
@@
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
if ((radeon_runtime_pm != 0) &&
radeon_has_atpx() &&
((flags & RADEON_IS_IGP) == 0) &&
if ((radeon_runtime_pm != 0) &&
radeon_has_atpx() &&
((flags & RADEON_IS_IGP) == 0) &&
- !pci_is_thunderbolt_attached(
dev->
pdev))
+ !pci_is_thunderbolt_attached(pdev))
flags |= RADEON_IS_PX;
/* radeon_device_init should report only fatal error
flags |= RADEON_IS_PX;
/* radeon_device_init should report only fatal error
@@
-135,9
+140,9
@@
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
* properly initialize the GPU MC controller and permit
* VRAM allocation
*/
* properly initialize the GPU MC controller and permit
* VRAM allocation
*/
- r = radeon_device_init(rdev, dev,
dev->
pdev, flags);
+ r = radeon_device_init(rdev, dev, pdev, flags);
if (r) {
if (r) {
- dev_err(
&dev->p
dev->dev, "Fatal error during GPU init\n");
+ dev_err(dev->dev, "Fatal error during GPU init\n");
goto out;
}
goto out;
}
@@
-147,7
+152,7
@@
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
*/
r = radeon_modeset_init(rdev);
if (r)
*/
r = radeon_modeset_init(rdev);
if (r)
- dev_err(
&dev->p
dev->dev, "Fatal error during modeset init\n");
+ dev_err(dev->dev, "Fatal error during modeset init\n");
/* Call ACPI methods: require modeset init
* but failure is not fatal
/* Call ACPI methods: require modeset init
* but failure is not fatal
@@
-155,8
+160,7
@@
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)
if (!r) {
acpi_status = radeon_acpi_init(rdev);
if (acpi_status)
if (!r) {
acpi_status = radeon_acpi_init(rdev);
if (acpi_status)
- dev_dbg(&dev->pdev->dev,
- "Error during ACPI methods call\n");
+ dev_dbg(dev->dev, "Error during ACPI methods call\n");
}
if (radeon_is_px(dev)) {
}
if (radeon_is_px(dev)) {
@@
-239,7
+243,7
@@
int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
switch (info->request) {
case RADEON_INFO_DEVICE_ID:
switch (info->request) {
case RADEON_INFO_DEVICE_ID:
- *value =
dev->pdev
->device;
+ *value =
to_pci_dev(dev->dev)
->device;
break;
case RADEON_INFO_NUM_GB_PIPES:
*value = rdev->num_gb_pipes;
break;
case RADEON_INFO_NUM_GB_PIPES:
*value = rdev->num_gb_pipes;