From patchwork Wed Dec 19 18:40:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10737963 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 99EAA6C5 for ; Wed, 19 Dec 2018 18:40:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E2032B5B5 for ; Wed, 19 Dec 2018 18:40:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82E6B2B63D; Wed, 19 Dec 2018 18:40:45 +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 2F8B52B660 for ; Wed, 19 Dec 2018 18:40:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48A806F152; Wed, 19 Dec 2018 18:40:44 +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 F18A16F152 for ; Wed, 19 Dec 2018 18:40:40 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id y56so17812538edd.11 for ; Wed, 19 Dec 2018 10:40:40 -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:mime-version :content-transfer-encoding; bh=D6kKzeL+WhQsjX6sOud191gOp83LhR5Ci2EfPaTGj7s=; b=AarJXnabFm497wnd8CmsMmaYj2IXFUk3WhsvBtYkBBy8XsSXTCR2yKSdfLJ7HPok/h EURRgXNCY+8k/uFQ69itiKJssXfSBIyFYRAJih98hoLKFOR0N6IlcVvvIB2UuFYmhdwz MpERU7PyKnsiFR/6W9eyuzu8zL5zG68WY1sdyD0JNOp7a81JNSJNwNZweVy1oRhnATj3 arQMcYohxRyFx6B24sYti2JwZf8ZCUvja8jRLycvy2ZzqiAkWwJU9mQGMWMW6FCFwy1O ZEDZHN5YSdvkb3Y6SNi3hkKYlNtg1jVLu3u1bZRgPXVPFW39K/tAuT6nz1DM+dk2bMa6 LAuA== X-Gm-Message-State: AA+aEWYimHEcJLFGUPD+1v60ipiarLW8YcyMSu9a8xzI3TZW0otO3x48 O6j0A66Q2sKin7evP7zZoStaGObIrSM= X-Google-Smtp-Source: AFSGD/XQMaCfXY6Ku8MPfCnCvcKS/T/JtPfuJzStcf4PN2cN+lBz6u+7VoYlfmVyiYsQKHAcQwnyWQ== X-Received: by 2002:a17:906:7f89:: with SMTP id f9-v6mr16942310ejr.51.1545244839337; Wed, 19 Dec 2018 10:40:39 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id t15-v6sm2882517ejt.0.2018.12.19.10.40.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 10:40:38 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/doc: Move bridge link target to the right place Date: Wed, 19 Dec 2018 19:40:33 +0100 Message-Id: <20181219184033.2689-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.0.rc1 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. Cc: Lubomir Rintel Signed-off-by: Daniel Vetter --- Documentation/gpu/drm-kms-helpers.rst | 4 ++-- drivers/gpu/drm/i915/intel_drv.h | 8 ++++++-- 2 files changed, 8 insertions(+), 4 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 40357e17324e..5eb88244f0b1 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -388,11 +388,15 @@ struct intel_hdcp_shim { int (*hdcp_2_2_capable)(struct intel_digital_port *intel_dig_port, bool *capable); - /* Write HDCP2.2 messages */ + /* 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 */ + /* 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);