releases/3.6.2/drm-radeon-only-adjust-default-clocks-on-ni-gpus.patch

   1 From 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 Mon Sep 17 00:00:00 2001
   2 From: Alex Deucher <alexander.deucher@amd.com>
   3 Date: Fri, 14 Sep 2012 10:59:26 -0400
   4 Subject: drm/radeon: only adjust default clocks on NI GPUs
   5
   6 From: Alex Deucher <alexander.deucher@amd.com>
   7
   8 commit 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 upstream.
   9
  10 SI asics store voltage information differently so we
  11 don't have a way to deal with it properly yet.
  12
  13 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15
  16 ---
  17  drivers/gpu/drm/radeon/radeon_pm.c |    8 ++++++--
  18  1 file changed, 6 insertions(+), 2 deletions(-)
  19
  20 --- a/drivers/gpu/drm/radeon/radeon_pm.c
  21 +++ b/drivers/gpu/drm/radeon/radeon_pm.c
  22 @@ -547,7 +547,9 @@ void radeon_pm_suspend(struct radeon_dev
  23  void radeon_pm_resume(struct radeon_device *rdev)
  24  {
  25         /* set up the default clocks if the MC ucode is loaded */
  26 -       if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {
  27 +       if ((rdev->family >= CHIP_BARTS) &&
  28 +           (rdev->family <= CHIP_CAYMAN) &&
  29 +           rdev->mc_fw) {
  30                 if (rdev->pm.default_vddc)
  31                         radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
  32                                                 SET_VOLTAGE_TYPE_ASIC_VDDC);
  33 @@ -602,7 +604,9 @@ int radeon_pm_init(struct radeon_device
  34                 radeon_pm_print_states(rdev);
  35                 radeon_pm_init_profile(rdev);
  36                 /* set up the default clocks if the MC ucode is loaded */
  37 -               if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {
  38 +               if ((rdev->family >= CHIP_BARTS) &&
  39 +                   (rdev->family <= CHIP_CAYMAN) &&
  40 +                   rdev->mc_fw) {
  41                         if (rdev->pm.default_vddc)
  42                                 radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
  43                                                         SET_VOLTAGE_TYPE_ASIC_VDDC);