From patchwork Sun Aug 12 14:53:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 1309781 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 59BC23FC33 for ; Sun, 12 Aug 2012 14:53:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751867Ab2HLOwo (ORCPT ); Sun, 12 Aug 2012 10:52:44 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:58986 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711Ab2HLOwm (ORCPT ); Sun, 12 Aug 2012 10:52:42 -0400 Received: by mail-we0-f174.google.com with SMTP id x8so1978278wey.19 for ; Sun, 12 Aug 2012 07:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=/wAeLMURDbsge1lKxA8QGmRRqdcK4d7ZQbSzRQN6Axs=; b=cDL3kY+bNnMeOduHjB+fpXymg1njSSR2OHKHg1ELuoAeGwW/Gqtie/lmCTsqaiy1fJ sWyej3BWmEBLZc829o8YmSVyGdQg0XnEwueFtUgmzL6ooLLagrln/9L8+oupk2sNzflU ryhMC/xOhgVaYru6tJTE2zwBQEeJLEWZHJJM7nQTS+Kq2MOYtfv/bgNclU1WZPtH6rJB yCq+lScoof6rmI7UhW4CfYmvVziaTcGFmyUWrpe2Lh9oHdpK+kktwsHaujTnOOufTvsF OOrRZhqwucJzU1nwnG0Yd01K8yILnhH0iqwo/UKxC8L//1oDaGh+uauRZeTlsNuMxjJF on5w== Received: by 10.217.6.12 with SMTP id x12mr4292376wes.176.1344783161134; Sun, 12 Aug 2012 07:52:41 -0700 (PDT) Received: from localhost.localdomain (stgt-5f71bba7.pool.mediaWays.net. [95.113.187.167]) by mx.google.com with ESMTPS id k20sm10803202wiv.11.2012.08.12.07.52.40 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 12 Aug 2012 07:52:40 -0700 (PDT) From: David Herrmann To: linux-fbdev@vger.kernel.org Cc: Florian Tobias Schandinat , Greg Kroah-Hartman , linux-serial@vger.kernel.org, Alan Cox , linux-kernel@vger.kernel.org, Geert Uytterhoeven , David Herrmann Subject: [PATCH 08/11] fblog: cache framebuffer BLANK and SUSPEND states Date: Sun, 12 Aug 2012 16:53:22 +0200 Message-Id: <1344783205-2384-9-git-send-email-dh.herrmann@googlemail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1344783205-2384-1-git-send-email-dh.herrmann@googlemail.com> References: <1344783205-2384-1-git-send-email-dh.herrmann@googlemail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org We must cache these states so we will never draw to the framebuffer while it is suspended or blanked. Signed-off-by: David Herrmann --- drivers/video/console/fblog.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/video/console/fblog.c b/drivers/video/console/fblog.c index aed77dc..8bcd0ce 100644 --- a/drivers/video/console/fblog.c +++ b/drivers/video/console/fblog.c @@ -33,6 +33,8 @@ enum fblog_flags { FBLOG_KILLED, FBLOG_OPEN, + FBLOG_SUSPENDED, + FBLOG_BLANKED, }; struct fblog_fb { @@ -264,6 +266,7 @@ static int fblog_event(struct notifier_block *self, unsigned long action, struct fb_event *event = data; struct fb_info *info = event->info; struct fblog_fb *fb; + int *blank; switch(action) { case FB_EVENT_FB_REGISTERED: @@ -291,6 +294,44 @@ static int fblog_event(struct notifier_block *self, unsigned long action, if (fb) fblog_close(fb, true); break; + case FB_EVENT_SUSPEND: + /* This is called when the low-level display driver suspends the + * video system. We should not access the video system while it + * is suspended. This is called with the console lock held. */ + mutex_lock(&fblog_registration_lock); + fb = fblog_fbs[info->node]; + mutex_unlock(&fblog_registration_lock); + + if (fb) + set_bit(FBLOG_SUSPENDED, &fb->flags); + break; + case FB_EVENT_RESUME: + /* This is called when the low-level display driver resumes + * operating. It is called with the console lock held. */ + mutex_lock(&fblog_registration_lock); + fb = fblog_fbs[info->node]; + mutex_unlock(&fblog_registration_lock); + + if (fb) + clear_bit(FBLOG_SUSPENDED, &fb->flags); + break; + case FB_EVENT_BLANK: + /* This gets called _after_ the framebuffer was successfully + * blanked. The console-lock is always held while fb_blank is + * called and during this callback. */ + mutex_lock(&fblog_registration_lock); + fb = fblog_fbs[info->node]; + mutex_unlock(&fblog_registration_lock); + + if (!fb) + break; + + blank = (int*)event->data; + if (*blank == FB_BLANK_UNBLANK) + clear_bit(FBLOG_BLANKED, &fb->flags); + else + set_bit(FBLOG_BLANKED, &fb->flags); + break; } return 0;