diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-08 10:19:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-08 10:19:59 +1000 |
| commit | eaee8ec4eb031cda0003ec4c893058c54db20ee4 (patch) | |
| tree | bc62c4ae4048788115b8931fe3ba3a74fa75af24 /drivers/gpu/drm/radeon/kv_dpm.c | |
| parent | f6624888a518c4bdd1fd0f9a1d0c5a6969ff283d (diff) | |
| parent | dd5a74f2f982193620cfa1ef609df1ee805781d4 (diff) | |
| download | op-kernel-dev-eaee8ec4eb031cda0003ec4c893058c54db20ee4.zip op-kernel-dev-eaee8ec4eb031cda0003ec4c893058c54db20ee4.tar.gz | |
Merge branch 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
some minor radeon fixes.
* 'drm-fixes-3.19' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: integer underflow in radeon_cp_dispatch_texture()
drm/radeon: adjust default bapm settings for KV
drm/radeon: properly filter DP1.2 4k modes on non-DP1.2 hw
drm/radeon: fix sad_count check for dce3
drm/radeon: KV has three PPLLs (v2)
Diffstat (limited to 'drivers/gpu/drm/radeon/kv_dpm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/kv_dpm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c index 9b42001..e3e9c10 100644 --- a/drivers/gpu/drm/radeon/kv_dpm.c +++ b/drivers/gpu/drm/radeon/kv_dpm.c @@ -2745,13 +2745,11 @@ int kv_dpm_init(struct radeon_device *rdev) pi->enable_auto_thermal_throttling = true; pi->disable_nb_ps3_in_battery = false; if (radeon_bapm == -1) { - /* There are stability issues reported on with - * bapm enabled on an asrock system. - */ - if (rdev->pdev->subsystem_vendor == 0x1849) - pi->bapm_enable = false; - else + /* only enable bapm on KB, ML by default */ + if (rdev->family == CHIP_KABINI || rdev->family == CHIP_MULLINS) pi->bapm_enable = true; + else + pi->bapm_enable = false; } else if (radeon_bapm == 0) { pi->bapm_enable = false; } else { |
