From 91ff8cc95f394d93f34d700c2a5386284fea6ae7 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Fri, 25 Jan 2013 16:59:13 -0200 Subject: [PATCH] --- yaml --- r: 358055 b: refs/heads/master c: 56e5a3f043f0440cc0cce288e71134d1cb1b44a7 h: refs/heads/master i: 358053: a53919ed9eeb3cac5b2485dbd0fd4c290c35c409 358051: 66fb21d41290ceef1a9d3995cd268fe144bd0a03 358047: 5360f337d030407ca855f1aa5788b13d1fc50882 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_fb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8128b439a47d..4d6d433e4fb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa42e23c1055a4549c433ac56ff869e441c973c8 +refs/heads/master: 56e5a3f043f0440cc0cce288e71134d1cb1b44a7 diff --git a/trunk/drivers/gpu/drm/i915/intel_fb.c b/trunk/drivers/gpu/drm/i915/intel_fb.c index ce5f54498426..6591029ac0d7 100644 --- a/trunk/drivers/gpu/drm/i915/intel_fb.c +++ b/trunk/drivers/gpu/drm/i915/intel_fb.c @@ -304,7 +304,8 @@ void intel_fb_restore_mode(struct drm_device *dev) /* Be sure to shut off any planes that may be active */ list_for_each_entry(plane, &config->plane_list, head) - plane->funcs->disable_plane(plane); + if (plane->enabled) + plane->funcs->disable_plane(plane); mutex_unlock(&dev->mode_config.mutex); }