7 files changed, 13 insertions, 5 deletions

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 2583ddfcc33e..88910e5a2c77 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -60,6 +60,7 @@ config DRM_RADEON
         select FW_LOADER
         select DRM_KMS_HELPER
         select DRM_TTM
+        select POWER_SUPPLY
         help
           Choose this option if you have an ATI Radeon graphics card.  There
           are both PCI and AGP versions.  You don't need to choose this to
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index dfd4f3677f3b..f569ae88ab38 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -587,7 +587,7 @@ static struct drm_display_mode drm_dmt_modes[] = {
                    1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
         /* 1600x1200@75Hz */
-        { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 2025000, 1600, 1664,
+        { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 202500, 1600, 1664,
                    1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
                    DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
         /* 1600x1200@85Hz */
diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
index 80c5b3ea28b4..1c02d23f6fcc 100644
--- a/drivers/gpu/drm/radeon/Kconfig
+++ b/drivers/gpu/drm/radeon/Kconfig
@@ -1,7 +1,6 @@
 config DRM_RADEON_KMS
         bool "Enable modesetting on radeon by default - NEW DRIVER"
         depends on DRM_RADEON
-        depends on POWER_SUPPLY
         help
           Choose this option if you want kernel modesetting enabled by default.
 
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 5c9ce2beaca3..66a37fb75839 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -261,6 +261,7 @@ struct radeon_bo_list {
         unsigned                rdomain;
         unsigned                wdomain;
         u32                     tiling_flags;
+        bool                    reserved;
 };
 
 /*
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index da85cad1152b..1006549d1570 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -983,8 +983,11 @@ void radeon_update_display_priority(struct radeon_device *rdev)
                 /* set display priority to high for r3xx, rv515 chips
                  * this avoids flickering due to underflow to the
                  * display controllers during heavy acceleration.
+                 * Don't force high on rs4xx igp chips as it seems to
+                 * affect the sound card.  See kernel bug 15982.
                  */
-                if (ASIC_IS_R300(rdev) || (rdev->family == CHIP_RV515))
+                if ((ASIC_IS_R300(rdev) || (rdev->family == CHIP_RV515)) &&
+                    !(rdev->flags & RADEON_IS_IGP))
                         rdev->disp_priority = 2;
                 else
                         rdev->disp_priority = 0;
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index a8d18bcae7db..d5b9373ce06c 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -301,6 +301,7 @@ int radeon_bo_list_reserve(struct list_head *head)
                 r = radeon_bo_reserve(lobj->bo, false);
                 if (unlikely(r != 0))
                         return r;
+                lobj->reserved = true;
         }
         return 0;
 }
@@ -311,7 +312,7 @@ void radeon_bo_list_unreserve(struct list_head *head)
 
         list_for_each_entry(lobj, head, list) {
                 /* only unreserve object we successfully reserved */
-                if (radeon_bo_is_reserved(lobj->bo))
+                if (lobj->reserved && radeon_bo_is_reserved(lobj->bo))
                         radeon_bo_unreserve(lobj->bo);
         }
 }
@@ -322,6 +323,9 @@ int radeon_bo_list_validate(struct list_head *head)
         struct radeon_bo *bo;
         int r;
 
+        list_for_each_entry(lobj, head, list) {
+                lobj->reserved = false;
+        }
         r = radeon_bo_list_reserve(head);
         if (unlikely(r != 0)) {
                 return r;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 3aa3a65800ab..e9918d88f5b0 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -451,7 +451,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
                         /* RADEON_IS_AGP is set only if AGP is active */
                         mem->bus.offset = mem->mm_node->start << PAGE_SHIFT;
                         mem->bus.base = rdev->mc.agp_base;
-                        mem->bus.is_iomem = true;
+                        mem->bus.is_iomem = !rdev->ddev->agp->cant_use_aperture;
                 }
 #endif
                 break;