From patchwork Sun Jul 9 07:43:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Liu X-Patchwork-Id: 9832141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 08B1C602BD for ; Mon, 10 Jul 2017 00:59:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED3D727FB7 for ; Mon, 10 Jul 2017 00:59:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFAEE283C7; Mon, 10 Jul 2017 00:59:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 64A2727FB7 for ; Mon, 10 Jul 2017 00:59:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 231E86E12D; Mon, 10 Jul 2017 00:58:51 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC1C06E125 for ; Sun, 9 Jul 2017 07:43:55 +0000 (UTC) Received: by mail-pf0-x244.google.com with SMTP id e199so10300957pfh.0 for ; Sun, 09 Jul 2017 00:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vxVQ2se3MsOy7tXhMAotMsQ0u8H2ZZRAr0rxYOsvo7M=; b=QJd6NalSFz13gqaLHZLVAKVsOHr0mrdlEYbLTPKLZciVeR//l3NjMA2V7LEB2/rc5b W9fqzV2i7/Oce6GL51s2wi4NVJhkucXEIj2yyGOMSx+tqpKDVX+NQE+hw/r2zXbe6N1w nKf1hSoRKps0tfkYDEBq02SxVpvLGSAn2cjWTffGB5AYtoEjBSrOw/CJHAiAG1Bp4rOn 2kphG6EUVI/DFrmvDGe/xrXkPHMm9OvqCbSjch+Hk3CQ/QMn21uZWsU1xQUClObDwA/r x/y21ziqiw3R1F5ynNu7jAzPFvwUSF1tH9Hs+0QtH5hKbnzThGNAkPMU3xWErbb1Zpui LuWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vxVQ2se3MsOy7tXhMAotMsQ0u8H2ZZRAr0rxYOsvo7M=; b=fqY6R8iu7ygqyPLdEBJedMaqRwHgNMa1QUKOWi+pyV1ccq619ESHy3ghi82Mbjx79T kJUplLBZX7GVVVqTg3w82PGMLumUCf97kdLfVVibGW/7j2LiDSFzAIxG17vKJ3bM2viC 0VKzBR3O2ImMFyeuRBdBtWQCvJPlW5qM+y/Xyxhjv2zBCMqkFKXzjutjcLiDKugkiRfg mJ82G/WGNfyd18FJFJwGubSLUqsI9+WMZl5HmvEDCwi1jBlsNSj3fm2XvSVbbKGvR2xG J3Eac42gMcJ2TbmqPsDAFdNOg3xVHDLzkbMLBawP7MdzbuYgoQQ2crferp4T/AcnXw0P theA== X-Gm-Message-State: AIVw111qBRwJB1PuTvYFJQkee8ICuDDplD0zkwrio1bPkS6oeTN8LJfm KfBqGPHsA/45hw== X-Received: by 10.101.73.72 with SMTP id q8mr9017687pgs.219.1499586235160; Sun, 09 Jul 2017 00:43:55 -0700 (PDT) Received: from 60-242-179-244.static.tpgi.com.au (60-242-179-244.static.tpgi.com.au. [60.242.179.244]) by smtp.gmail.com with ESMTPSA id o6sm12726706pgs.43.2017.07.09.00.43.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jul 2017 00:43:54 -0700 (PDT) From: Jonathan Liu To: Maxime Ripard , David Airlie , Chen-Yu Tsai Subject: [PATCH] drm/sun4i: Implement drm_driver lastclose to restore fbdev console Date: Sun, 9 Jul 2017 17:43:27 +1000 Message-Id: <20170709074327.4953-1-net147@gmail.com> X-Mailer: git-send-email 2.13.2 X-Mailman-Approved-At: Mon, 10 Jul 2017 00:58:45 +0000 Cc: linux-sunxi@googlegroups.com, Jonathan Liu , linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The drm_driver lastclose callback is called when the last userspace DRM client has closed. Call drm_fbdev_cma_restore_mode to restore the fbdev console otherwise the fbdev console will stop working. Signed-off-by: Jonathan Liu --- drivers/gpu/drm/sun4i/sun4i_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index abc7d8fe06b4..c434540d409c 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -25,12 +25,20 @@ #include "sun4i_framebuffer.h" #include "sun4i_tcon.h" +static void sun4i_drm_lastclose(struct drm_device *dev) +{ + struct sun4i_drv *drv = dev->dev_private; + + drm_fbdev_cma_restore_mode(drv->fbdev); +} + DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops); static struct drm_driver sun4i_drv_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC, /* Generic Operations */ + .lastclose = sun4i_drm_lastclose, .fops = &sun4i_drv_fops, .name = "sun4i-drm", .desc = "Allwinner sun4i Display Engine",