From c5f85bf2d6e15df56dc9517c08bcab19bb1ff6b8 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Tue, 31 Jan 2012 19:06:25 -0600 Subject: [PATCH] --- yaml --- r: 287151 b: refs/heads/master c: 86698c20f71d488b32c49ed4687fb3cf8a88a5ca h: refs/heads/master i: 287149: 760668a4955c5f3acf1f9e7328e9e2a0eeadc508 287147: 6ed7c252b084dd1c47c853a305823c8f2833ab1c 287143: 7437046a2cae9aca87bb46f4df59c8c1433cf48b 287135: 8fb9c7698bc13bbe720908d60cfbe228cbcf8757 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_device.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dd9a1e117d68..6a6048bb0b88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebd80b941c72f9da9ffd54de70cc094b0511f26f +refs/heads/master: 86698c20f71d488b32c49ed4687fb3cf8a88a5ca diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c index cec51a5b69dd..49f7cb7e226b 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_device.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c @@ -883,6 +883,8 @@ int radeon_suspend_kms(struct drm_device *dev, pm_message_t state) if (dev->switch_power_state == DRM_SWITCH_POWER_OFF) return 0; + drm_kms_helper_poll_disable(dev); + /* turn off display hw */ list_for_each_entry(connector, &dev->mode_config.connector_list, head) { drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); @@ -972,6 +974,8 @@ int radeon_resume_kms(struct drm_device *dev) list_for_each_entry(connector, &dev->mode_config.connector_list, head) { drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON); } + + drm_kms_helper_poll_enable(dev); return 0; }