lkml.org 
[lkml]   [2012]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 56/84] drm/radeon: only adjust default clocks on NI GPUs
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alex Deucher <alexander.deucher@amd.com>

    commit 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 upstream.

    SI asics store voltage information differently so we
    don't have a way to deal with it properly yet.

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/radeon/radeon_pm.c
    +++ b/drivers/gpu/drm/radeon/radeon_pm.c
    @@ -535,7 +535,9 @@ void radeon_pm_suspend(struct radeon_dev
    void radeon_pm_resume(struct radeon_device *rdev)
    {
    /* set up the default clocks if the MC ucode is loaded */
    - if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {
    + if ((rdev->family >= CHIP_BARTS) &&
    + (rdev->family <= CHIP_CAYMAN) &&
    + rdev->mc_fw) {
    if (rdev->pm.default_vddc)
    radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
    SET_VOLTAGE_TYPE_ASIC_VDDC);
    @@ -590,7 +592,9 @@ int radeon_pm_init(struct radeon_device
    radeon_pm_print_states(rdev);
    radeon_pm_init_profile(rdev);
    /* set up the default clocks if the MC ucode is loaded */
    - if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) {
    + if ((rdev->family >= CHIP_BARTS) &&
    + (rdev->family <= CHIP_CAYMAN) &&
    + rdev->mc_fw) {
    if (rdev->pm.default_vddc)
    radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
    SET_VOLTAGE_TYPE_ASIC_VDDC);



    \
     
     \ /
      Last update: 2012-10-11 05:01    [W:4.065 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site