diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-11-02 10:29:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-02 10:29:47 +1000 |
| commit | b7a46dcf7ae58c079a719038b22d97c654b8b30a (patch) | |
| tree | cbe92657fed1fdf0e8d47fe27c6681d07a30e017 /drivers/gpu/drm/radeon/radeon_atpx_handler.c | |
| parent | 9c275407a354bf8c61e895f5c233397506d705aa (diff) | |
| parent | 6d9cdfc27115b5d4a32906b25a6b2f89920b0366 (diff) | |
| download | linux-b7a46dcf7ae58c079a719038b22d97c654b8b30a.tar.bz2 | |
Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
Alex writes:
"This request is mostly load detection fixes from Egbert and me."
* 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux:
drm/radeon: add load detection support for ext DAC on R200 (v2)
DRM/radeon: For single CRTC GPUs move handling of CRTC_CRT_ON to crtc_dpms().
DRM/Radeon: Fix TV DAC Load Detection for single CRTC chips.
DRM/Radeon: Clean up code in TV DAC load detection.
drm/radeon: fix ATPX function documentation
drivers/gpu/drm/radeon/evergreen_cs.c: Remove unnecessary semicolon
DRM/Radeon: On DVI-I use Load Detection when EDID is bogus.
DRM/Radeon: Fix primary DAC Load Detection for RV100 chips.
DRM/Radeon: Fix Load Detection on legacy primary DAC.
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atpx_handler.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index 37f6a907aea4..15f5ded65e0c 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c @@ -352,9 +352,9 @@ static int radeon_atpx_switchto(enum vga_switcheroo_client_id id) } /** - * radeon_atpx_switchto - switch to the requested GPU + * radeon_atpx_power_state - power down/up the requested GPU * - * @id: GPU to switch to + * @id: GPU to power down/up * @state: requested power state (0 = off, 1 = on) * * Execute the necessary ATPX function to power down/up the discrete GPU |