[PATCH 2/2] drm/radeon: only enable kv/kb dpm interrupts once v2

[Alex Deucher]

On Tue, Feb 10, 2015 at 8:26 AM, Christian König
<deathsimple at vodafone.de> wrote:
> From: Alex Deucher <alexander.deucher at amd.com>
>
> Enable at init and disable on fini. Workaround for hardware problems.
>
> v2 (chk): extend commit message
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> Cc: stable at vger.kernel.org

Applied a slightly modified version of this.

Alex

> ---
>  drivers/gpu/drm/radeon/cik.c    | 21 ---------------------
>  drivers/gpu/drm/radeon/kv_dpm.c | 12 ++++++++++--
>  2 files changed, 10 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 5594416..e6a4ba2 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -7373,7 +7373,6 @@ int cik_irq_set(struct radeon_device *rdev)
>         u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6;
>         u32 grbm_int_cntl = 0;
>         u32 dma_cntl, dma_cntl1;
> -       u32 thermal_int;
>
>         if (!rdev->irq.installed) {
>                 WARN(1, "Can't enable IRQ/MSI because no handler is installed\n");
> @@ -7403,13 +7402,6 @@ int cik_irq_set(struct radeon_device *rdev)
>
>         cp_m1p0 = RREG32(CP_ME1_PIPE0_INT_CNTL) & ~TIME_STAMP_INT_ENABLE;
>
> -       if (rdev->flags & RADEON_IS_IGP)
> -               thermal_int = RREG32_SMC(CG_THERMAL_INT_CTRL) &
> -                       ~(THERM_INTH_MASK | THERM_INTL_MASK);
> -       else
> -               thermal_int = RREG32_SMC(CG_THERMAL_INT) &
> -                       ~(THERM_INT_MASK_HIGH | THERM_INT_MASK_LOW);
> -
>         /* enable CP interrupts on all rings */
>         if (atomic_read(&rdev->irq.ring_int[RADEON_RING_TYPE_GFX_INDEX])) {
>                 DRM_DEBUG("cik_irq_set: sw int gfx\n");
> @@ -7513,14 +7505,6 @@ int cik_irq_set(struct radeon_device *rdev)
>                 hpd6 |= DC_HPDx_INT_EN;
>         }
>
> -       if (rdev->irq.dpm_thermal) {
> -               DRM_DEBUG("dpm thermal\n");
> -               if (rdev->flags & RADEON_IS_IGP)
> -                       thermal_int |= THERM_INTH_MASK | THERM_INTL_MASK;
> -               else
> -                       thermal_int |= THERM_INT_MASK_HIGH | THERM_INT_MASK_LOW;
> -       }
> -
>         WREG32(CP_INT_CNTL_RING0, cp_int_cntl);
>
>         WREG32(SDMA0_CNTL + SDMA0_REGISTER_OFFSET, dma_cntl);
> @@ -7567,11 +7551,6 @@ int cik_irq_set(struct radeon_device *rdev)
>         WREG32(DC_HPD5_INT_CONTROL, hpd5);
>         WREG32(DC_HPD6_INT_CONTROL, hpd6);
>
> -       if (rdev->flags & RADEON_IS_IGP)
> -               WREG32_SMC(CG_THERMAL_INT_CTRL, thermal_int);
> -       else
> -               WREG32_SMC(CG_THERMAL_INT, thermal_int);
> -
>         return 0;
>  }
>
> diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
> index c5eb286..d316758 100644
> --- a/drivers/gpu/drm/radeon/kv_dpm.c
> +++ b/drivers/gpu/drm/radeon/kv_dpm.c
> @@ -1272,6 +1272,7 @@ int kv_dpm_enable(struct radeon_device *rdev)
>  int kv_dpm_late_enable(struct radeon_device *rdev)
>  {
>         int ret = 0;
> +       u32 thermal_int;
>
>         if (rdev->irq.installed &&
>             r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
> @@ -1280,8 +1281,9 @@ int kv_dpm_late_enable(struct radeon_device *rdev)
>                         DRM_ERROR("kv_set_thermal_temperature_range failed\n");
>                         return ret;
>                 }
> -               rdev->irq.dpm_thermal = true;
> -               radeon_irq_set(rdev);
> +               thermal_int = RREG32_SMC(CG_THERMAL_INT_CTRL);
> +               thermal_int |= THERM_INTH_MASK | THERM_INTL_MASK;
> +               WREG32_SMC(CG_THERMAL_INT_CTRL, thermal_int);
>         }
>
>         /* powerdown unused blocks for now */
> @@ -1295,6 +1297,8 @@ int kv_dpm_late_enable(struct radeon_device *rdev)
>
>  void kv_dpm_disable(struct radeon_device *rdev)
>  {
> +       u32 thermal_int;
> +
>         kv_smc_bapm_enable(rdev, false);
>
>         if (rdev->family == CHIP_MULLINS)
> @@ -1313,6 +1317,10 @@ void kv_dpm_disable(struct radeon_device *rdev)
>         kv_enable_ulv(rdev, false);
>         kv_reset_am(rdev);
>
> +       thermal_int = RREG32_SMC(CG_THERMAL_INT_CTRL) &
> +               ~(THERM_INTH_MASK | THERM_INTL_MASK);
> +       WREG32_SMC(CG_THERMAL_INT_CTRL, thermal_int);
> +
>         kv_update_current_ps(rdev, rdev->pm.dpm.boot_ps);
>  }
>
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-drm-radeon-only-enable-kv-kb-dpm-interrupts-once-v3.patch
Type: text/x-diff
Size: 3723 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20150210/b7f2e814/attachment.patch>