lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 108/163] drm/radeon/px: fix module unload
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 2e97140dd58cab8772bf77d73eabda213e45202d upstream.

    Use the new vga_switcheroo_fini_domain_pm_ops function
    to unregister the pm ops.

    Based on a patch from:
    Pali Rohár <pali.rohar@gmail.com>

    bug:
    https://bugzilla.kernel.org/show_bug.cgi?id=84431

    Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
    Cc: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/radeon/radeon_device.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
    index 716293c..974f710 100644
    --- a/drivers/gpu/drm/radeon/radeon_device.c
    +++ b/drivers/gpu/drm/radeon/radeon_device.c
    @@ -1309,7 +1309,7 @@ int radeon_device_init(struct radeon_device *rdev,

    r = radeon_init(rdev);
    if (r)
    - return r;
    + goto failed;

    r = radeon_ib_ring_tests(rdev);
    if (r)
    @@ -1329,7 +1329,7 @@ int radeon_device_init(struct radeon_device *rdev,
    radeon_agp_disable(rdev);
    r = radeon_init(rdev);
    if (r)
    - return r;
    + goto failed;
    }
    if ((radeon_testing & 1)) {
    if (rdev->accel_working)
    @@ -1350,6 +1350,11 @@ int radeon_device_init(struct radeon_device *rdev,
    DRM_INFO("radeon: acceleration disabled, skipping benchmarks\n");
    }
    return 0;
    +
    +failed:
    + if (runtime)
    + vga_switcheroo_fini_domain_pm_ops(rdev->dev);
    + return r;
    }

    static void radeon_debugfs_remove_files(struct radeon_device *rdev);
    @@ -1370,6 +1375,8 @@ void radeon_device_fini(struct radeon_device *rdev)
    radeon_bo_evict_vram(rdev);
    radeon_fini(rdev);
    vga_switcheroo_unregister_client(rdev->pdev);
    + if (rdev->flags & RADEON_IS_PX)
    + vga_switcheroo_fini_domain_pm_ops(rdev->dev);
    vga_client_register(rdev->pdev, NULL, NULL, NULL);
    if (rdev->rio_mem)
    pci_iounmap(rdev->pdev, rdev->rio_mem);
    --
    1.9.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-10-09 23:41    [W:4.065 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site