From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CF58C43219 for ; Thu, 2 May 2019 19:50:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63D4B206DF for ; Thu, 2 May 2019 19:50:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="MDTke5Oh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726589AbfEBTuU (ORCPT ); Thu, 2 May 2019 15:50:20 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:37555 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfEBTuT (ORCPT ); Thu, 2 May 2019 15:50:19 -0400 Received: by mail-qt1-f193.google.com with SMTP id e2so2447816qtb.4 for ; Thu, 02 May 2019 12:50:17 -0700 (PDT) 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=iQv/EW+pxQy0WvYaV+otVZjtRHAeKNfXoG3CC92/2Uk=; b=MDTke5OhkuWbovpVSD6D3qZvleMpftBW4urzoswDNagEWuQ3+jbUlmldjuKLIs6VwM KCLWuSXr1AbbcsD0zh8EeiEOcO6o5hCs0V7MG4/E4KsBZuy7rZmAsQl7CE4RkQ141uOG NSXDIkISyK9AzaGlk19WNTnj/pUUELNv8qDQezAG2NDNge33bWzOY/tZYCPS7Blhrr4R wwRqC8pikKHooesQtFaSNmcAthv1ZkV8BlZEVRwdhVl3d0OBGJL5b7aGubIXvzoszBmO DSxQPiGJn2/PCvvBRoPa90uW6dyF5lKwYKw1++PY6fStGFsoQNnXZtNl1cZwyJXKUOpr r8MQ== 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=iQv/EW+pxQy0WvYaV+otVZjtRHAeKNfXoG3CC92/2Uk=; b=nxcQLzRkm49SAtMHykhE4q2O6RMbcm5Vj3PS2xLKnKSG7TZGijRD8mgXZ6vw5I19sX EPoXP47pJBgx88HrdfgDw7dCLAYQdin30QjiucHiBXPZPavTUtDwzWqoBBooVAIS1E3I CRHl/HqhYXptVNln2UCitROFt3OSMithlE1anTQfQWM9PC2W2NB5b3BrVt9hSt9t80MY smZLZBes8ldb1Mz0Ro9oAuqUdqWJglrpgg6/FxwSaIFiK4d9LwUT5U+iP+PMKL3n8Pqe QZ/Iuaek2tZW3yxq+685Fk04FQojd3gaE7G8R4wWQMHW9o4Q3PI5sdNCquVJ0u/clAsn 6iDg== X-Gm-Message-State: APjAAAWqfPohaKowEVynWvyDgC14xnO2ZdSe3x7pG5H8OJPlPTjb9HZG tU/8gdjeU2VTrCtb5+SzQAbJUg== X-Google-Smtp-Source: APXvYqxx5XOmrLfL3KiwfdtH5c/vXDyekwMuGft/OKBtFITrRm0NboGUXAsQkEbWEFxBJpBCT/7npA== X-Received: by 2002:a0c:87bb:: with SMTP id 56mr4669280qvj.219.1556826617419; Thu, 02 May 2019 12:50:17 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 12:50:17 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Cc: Sean Paul , Daniel Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH v3 02/10] drm: Add drm_atomic_crtc_state_for_encoder helper Date: Thu, 2 May 2019 15:49:44 -0400 Message-Id: <20190502194956.218441-3-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Paul This patch adds a helper to tease out the currently connected crtc for an encoder, along with its state. This follows the same pattern as the drm_atomic_crtc_*_for_* macros in the atomic helpers. Since the relationship of crtc:encoder is 1:n, we don't need a loop since there is only one crtc per encoder. Instead of splitting this into 3 functions which all do the same thing, this is presented as one function. Perhaps that's too ugly and it should be split to: struct drm_crtc *drm_atomic_crtc_for_encoder(state, encoder); struct drm_crtc_state *drm_atomic_new_crtc_state_for_encoder(state, encoder); struct drm_crtc_state *drm_atomic_old_crtc_state_for_encoder(state, encoder); Suggestions welcome. Changes in v3: - Added to the set Cc: Daniel Vetter Cc: Ville Syrjälä Signed-off-by: Sean Paul --- drivers/gpu/drm/drm_atomic_helper.c | 48 +++++++++++++++++++++++++++++ include/drm/drm_atomic_helper.h | 6 ++++ 2 files changed, 54 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 71cc7d6b0644..1f81ca8daad7 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3591,3 +3591,51 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, return ret; } EXPORT_SYMBOL(drm_atomic_helper_legacy_gamma_set); + +/** + * drm_atomic_crtc_state_for_encoder - Get crtc and new/old state for an encoder + * @state: Atomic state + * @encoder: The encoder to fetch the crtc information for + * @crtc: If not NULL, receives the currently connected crtc + * @old_crtc_state: If not NULL, receives the crtc's old state + * @new_crtc_state: If not NULL, receives the crtc's new state + * + * This function finds the crtc which is currently connected to @encoder and + * returns it as well as its old and new state. If there is no crtc currently + * connected, the function will clear @crtc, @old_crtc_state, @new_crtc_state. + * + * All of @crtc, @old_crtc_state, and @new_crtc_state are optional. + */ +void drm_atomic_crtc_state_for_encoder(struct drm_atomic_state *state, + struct drm_encoder *encoder, + struct drm_crtc **crtc, + struct drm_crtc_state **old_crtc_state, + struct drm_crtc_state **new_crtc_state) +{ + struct drm_crtc *tmp_crtc; + struct drm_crtc_state *tmp_new_crtc_state, *tmp_old_crtc_state; + u32 enc_mask = drm_encoder_mask(encoder); + int i; + + for_each_oldnew_crtc_in_state(state, tmp_crtc, tmp_old_crtc_state, + tmp_new_crtc_state, i) { + if (!(tmp_new_crtc_state->encoder_mask & enc_mask)) + continue; + + if (new_crtc_state) + *new_crtc_state = tmp_new_crtc_state; + if (old_crtc_state) + *old_crtc_state = tmp_old_crtc_state; + if (crtc) + *crtc = tmp_crtc; + return; + } + + if (new_crtc_state) + *new_crtc_state = NULL; + if (old_crtc_state) + *old_crtc_state = NULL; + if (crtc) + *crtc = NULL; +} +EXPORT_SYMBOL(drm_atomic_crtc_state_for_encoder); diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 58214be3bf3d..2383550a0cc8 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -153,6 +153,12 @@ int drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc, uint32_t size, struct drm_modeset_acquire_ctx *ctx); +void drm_atomic_crtc_state_for_encoder(struct drm_atomic_state *state, + struct drm_encoder *encoder, + struct drm_crtc **crtc, + struct drm_crtc_state **old_crtc_state, + struct drm_crtc_state **new_crtc_state); + /** * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC * @plane: the loop cursor -- Sean Paul, Software Engineer, Google / Chromium OS From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH v3 02/10] drm: Add drm_atomic_crtc_state_for_encoder helper Date: Thu, 2 May 2019 15:49:44 -0400 Message-ID: <20190502194956.218441-3-sean@poorly.run> References: <20190502194956.218441-1-sean@poorly.run> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 8884C89811 for ; Thu, 2 May 2019 19:50:18 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id j6so4108709qtq.1 for ; Thu, 02 May 2019 12:50:18 -0700 (PDT) In-Reply-To: <20190502194956.218441-1-sean@poorly.run> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Maxime Ripard , linux-kernel@vger.kernel.org, David Airlie , Sean Paul , Sean Paul List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+CgpUaGlzIHBhdGNoIGFkZHMg YSBoZWxwZXIgdG8gdGVhc2Ugb3V0IHRoZSBjdXJyZW50bHkgY29ubmVjdGVkIGNydGMgZm9yCmFu IGVuY29kZXIsIGFsb25nIHdpdGggaXRzIHN0YXRlLiBUaGlzIGZvbGxvd3MgdGhlIHNhbWUgcGF0 dGVybiBhcyB0aGUKZHJtX2F0b21pY19jcnRjXypfZm9yXyogbWFjcm9zIGluIHRoZSBhdG9taWMg aGVscGVycy4gU2luY2UgdGhlCnJlbGF0aW9uc2hpcCBvZiBjcnRjOmVuY29kZXIgaXMgMTpuLCB3 ZSBkb24ndCBuZWVkIGEgbG9vcCBzaW5jZSB0aGVyZSBpcwpvbmx5IG9uZSBjcnRjIHBlciBlbmNv ZGVyLgoKSW5zdGVhZCBvZiBzcGxpdHRpbmcgdGhpcyBpbnRvIDMgZnVuY3Rpb25zIHdoaWNoIGFs bCBkbyB0aGUgc2FtZSB0aGluZywKdGhpcyBpcyBwcmVzZW50ZWQgYXMgb25lIGZ1bmN0aW9uLiBQ ZXJoYXBzIHRoYXQncyB0b28gdWdseSBhbmQgaXQgc2hvdWxkCmJlIHNwbGl0IHRvOgpzdHJ1Y3Qg ZHJtX2NydGMgKmRybV9hdG9taWNfY3J0Y19mb3JfZW5jb2RlcihzdGF0ZSwgZW5jb2Rlcik7CnN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqZHJtX2F0b21pY19uZXdfY3J0Y19zdGF0ZV9mb3JfZW5jb2Rl cihzdGF0ZSwgZW5jb2Rlcik7CnN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqZHJtX2F0b21pY19vbGRf Y3J0Y19zdGF0ZV9mb3JfZW5jb2RlcihzdGF0ZSwgZW5jb2Rlcik7CgpTdWdnZXN0aW9ucyB3ZWxj b21lLgoKQ2hhbmdlcyBpbiB2MzoKLSBBZGRlZCB0byB0aGUgc2V0CgpDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1 bS5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCA0OCArKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIu aCAgICAgfCAgNiArKysrCiAyIGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKykKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDcxY2M3ZDZiMDY0NC4uMWY4MWNhOGRhYWQ3 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtMzU5MSwzICszNTkxLDUxIEBA IGludCBkcm1fYXRvbWljX2hlbHBlcl9sZWdhY3lfZ2FtbWFfc2V0KHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAlyZXR1cm4gcmV0OwogfQogRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9s ZWdhY3lfZ2FtbWFfc2V0KTsKKworLyoqCisgKiBkcm1fYXRvbWljX2NydGNfc3RhdGVfZm9yX2Vu Y29kZXIgLSBHZXQgY3J0YyBhbmQgbmV3L29sZCBzdGF0ZSBmb3IgYW4gZW5jb2RlcgorICogQHN0 YXRlOiBBdG9taWMgc3RhdGUKKyAqIEBlbmNvZGVyOiBUaGUgZW5jb2RlciB0byBmZXRjaCB0aGUg Y3J0YyBpbmZvcm1hdGlvbiBmb3IKKyAqIEBjcnRjOiBJZiBub3QgTlVMTCwgcmVjZWl2ZXMgdGhl IGN1cnJlbnRseSBjb25uZWN0ZWQgY3J0YworICogQG9sZF9jcnRjX3N0YXRlOiBJZiBub3QgTlVM TCwgcmVjZWl2ZXMgdGhlIGNydGMncyBvbGQgc3RhdGUKKyAqIEBuZXdfY3J0Y19zdGF0ZTogSWYg bm90IE5VTEwsIHJlY2VpdmVzIHRoZSBjcnRjJ3MgbmV3IHN0YXRlCisgKgorICogVGhpcyBmdW5j dGlvbiBmaW5kcyB0aGUgY3J0YyB3aGljaCBpcyBjdXJyZW50bHkgY29ubmVjdGVkIHRvIEBlbmNv ZGVyIGFuZAorICogcmV0dXJucyBpdCBhcyB3ZWxsIGFzIGl0cyBvbGQgYW5kIG5ldyBzdGF0ZS4g SWYgdGhlcmUgaXMgbm8gY3J0YyBjdXJyZW50bHkKKyAqIGNvbm5lY3RlZCwgdGhlIGZ1bmN0aW9u IHdpbGwgY2xlYXIgQGNydGMsIEBvbGRfY3J0Y19zdGF0ZSwgQG5ld19jcnRjX3N0YXRlLgorICoK KyAqIEFsbCBvZiBAY3J0YywgQG9sZF9jcnRjX3N0YXRlLCBhbmQgQG5ld19jcnRjX3N0YXRlIGFy ZSBvcHRpb25hbC4KKyAqLwordm9pZCBkcm1fYXRvbWljX2NydGNfc3RhdGVfZm9yX2VuY29kZXIo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2Vu Y29kZXIgKmVuY29kZXIsCisJCQkJICAgICAgIHN0cnVjdCBkcm1fY3J0YyAqKmNydGMsCisJCQkJ ICAgICAgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqKm9sZF9jcnRjX3N0YXRlLAorCQkJCSAgICAg ICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKipuZXdfY3J0Y19zdGF0ZSkKK3sKKwlzdHJ1Y3QgZHJt X2NydGMgKnRtcF9jcnRjOworCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqdG1wX25ld19jcnRjX3N0 YXRlLCAqdG1wX29sZF9jcnRjX3N0YXRlOworCXUzMiBlbmNfbWFzayA9IGRybV9lbmNvZGVyX21h c2soZW5jb2Rlcik7CisJaW50IGk7CisKKwlmb3JfZWFjaF9vbGRuZXdfY3J0Y19pbl9zdGF0ZShz dGF0ZSwgdG1wX2NydGMsIHRtcF9vbGRfY3J0Y19zdGF0ZSwKKwkJCQkgICAgICB0bXBfbmV3X2Ny dGNfc3RhdGUsIGkpIHsKKwkJaWYgKCEodG1wX25ld19jcnRjX3N0YXRlLT5lbmNvZGVyX21hc2sg JiBlbmNfbWFzaykpCisJCQljb250aW51ZTsKKworCQlpZiAobmV3X2NydGNfc3RhdGUpCisJCQkq bmV3X2NydGNfc3RhdGUgPSB0bXBfbmV3X2NydGNfc3RhdGU7CisJCWlmIChvbGRfY3J0Y19zdGF0 ZSkKKwkJCSpvbGRfY3J0Y19zdGF0ZSA9IHRtcF9vbGRfY3J0Y19zdGF0ZTsKKwkJaWYgKGNydGMp CisJCQkqY3J0YyA9IHRtcF9jcnRjOworCQlyZXR1cm47CisJfQorCisJaWYgKG5ld19jcnRjX3N0 YXRlKQorCQkqbmV3X2NydGNfc3RhdGUgPSBOVUxMOworCWlmIChvbGRfY3J0Y19zdGF0ZSkKKwkJ Km9sZF9jcnRjX3N0YXRlID0gTlVMTDsKKwlpZiAoY3J0YykKKwkJKmNydGMgPSBOVUxMOworfQor RVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2NydGNfc3RhdGVfZm9yX2VuY29kZXIpOwpkaWZmIC0t Z2l0IGEvaW5jbHVkZS9kcm0vZHJtX2F0b21pY19oZWxwZXIuaCBiL2luY2x1ZGUvZHJtL2RybV9h dG9taWNfaGVscGVyLmgKaW5kZXggNTgyMTRiZTNiZjNkLi4yMzgzNTUwYTBjYzggMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfaGVscGVyLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJt X2F0b21pY19oZWxwZXIuaApAQCAtMTUzLDYgKzE1MywxMiBAQCBpbnQgZHJtX2F0b21pY19oZWxw ZXJfbGVnYWN5X2dhbW1hX3NldChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICAgICAgIHVp bnQzMl90IHNpemUsCiAJCQkJICAgICAgIHN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCAq Y3R4KTsKIAordm9pZCBkcm1fYXRvbWljX2NydGNfc3RhdGVfZm9yX2VuY29kZXIoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAorCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2VuY29kZXIgKmVu Y29kZXIsCisJCQkJICAgICAgIHN0cnVjdCBkcm1fY3J0YyAqKmNydGMsCisJCQkJICAgICAgIHN0 cnVjdCBkcm1fY3J0Y19zdGF0ZSAqKm9sZF9jcnRjX3N0YXRlLAorCQkJCSAgICAgICBzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKipuZXdfY3J0Y19zdGF0ZSk7CisKIC8qKgogICogZHJtX2F0b21pY19j cnRjX2Zvcl9lYWNoX3BsYW5lIC0gaXRlcmF0ZSBvdmVyIHBsYW5lcyBjdXJyZW50bHkgYXR0YWNo ZWQgdG8gQ1JUQwogICogQHBsYW5lOiB0aGUgbG9vcCBjdXJzb3IKLS0gClNlYW4gUGF1bCwgU29m dHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=