From patchwork Thu Dec 20 07:08:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10738559 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 C291513BF for ; Thu, 20 Dec 2018 07:08:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD1ED285A3 for ; Thu, 20 Dec 2018 07:08:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B1E1285A0; Thu, 20 Dec 2018 07:08:41 +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 58907285A0 for ; Thu, 20 Dec 2018 07:08:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BA0B6F1DE; Thu, 20 Dec 2018 07:08:40 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF9D56F1DE for ; Thu, 20 Dec 2018 07:08:38 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id y20so805935edw.9 for ; Wed, 19 Dec 2018 23:08:38 -0800 (PST) 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=2bbT/QZSDuYAJlOeKPOCzaZiumnJjWCeFZVsWvHIDxw=; b=hC8sMc8mAXZnSy+jaWkGFiuJnT9ksdqrT4z2AuuqqbS1xcShLwR6/0JMPsWQ5IqlF/ b23q9PKKOGTccW0kxwgeynheMpIdbMYO/KGdu8tKp2NZsW4gDrY8m8xQTvRf9KUHXy0g rmp5afJUM5XNeoVJkv/EqVAwNgugorRx8SrD28eiDtYokFCrKYaKERJXw32hmJYCgYon BIRXinWkofm4jHUy/EhQuakiIXA6EirllJooPugLtf4vkQr1MYBtODiqGqHX848XgjqE FnU63/725dLlP6eBEWTAhLuioncHiOHKniamJ/LCIUcKkruLbqQTTUlrBuxCxxU9OLn0 YCaA== X-Gm-Message-State: AA+aEWa5H6w7zs6p4wm6xWG4FBJ3ATZFAiNMqMr6Czz+1Tv46t7Wgmvm hxfbq9JvvXH4Aimhq3Xt5zP1ZNMSals= X-Google-Smtp-Source: AFSGD/UQgBRaR63dJUe3Ekx1T/X6sYzk6RUfStlHW6u7ufLRELU2RMF7bo2TbUgpl3Lr7mvZ19DWzg== X-Received: by 2002:a17:906:515:: with SMTP id j21-v6mr11109809eja.39.1545289717142; Wed, 19 Dec 2018 23:08:37 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id m13sm5867591edd.2.2018.12.19.23.08.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 23:08:36 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/doc: Move bridge link target to the right place Date: Thu, 20 Dec 2018 08:08:31 +0100 Message-Id: <20181220070831.13949-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.0.rc1 In-Reply-To: <20181219184033.2689-1-daniel.vetter@ffwll.ch> References: <20181219184033.2689-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 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: Daniel Vetter , Daniel Vetter , Lubomir Rintel Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP I screwed up a rebase somehow. v2: Drop bogus hunk. Cc: Lubomir Rintel Signed-off-by: Daniel Vetter --- Documentation/gpu/drm-kms-helpers.rst | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 33 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst index b422eb8edf16..10b62c5441d8 100644 --- a/Documentation/gpu/drm-kms-helpers.rst +++ b/Documentation/gpu/drm-kms-helpers.rst @@ -116,8 +116,6 @@ Framebuffer CMA Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_fb_cma_helper.c :export: -.. _drm_bridges: - Framebuffer GEM Helper Reference ================================ @@ -127,6 +125,8 @@ Framebuffer GEM Helper Reference .. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c :export: +.. _drm_bridges: + Bridges ======= diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index c6d2eff0e19e..95746f5b0b9e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -379,6 +379,39 @@ struct intel_hdcp_shim { /* Detects panel's hdcp capability. This is optional for HDMI. */ int (*hdcp_capable)(struct intel_digital_port *intel_dig_port, bool *hdcp_capable); +<<<<<<< HEAD +======= + + /* HDCP adaptation(DP/HDMI) required on the port */ + enum hdcp_wired_protocol protocol; + + /* Detects whether Panel is HDCP2.2 capable */ + int (*hdcp_2_2_capable)(struct intel_digital_port *intel_dig_port, + bool *capable); + + /* Write HDCP2.2 messages. + * We are using HDMI msg-id numbers to identify HDCP2 messages, which * + * will be remapped to DP AUX registers for DP. */ + int (*write_2_2_msg)(struct intel_digital_port *intel_dig_port, + void *buf, size_t size); + + /* Read HDCP2.2 messages. + * We are using HDMI msg-id numbers to identify HDCP2 messages, which * + * will be remapped to DP AUX registers for DP. */ + int (*read_2_2_msg)(struct intel_digital_port *intel_dig_port, + u8 msg_id, void *buf, size_t size); + + /* + * Implementation of DP HDCP2.2 Errata for the communication of stream + * type to Receivers. In DP HDCP2.2 Stream type is one of the input to + * the HDCP2.2 Cipher for En/De-Cryption. Not applicable for HDMI. + */ + int (*config_stream_type)(struct intel_digital_port *intel_dig_port, + void *buf, size_t size); + + /* HDCP2.2 Link Integrity Check */ + int (*check_2_2_link)(struct intel_digital_port *intel_dig_port); +>>>>>>> 4f9e07e71945... drm/doc: Move bridge link target to the right place }; struct intel_hdcp {