Hyperion Entertainment Message Boards

Code: Select all

    diff -rupN linux-3.14/drivers/gpu/drm/radeon/radeon_pm.c linux-3.14-nemo/drivers/gpu/drm/radeon/radeon_pm.c
    --- linux-3.14/drivers/gpu/drm/radeon/radeon_pm.c   2014-02-03 01:42:13.000000000 +0100
    +++ linux-3.14-nemo/drivers/gpu/drm/radeon/radeon_pm.c   2014-02-03 14:37:31.468243027 +0100
    @@ -223,7 +223,10 @@ static void radeon_set_power_state(struc
           /* set memory clock */
           if (rdev->asic->pm.set_memory_clock && (mclk != rdev->pm.current_mclk)) {
              radeon_pm_debug_check_in_vbl(rdev, false);
    +               /* D.Stevens 2012 for the A-EON AmigaOne X1000: Setting memory clock only works on CAICOS and 6570, don't set for anything else (We ignore 6570 here */
    +               if (rdev->family == CHIP_CAICOS) {
              radeon_set_memory_clock(rdev, mclk);
    +               }
              radeon_pm_debug_check_in_vbl(rdev, true);
              rdev->pm.current_mclk = mclk;
              DRM_DEBUG_DRIVER("Setting: m: %d\n", mclk);
    @@ -1005,7 +1008,7 @@ static void radeon_pm_resume_old(struct
                       SET_VOLTAGE_TYPE_ASIC_VDDCI);
           if (rdev->pm.default_sclk)
              radeon_set_engine_clock(rdev, rdev->pm.default_sclk);
    -      if (rdev->pm.default_mclk)
    +      if (rdev->pm.default_mclk && (rdev->family == CHIP_CAICOS))     /* Fix for PPC systems HD6000 >6570 by A-EON Core Linux Support Team */   
              radeon_set_memory_clock(rdev, rdev->pm.default_mclk);
        }
        /* asic init will reset the default power state */
    @@ -1057,7 +1060,7 @@ dpm_resume_fail:
                       SET_VOLTAGE_TYPE_ASIC_VDDCI);
           if (rdev->pm.default_sclk)
              radeon_set_engine_clock(rdev, rdev->pm.default_sclk);
    -      if (rdev->pm.default_mclk)
    +      if (rdev->pm.default_mclk && (rdev->family == CHIP_CAICOS))     /* Fix for PPC & > HD6570 by A-EON Linux Core Support Team */   
              radeon_set_memory_clock(rdev, rdev->pm.default_mclk);
        }
     }
    @@ -1104,7 +1107,7 @@ static int radeon_pm_init_old(struct rad
                          SET_VOLTAGE_TYPE_ASIC_VDDCI);
              if (rdev->pm.default_sclk)
                 radeon_set_engine_clock(rdev, rdev->pm.default_sclk);
    -         if (rdev->pm.default_mclk)
    +         if (rdev->pm.default_mclk && (rdev->family == CHIP_CAICOS))     // D.Stevens 2013: fix for >HD6570 on PPC   
                 radeon_set_memory_clock(rdev, rdev->pm.default_mclk);
           }
        }
    @@ -1217,7 +1220,7 @@ dpm_failed:
                       SET_VOLTAGE_TYPE_ASIC_VDDCI);
           if (rdev->pm.default_sclk)
              radeon_set_engine_clock(rdev, rdev->pm.default_sclk);
    -      if (rdev->pm.default_mclk)
    +      if (rdev->pm.default_mclk && (rdev->family == CHIP_CAICOS))  // D.Stevens 2013: Fix for >HD6570 on ppc   
              radeon_set_memory_clock(rdev, rdev->pm.default_mclk);
        }
        DRM_ERROR("radeon: dpm initialization failed\n");

Code: Select all

diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 49b0659..fa33568 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1066,7 +1066,7 @@ int radeon_device_init(struct radeon_device *rdev,
 	if (rdev->rmmio == NULL) {
 		return -ENOMEM;
 	}
-	DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)rdev->rmmio_base);
+	DRM_INFO("register mmio base: 0x%llx\n", (uint64_t)rdev->rmmio_base);
 	DRM_INFO("register mmio size: %u\n", (unsigned)rdev->rmmio_size);
 
 	/* io port mapping */
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index 3cb5d84..fcdb208 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -81,7 +81,7 @@ struct ttm_placement {
  */
 struct ttm_bus_placement {
 	void		*addr;
-	unsigned long	base;
+	phys_addr_t	base;
 	unsigned long	size;
 	unsigned long	offset;
 	bool		is_iomem;