From patchwork Thu May 2 19:49:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10927593 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 43B601515 for ; Thu, 2 May 2019 19:50:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 331E6204BA for ; Thu, 2 May 2019 19:50:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 265FE21BED; Thu, 2 May 2019 19:50:18 +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,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 82633204BA for ; Thu, 2 May 2019 19:50:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76CB58980C; Thu, 2 May 2019 19:50:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id B1C0C8980C for ; Thu, 2 May 2019 19:50:15 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id c35so4093096qtk.3 for ; Thu, 02 May 2019 12:50:15 -0700 (PDT) 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=5/u+2wMWD5qgsv9mU8zFBG54a7HxlNWxbgZL8h1Zsk8=; b=aZVEkwshlAjgTBqt0EvFSklvXBuruhv4sN1O7GOrsMVeNBTEC2bX9d+PpEYjdjJSrt EjWy5r3K5FWeZHfkXSbmNOgn/+gapaGVArVbaUHHnbmVQVdDD2cUsxHJE0KkuIrlReHb s81u3Hdjz54df+wVmX+9gpF/eCZddj9K/x5bzd9xrGJnbtvyvDleKWxfg1QG28y05OFd wW//w+ERaBJL9NeHnqIFgov9d8wnIzDrLFT/lWkSvvRniAclYS3iR1iRvzT7fCzLu3jU 3sCgj9BvtP4t9CZGhAM03izp7sxMWj4Wb/t09JG3Z4EWZUhcKWtMjTKDu6xbSaUOkpNb KSOQ== X-Gm-Message-State: APjAAAX8l5Ecn2byCD1McMba5K6rqgh+1f0Sp/pg1Lv5AayQV75ElAfX h+0kuqb3iNuQQA+dzh1kF3dWqDlOddw= X-Google-Smtp-Source: APXvYqxIvmYWNDjFSgSitmtaXaEYuycKYhYf5LPkJShiYp2oXu8Cmuhjsdd+iZmhigaosQYCQoLaJg== X-Received: by 2002:aed:2188:: with SMTP id l8mr4937051qtc.332.1556826614723; Thu, 02 May 2019 12:50:14 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id k36sm34366qtc.52.2019.05.02.12.50.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 12:50:14 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v3 01/10] drm: Add atomic variants of enable/disable to encoder helper funcs Date: Thu, 2 May 2019 15:49:43 -0400 Message-Id: <20190502194956.218441-2-sean@poorly.run> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog In-Reply-To: <20190502194956.218441-1-sean@poorly.run> References: <20190502194956.218441-1-sean@poorly.run> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5/u+2wMWD5qgsv9mU8zFBG54a7HxlNWxbgZL8h1Zsk8=; b=D8noIPyBltKrHNdSLQv7QwB5qTJfo2xDPFC/KvHjHwbbZxsQRAFHWU7b3vXAAvEHvZ 5TxYtvys+v824zV3i33ByAa95amPXEwvI44S9nyP641VX+lI/6Gh6giAK8RbwU+Ejmf6 xbvbJxTBP4hP0xmhATwTHiBjqIZsarK+ZCZ2dVacQkWL3cH1uYl0xZw6uRVomJRKi3Qx RbtPVEwYHf5RwppKGHDksQvLa67KHuYniPsdjCGJhHXba+A+zrib10fimTk+oIZPaw5P GN3rVEAXdwlllHeoyq1qbeH2zHFV8CPmDb8uBlYCJi2xebkFwSVSaO7DdT96FLM/a8WF /3XA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Ripard , linux-kernel@vger.kernel.org, David Airlie , Sean Paul , Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Paul This patch adds atomic_enable and atomic_disable callbacks to the encoder helpers. This will allow encoders to make informed decisions in their start-up/shutdown based on the committed state. Aside from the new hooks, this patch also introduces the new signature for .atomic_* functions going forward. Instead of passing object state (well, encoders don't have atomic state, but let's ignore that), we pass the entire atomic state so the driver can inspect more than what's happening locally. This is particularly important for the upcoming self refresh helpers. Changes in v3: - Added patch to the set Cc: Daniel Vetter Cc: Ville Syrjälä Signed-off-by: Sean Paul Reviewed-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_helper.c | 6 +++- include/drm/drm_modeset_helper_vtables.h | 45 ++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 553415fe8ede..71cc7d6b0644 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1001,6 +1001,8 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) if (funcs) { if (new_conn_state->crtc && funcs->prepare) funcs->prepare(encoder); + else if (funcs->atomic_disable) + funcs->atomic_disable(encoder, old_state); else if (funcs->disable) funcs->disable(encoder); else if (funcs->dpms) @@ -1309,7 +1311,9 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, drm_bridge_pre_enable(encoder->bridge); if (funcs) { - if (funcs->enable) + if (funcs->atomic_enable) + funcs->atomic_enable(encoder, old_state); + else if (funcs->enable) funcs->enable(encoder); else if (funcs->commit) funcs->commit(encoder); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h index 8f3602811eb5..de57fb40cb6e 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -675,6 +675,51 @@ struct drm_encoder_helper_funcs { enum drm_connector_status (*detect)(struct drm_encoder *encoder, struct drm_connector *connector); + /** + * @atomic_disable: + * + * This callback should be used to disable the encoder. With the atomic + * drivers it is called before this encoder's CRTC has been shut off + * using their own &drm_crtc_helper_funcs.atomic_disable hook. If that + * sequence is too simple drivers can just add their own driver private + * encoder hooks and call them from CRTC's callback by looping over all + * encoders connected to it using for_each_encoder_on_crtc(). + * + * This callback is a variant of @disable that provides the atomic state + * to the driver. It takes priority over @disable during atomic commits. + * + * This hook is used only by atomic helpers. Atomic drivers don't need + * to implement it if there's no need to disable anything at the encoder + * level. To ensure that runtime PM handling (using either DPMS or the + * new "ACTIVE" property) works @atomic_disable must be the inverse of + * @atomic_enable. + */ + void (*atomic_disable)(struct drm_encoder *encoder, + struct drm_atomic_state *state); + + /** + * @atomic_enable: + * + * This callback should be used to enable the encoder. It is called + * after this encoder's CRTC has been enabled using their own + * &drm_crtc_helper_funcs.atomic_enable hook. If that sequence is + * too simple drivers can just add their own driver private encoder + * hooks and call them from CRTC's callback by looping over all encoders + * connected to it using for_each_encoder_on_crtc(). + * + * This callback is a variant of @enable that provides the atomic state + * to the driver. It is called in place of @enable during atomic + * commits. + * + * This hook is used only by atomic helpers, for symmetry with @disable. + * Atomic drivers don't need to implement it if there's no need to + * enable anything at the encoder level. To ensure that runtime PM + * handling (using either DPMS or the new "ACTIVE" property) works + * @enable must be the inverse of @disable for atomic drivers. + */ + void (*atomic_enable)(struct drm_encoder *encoder, + struct drm_atomic_state *state); + /** * @disable: *