From patchwork Tue Jun 27 14:59:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9812175 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 1521560351 for ; Tue, 27 Jun 2017 15:00:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 096E5286C3 for ; Tue, 27 Jun 2017 15:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1FC2286CC; Tue, 27 Jun 2017 15:00:50 +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_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable 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 4F0DB286CC for ; Tue, 27 Jun 2017 15:00:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B9A16E407; Tue, 27 Jun 2017 15:00:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3047D6E3F8 for ; Tue, 27 Jun 2017 14:59:55 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id j85so6305142wmj.0 for ; Tue, 27 Jun 2017 07:59:55 -0700 (PDT) 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; bh=FHLBM2b6aiLzyxHaWaeEf3eBk4sKe34mki1T3jjR9V0=; b=hpiZ/ksq50G3XKz4sKQ8QFoRiueHVgG6iuHtPiN31zQjJ1eHV8tvyZHD2Z8k0emUBX fk5gWOe83CTQeyFFS9r7x9qYndd/VrYVOdj1Y0QLqTiZuHA6aQZAqj0MxxeJ9BKSb6To mnlKZ5WBXHW1lOPU7zeU6k2xZZWYw+k3y9EKE= 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; bh=FHLBM2b6aiLzyxHaWaeEf3eBk4sKe34mki1T3jjR9V0=; b=k3ds1m3SBmLiiGNmdv6MP0mAIMDZPRdnMfcPM22zCQorM8Fu8xSDrYJVn0tr6vkhQm jDE8/P7XbbgnpA5Ue8srivKcXHlM9RShmlkaesmpm+RTbbQyDLrVA3f7AbDqxh7wT9w9 RA4r8ZCDkVV7LbNrN4Wn28f7vguaUcTu2ulY21TpNl1THsTf0vT/D3liwBK2qKaZPkBD fV/R3Q0p9DrdaUzOO7AbzuUqjWF/KKpeo3JeAsrzoRl4et52do1RurNEvMV0oY+Zlsbi oZX6EossnSvpcRfpFxiTaia6+UnV1blLIQoTe2cdW6apodSi+EouIKz050zv0bB+Bxpg ++tQ== X-Gm-Message-State: AKS2vOy4oqopfAiTW+15bw/f1PkSbyHXDrjC5v4t6+ZVb08ugeVqzZ6k 4qFvw2N17zrO4QxR/Ek= X-Received: by 10.80.175.165 with SMTP id h34mr4268332edd.87.1498575593593; Tue, 27 Jun 2017 07:59:53 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id x44sm1557561edx.38.2017.06.27.07.59.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jun 2017 07:59:52 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/13] drm/fb-helper: Split dpms handling into legacy and atomic paths Date: Tue, 27 Jun 2017 16:59:32 +0200 Message-Id: <20170627145936.18983-10-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170627145936.18983-1-daniel.vetter@ffwll.ch> References: <20170627145936.18983-1-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter , Thierry Reding , Peter Rosin 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 Like with panning and modesetting, and like with those, stick with simple drm_modeset_locking_all for the legacy path, and the full atomic dance for atomic drivers. This means a bit more boilerplate since setting up the atomic state machinery is rather verbose, but then this is shared code for 30+ drivers or so, so meh. After this patch there's only the LUT/cmap path which is still using drm_modeset_lock_all for an atomic driver. But Peter is already locking into reworking that, so I'll leave that code as-is for now. Cc: Peter Rosin Cc: John Stultz Cc: Thierry Reding Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_fb_helper.c | 88 +++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 59e2916471b2..bbd4c6d0378d 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -616,23 +616,13 @@ static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { }; #endif -static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) +static void dpms_legacy(struct drm_fb_helper *fb_helper, int dpms_mode) { - struct drm_fb_helper *fb_helper = info->par; struct drm_device *dev = fb_helper->dev; struct drm_crtc *crtc; struct drm_connector *connector; int i, j; - /* - * For each CRTC in this fb, turn the connectors on/off. - */ - mutex_lock(&fb_helper->lock); - if (!drm_fb_helper_is_bound(fb_helper)) { - mutex_unlock(&fb_helper->lock); - return; - } - drm_modeset_lock_all(dev); for (i = 0; i < fb_helper->crtc_count; i++) { crtc = fb_helper->crtc_info[i].mode_set.crtc; @@ -649,6 +639,81 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) } } drm_modeset_unlock_all(dev); +} + +static void dpms_atomic(struct drm_fb_helper *fb_helper, int dpms_mode) +{ + struct drm_device *dev = fb_helper->dev; + struct drm_atomic_state *state; + int i, ret; + + struct drm_modeset_acquire_ctx ctx; + + drm_modeset_acquire_init(&ctx, 0); + + state = drm_atomic_state_alloc(dev); + if (!state) { + ret = -ENOMEM; + goto out_ctx; + } + + state->acquire_ctx = &ctx; +retry: + for (i = 0; i < fb_helper->crtc_count; i++) { + struct drm_crtc_state *crtc_state; + struct drm_crtc *crtc; + + if (!fb_helper->crtc_info[i].mode_set.mode) + continue; + + crtc = fb_helper->crtc_info[i].mode_set.crtc; + + crtc_state = drm_atomic_get_crtc_state(state, crtc); + if (IS_ERR(crtc_state)) { + ret = PTR_ERR(crtc_state); + goto out_state; + } + + crtc_state->active = dpms_mode == DRM_MODE_DPMS_ON; + } + + ret = drm_atomic_commit(state); +out_state: + if (ret == -EDEADLK) + goto backoff; + + drm_atomic_state_put(state); +out_ctx: + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); + + return; + +backoff: + drm_atomic_state_clear(state); + drm_modeset_backoff(&ctx); + + goto retry; + +} + +static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) +{ + struct drm_fb_helper *fb_helper = info->par; + + /* + * For each CRTC in this fb, turn the connectors on/off. + */ + mutex_lock(&fb_helper->lock); + if (!drm_fb_helper_is_bound(fb_helper)) { + mutex_unlock(&fb_helper->lock); + return; + } + + if (drm_drv_uses_atomic_modeset(fb_helper->dev)) + dpms_atomic(fb_helper, dpms_mode); + else + dpms_legacy(fb_helper, dpms_mode); mutex_unlock(&fb_helper->lock); } @@ -2467,7 +2532,6 @@ EXPORT_SYMBOL(drm_fb_helper_initial_config); */ int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper) { - struct drm_device *dev = fb_helper->dev; int err = 0; if (!drm_fbdev_emulation)