From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dariusz Marcinkiewicz Subject: [PATCH v6 1/8] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register Date: Tue, 13 Aug 2019 13:02:33 +0200 Message-ID: <20190813110300.83025-2-darekm@google.com> References: <20190813110300.83025-1-darekm@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by gabe.freedesktop.org (Postfix) with ESMTPS id B863E6E0EF for ; Tue, 13 Aug 2019 11:03:43 +0000 (UTC) Received: by mail-qk1-x74a.google.com with SMTP id x28so19364970qki.21 for ; Tue, 13 Aug 2019 04:03:43 -0700 (PDT) In-Reply-To: <20190813110300.83025-1-darekm@google.com> 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, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: David Airlie , open list , Rodrigo Vivi , Dariusz Marcinkiewicz List-Id: dri-devel@lists.freedesktop.org VXNlIHRoZSBuZXcgY2VjX25vdGlmaWVyX2Nvbm5fKHVuKXJlZ2lzdGVyKCkgZnVuY3Rpb25zIHRv Cih1bilyZWdpc3RlciB0aGUgbm90aWZpZXIgZm9yIHRoZSBIRE1JIGNvbm5lY3RvciwgYW5kIGZp bGwgaW4KdGhlIGNlY19jb25uZWN0b3JfaW5mby4KClNpZ25lZC1vZmYtYnk6IERhcml1c3ogTWFy Y2lua2lld2ljeiA8ZGFyZWttQGdvb2dsZS5jb20+ClNpZ25lZC1vZmYtYnk6IEhhbnMgVmVya3Vp bCA8aHZlcmt1aWwtY2lzY29AeHM0YWxsLm5sPgpUZXN0ZWQtYnk6IEhhbnMgVmVya3VpbCA8aHZl cmt1aWwtY2lzY29AeHM0YWxsLm5sPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfaGRtaS5jIHwgMTMgKysrKysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0 aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfaGRtaS5jCmluZGV4IGIxY2E4ZTViZGI1NmQuLjlmY2YyYzU4YzI5YzUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfaGRtaS5jCkBAIC0yNzUyLDggKzI3NTIsOSBAQCBp bnRlbF9oZG1pX2Nvbm5lY3Rvcl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKQogCiBzdGF0aWMgdm9pZCBpbnRlbF9oZG1pX2Rlc3Ryb3koc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvcikKIHsKLQlpZiAoaW50ZWxfYXR0YWNoZWRfaGRtaShjb25uZWN0b3IpLT5j ZWNfbm90aWZpZXIpCi0JCWNlY19ub3RpZmllcl9wdXQoaW50ZWxfYXR0YWNoZWRfaGRtaShjb25u ZWN0b3IpLT5jZWNfbm90aWZpZXIpOworCXN0cnVjdCBjZWNfbm90aWZpZXIgKm4gPSBpbnRlbF9h dHRhY2hlZF9oZG1pKGNvbm5lY3RvciktPmNlY19ub3RpZmllcjsKKworCWNlY19ub3RpZmllcl9j b25uX3VucmVnaXN0ZXIobik7CiAKIAlpbnRlbF9jb25uZWN0b3JfZGVzdHJveShjb25uZWN0b3Ip OwogfQpAQCAtMzA2OCw2ICszMDY5LDcgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXRfY29ubmVjdG9y KHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBpbnRlbF9lbmNvZGVyLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJZW51bSBwb3J0IHBvcnQgPSBpbnRl bF9lbmNvZGVyLT5wb3J0OworCXN0cnVjdCBjZWNfY29ubmVjdG9yX2luZm8gY29ubl9pbmZvOwog CiAJRFJNX0RFQlVHX0tNUygiQWRkaW5nIEhETUkgY29ubmVjdG9yIG9uIHBvcnQgJWNcbiIsCiAJ CSAgICAgIHBvcnRfbmFtZShwb3J0KSk7CkBAIC0zMTIwLDggKzMxMjIsMTEgQEAgdm9pZCBpbnRl bF9oZG1pX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2Rp Z19wb3J0LAogCQlJOTE1X1dSSVRFKFBFR19CQU5EX0dBUF9EQVRBLCAodGVtcCAmIH4weGYpIHwg MHhkKTsKIAl9CiAKLQlpbnRlbF9oZG1pLT5jZWNfbm90aWZpZXIgPSBjZWNfbm90aWZpZXJfZ2V0 X2Nvbm4oZGV2LT5kZXYsCi0JCQkJCQkJIHBvcnRfaWRlbnRpZmllcihwb3J0KSk7CisJY2VjX2Zp bGxfY29ubl9pbmZvX2Zyb21fZHJtKCZjb25uX2luZm8sIGNvbm5lY3Rvcik7CisKKwlpbnRlbF9o ZG1pLT5jZWNfbm90aWZpZXIgPQorCQljZWNfbm90aWZpZXJfY29ubl9yZWdpc3RlcihkZXYtPmRl diwgcG9ydF9pZGVudGlmaWVyKHBvcnQpLAorCQkJCQkgICAmY29ubl9pbmZvKTsKIAlpZiAoIWlu dGVsX2hkbWktPmNlY19ub3RpZmllcikKIAkJRFJNX0RFQlVHX0tNUygiQ0VDIG5vdGlmaWVyIGdl dCBmYWlsZWRcbiIpOwogfQotLSAKMi4yMy4wLnJjMS4xNTMuZ2RlZWQ4MDMzMGYtZ29vZwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 8CA70C32750 for ; Tue, 13 Aug 2019 11:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C1552067D for ; Tue, 13 Aug 2019 11:03:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mAwTBif5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726852AbfHMLDo (ORCPT ); Tue, 13 Aug 2019 07:03:44 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:36572 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726600AbfHMLDn (ORCPT ); Tue, 13 Aug 2019 07:03:43 -0400 Received: by mail-qk1-f202.google.com with SMTP id t2so11441466qkd.3 for ; Tue, 13 Aug 2019 04:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=suzgW5VW6Ng90prgpz/ghvx/fVcho6Pl4urYZ0d0Q0c=; b=mAwTBif5SbxpYaq2IikX38jkOeszeUCovNEYab4cHeVN+v697Wp2h3UHSPoj6PQEsx gWErNctQhzZZtEathfy//4/gyuApE+oiS/w6iVDZKnkz+CoezIRW4AxGxBuSUH2Vy5mF 7xblnVtiwRzWYhRluLub87aOD2EYsxBrPidHFfxkOz9l5amojS0yJpWbP6Su1HrpxNc3 kWT5XLunbopN/uGkEZe7JDJXXDr5wqe1v5U+JvF6UW36PXO+ZA9c2Z8M6mzWjWMmijH4 c5f6NIh0A1W1Og+SU2pIQAHDrxScIO/Ezb2xFf/KG9z2fMUfhfmORLA9Q0ahhKKDrTGY PzdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=suzgW5VW6Ng90prgpz/ghvx/fVcho6Pl4urYZ0d0Q0c=; b=kTSxeowKXTv/6kHJmZ+wmjqZDFxhTlg6CXshVUnwgVd/UiBeZjgzzT7Y0mCBU/cW7j vG863rV7ZgbVyVJ1ZQjvCy+rWpv+dMjT462eJOpwZnJg5aYQZ0ApafAtu+fiEVwcIcx9 W7aL1Ibd6Gdnol9mydEjyxBaaj3q8oNB87zXQdMdrwlKZD9RmVhDTLQ6heBBBn7dq6Y+ mX6Dzex6/Xl0i/QoTY5nQGxlKHOYjSoCwo0ShtfKgd1y7+l0e+NzgrGQKalYKYhH3ZAb mHDh2w2q5vBEyOFamZQwJvhooEsShe+YoHpIVjJnX5J8xjpLoISXQXbNiipkwhpJlJOW 0CEQ== X-Gm-Message-State: APjAAAWwRBRp8LC4LpcRIngQZwAgUT31A6G9FkwsOH89+7jclH9VdKeB ksSJiI5HwCx8JARH3JHx0y+7Musgp24= X-Google-Smtp-Source: APXvYqxH0s5mm6hwQ1otgCG0chGHch91z1fgqZDyPSZRLZ3zhyi2y9k5EKBX3ssntH2nkvkmJsnKCHjxCiI= X-Received: by 2002:a37:aec7:: with SMTP id x190mr7822514qke.420.1565694222662; Tue, 13 Aug 2019 04:03:42 -0700 (PDT) Date: Tue, 13 Aug 2019 13:02:33 +0200 In-Reply-To: <20190813110300.83025-1-darekm@google.com> Message-Id: <20190813110300.83025-2-darekm@google.com> Mime-Version: 1.0 References: <20190813110300.83025-1-darekm@google.com> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH v6 1/8] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register From: Dariusz Marcinkiewicz To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: Dariusz Marcinkiewicz , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , "=?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?=" , Chris Wilson , Maarten Lankhorst , Shashank Sharma , Ramalingam C , open list Content-Type: text/plain; charset="UTF-8" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Use the new cec_notifier_conn_(un)register() functions to (un)register the notifier for the HDMI connector, and fill in the cec_connector_info. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil Tested-by: Hans Verkuil --- drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index b1ca8e5bdb56d..9fcf2c58c29c5 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2752,8 +2752,9 @@ intel_hdmi_connector_register(struct drm_connector *connector) static void intel_hdmi_destroy(struct drm_connector *connector) { - if (intel_attached_hdmi(connector)->cec_notifier) - cec_notifier_put(intel_attached_hdmi(connector)->cec_notifier); + struct cec_notifier *n = intel_attached_hdmi(connector)->cec_notifier; + + cec_notifier_conn_unregister(n); intel_connector_destroy(connector); } @@ -3068,6 +3069,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, struct drm_device *dev = intel_encoder->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); enum port port = intel_encoder->port; + struct cec_connector_info conn_info; DRM_DEBUG_KMS("Adding HDMI connector on port %c\n", port_name(port)); @@ -3120,8 +3122,11 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd); } - intel_hdmi->cec_notifier = cec_notifier_get_conn(dev->dev, - port_identifier(port)); + cec_fill_conn_info_from_drm(&conn_info, connector); + + intel_hdmi->cec_notifier = + cec_notifier_conn_register(dev->dev, port_identifier(port), + &conn_info); if (!intel_hdmi->cec_notifier) DRM_DEBUG_KMS("CEC notifier get failed\n"); } -- 2.23.0.rc1.153.gdeed80330f-goog