[Intel-gfx] [PATCH] drm/i915: Skip fbdev core suspend/resume when fbdev emulation is disabled.

Bob Paauwe bob.j.paauwe at intel.com
Tue Jun 28 15:42:01 UTC 2016


When fbdev emulation is disabled it is not a good idea to call into
the core fb_set_suspend() function as this will cause suspend and
resume to fail. Also ifbdev->fb is null so the defeference farther
down will oops. Nothing in that path is needed in this case so bail
early when ifbdev->fb is null.

Signed-off-by: Bob Paauwe <bob.j.paauwe at intel.com>
---
 drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index b75484a..9b14c13 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -767,7 +767,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
 	struct intel_fbdev *ifbdev = dev_priv->fbdev;
 	struct fb_info *info;
 
-	if (!ifbdev)
+	if (!ifbdev || !ifbdev->fb)
 		return;
 
 	info = ifbdev->helper.fbdev;
-- 
2.5.5



More information about the Intel-gfx mailing list