From patchwork Tue Nov 27 17:34:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10701099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA5BC13AD for ; Tue, 27 Nov 2018 17:34:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46E042A0F3 for ; Tue, 27 Nov 2018 17:34:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 399472C1A3; Tue, 27 Nov 2018 17:34:51 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B225F2A0F3 for ; Tue, 27 Nov 2018 17:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aPv8TitiuiFbFzoUgSBIx8rAyNftbzwjgbUy3C0V44Y=; b=tvnJ/Nefba6gcn P1dbDz6xPqRaDtcbeEVPTR/04F8IET9rWr+9WvkMPU7Dtqy5O77Qcg5UsrSF6q0Z4t9ITmivTVUNL XgpknFjZe1EpPCXN+tQY66Rc8wpQfVNMaDYTbg+DxzivkqKD6wGNqSHk9uq8I77rdHD6tm7M2nqCr G7vCv8y/Rr9Cb4gqKppX6xRHmUDItYqq76HO1qCZkciJGUwZA/1Che5RSfJq2wL658g/eEJFmGxfh iAiocrEGrci+A/z0A9wvlhSbfrOWICrcDMwACraoGX/sLuTbdbprbX7voGSwqofLQEi6Yt3ORqlP0 NODm+hZ1ltw/qWx+2xCw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRhG3-0002bo-Nk; Tue, 27 Nov 2018 17:34:47 +0000 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRhG0-0002aw-9G for linux-rockchip@lists.infradead.org; Tue, 27 Nov 2018 17:34:46 +0000 Received: by mail-ed1-x541.google.com with SMTP id d39so19689051edb.12 for ; Tue, 27 Nov 2018 09:34:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YmWw+UoIv5YRTEXondvWC6QUAMYs51KVv2YXvZIo4ZY=; b=aO29M1lDhG8IcZBfiPy9p14GjbNKfjEdH8hl+8myoMFkZIgCVjBoiBiT3cEY+HAvhG 2KZeNjC/kDMFzd9pcEGccfbW8j6yB87KAUutCvbZjwQwEijsn5Y2B8xGx1ZWjg5mea60 6qVQeFCQrfnoAQ+8a3qAjD3Nj+MZSVhWNqUm4= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YmWw+UoIv5YRTEXondvWC6QUAMYs51KVv2YXvZIo4ZY=; b=SBnRkngAIg225KP7GQe23jwKqBChNXjPliu6M3zkLGqaqQzT7rGdWupbOzk0x/GEDF pITi3qF53Iez6Cz+SOayZlNn5erBQK+JU/zrCe00yLVsrJnV3YZ9qr5AnAqdAzPKPp6n jnpmBWiGP4PRa4OBBcqibJ6vjeS3IH0w9d2FWIdrEIluhW1oJFb3fyV+DEi3Gq8x6j4Y vzoytMiIZzycTX+Z5JkVvcHSS/0dShbREYgDoKZA7EG6+hY4IGNk3qxBADJrah5DJQrW KvRY5jWnRb/lIs+Vf+5oUNtamubeHwMCRCE0pnn+VUSWiYUyvbs6h4NWIyB9RQSs3bl7 CWpA== X-Gm-Message-State: AA+aEWYKU0s3QaMXn6iBTU5ZISjtuwTr0hFwY1fMeSS1AjShiVWddaSJ m2h2hoTz0oH5SorBDwcVW6Tyxw== X-Google-Smtp-Source: AFSGD/WM3R9OpvuD7k2A7kAQz5YpqTqgC6/x0hb3oJ4wrpqpU405oQsbV4bOz8ZTuH4maif79k/kBA== X-Received: by 2002:aa7:c0d0:: with SMTP id j16mr26916323edp.173.1543340072045; Tue, 27 Nov 2018 09:34:32 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id r8sm1099929edo.11.2018.11.27.09.34.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 09:34:30 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Subject: [PATCH] drm/fbdev: Make skip_vt_switch the default Date: Tue, 27 Nov 2018 18:34:24 +0100 Message-Id: <20181127173424.301-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181127170952.28507-1-daniel.vetter@ffwll.ch> References: <20181127170952.28507-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181127_093444_323323_785B93D3 X-CRM114-Status: GOOD ( 16.18 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Heiko_St=C3=BCbner?= , Maxime Ripard , Daniel Vetter , Joonas Lahtinen , DRI Development , Huang Rui , Daniel Vetter , linux-rockchip@lists.infradead.org, David Airlie , Ben Skeggs , nouveau@lists.freedesktop.org, Daniel Stone , =?utf-8?q?Michel_D=C3=A4nzer?= , Maarten Lankhorst , Jani Nikula , Rodrigo Vivi , Junwei Zhang , Sean Paul , linux-arm-kernel@lists.infradead.org, =?utf-8?q?Michel_D=C3=A4nzer?= , Sandy Huang , Samuel Li , Shirish S , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP KMS drivers really should all be able to restore their display state on resume without fbcon helping out. So make this the default. Since I'm not entirely foolish, make it only a default, which drivers can still override. That way when the inevitable regression report happens I can fix things up with a one-liner plus FIXME comment that someone should fix up the suspend/resume code in that driver. But at least all new drivers won't be broken by accident as soon as you turn off fbcon because "suspend/resume worked when I tested it". v2: Keep this for radeon because of commit 18c437caa5b18a235dd65cec224eab54bebcee65 Author: Alex Deucher Date: Tue Nov 14 17:19:29 2017 -0500 Revert "drm/radeon: dont switch vt on suspend" Thanks to Michel Dänzer for pointing this one out. Signed-off-by: Daniel Vetter Cc: Michel Dänzer Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: Ben Skeggs Cc: Sandy Huang Cc: "Heiko Stübner" Cc: Alex Deucher Cc: "Christian König" Cc: Samuel Li Cc: "Michel Dänzer" Cc: Daniel Vetter Cc: Junwei Zhang Cc: Huang Rui Cc: Shirish S Cc: Daniel Stone Cc: "Noralf Trønnes" Cc: intel-gfx@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Reviewed-by: Maarten Lankhorst Acked-by: Heiko Stuebner Tested-by: Heiko Stuebner Reviewed-by: Samuel Li --- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 - drivers/gpu/drm/drm_fb_helper.c | 1 + drivers/gpu/drm/i915/intel_fbdev.c | 3 --- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - drivers/gpu/drm/radeon/radeon_fb.c | 3 +++ drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 -- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 5cbde74b97dd..24890d8f9ee4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -234,7 +234,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, } info->par = rfbdev; - info->skip_vt_switch = true; ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb, &mode_cmd, gobj); diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 5e9ca6f96379..41f37704e0a3 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -934,6 +934,7 @@ struct fb_info *drm_fb_helper_alloc_fbi(struct drm_fb_helper *fb_helper) } fb_helper->fbdev = info; + info->skip_vt_switch = true; return info; diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 2480c7d6edee..d6f8d4bbc9fc 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -257,9 +257,6 @@ static int intelfb_create(struct drm_fb_helper *helper, info->screen_base = vaddr; info->screen_size = vma->node.size; - /* This driver doesn't need a VT switch to restore the mode on resume */ - info->skip_vt_switch = true; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height); diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 032317c81bf0..67572408d9ae 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -365,7 +365,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper, ret = PTR_ERR(info); goto out_unlock; } - info->skip_vt_switch = 1; info->par = fbcon; diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 1179034024ae..d50bff20f7de 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -244,6 +244,9 @@ static int radeonfb_create(struct drm_fb_helper *helper, goto out; } + /* radeon resume is fragile and needs a vt switch to help it along */ + info->skip_vt_switch = false; + info->par = rfbdev; ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->fb, &mode_cmd, gobj); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c index e6650553f5d6..361604e51361 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c @@ -111,8 +111,6 @@ static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper, rk_obj->kvaddr, offset, size); - fbi->skip_vt_switch = true; - return 0; out: