drm/radeon: Store PCI controller in struct radeon_device.hose

[linux-2.6-microblaze.git] / drivers / gpu / drm / radeon / radeon_cs.c

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index c6262fc..35e937d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -130,8 +130,7 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                 * IGP chips to avoid image corruptions
                 */
                if (p->ring == R600_RING_TYPE_UVD_INDEX &&
-                   (i <= 0 || pci_find_capability(p->rdev->ddev->pdev,
-                                                  PCI_CAP_ID_AGP) ||
+                   (i <= 0 || pci_find_capability(p->rdev->pdev, PCI_CAP_ID_AGP) ||
                     p->rdev->family == CHIP_RS780 ||
                     p->rdev->family == CHIP_RS880)) {
 
@@ -401,7 +400,8 @@ static int cmp_size_smaller_first(void *priv, struct list_head *a,
        struct radeon_bo_list *lb = list_entry(b, struct radeon_bo_list, tv.head);
 
        /* Sort A before B if A is smaller. */
-       return (int)la->robj->tbo.num_pages - (int)lb->robj->tbo.num_pages;
+       return (int)la->robj->tbo.mem.num_pages -
+               (int)lb->robj->tbo.mem.num_pages;
 }
 
 /**