Received: by 10.223.164.202 with SMTP id h10csp157749wrb; Wed, 29 Nov 2017 19:10:28 -0800 (PST) X-Google-Smtp-Source: AGs4zMZwxgarnphyegN287dHV7SrMTMJb8q1fkeyFm4f7QsO7lu6Xm1C0d1AICFNhVwyXZ4iQXlg X-Received: by 10.98.8.67 with SMTP id c64mr5178261pfd.50.1512011428413; Wed, 29 Nov 2017 19:10:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512011428; cv=none; d=google.com; s=arc-20160816; b=H7AjeoyexunSzD9ZxrOSMZc7jfH3v739LkyK/jYwO9b/EvFFEp6BNJAy62kYQ/1ct8 QchDDVJNGNzOQV+VGcFS6qdMd9m4io6TIK67TLeHdKGsbmrB5apeOUm0q75uvTX7eC9+ 5KREcvT5crcfL0RKaQ5FtmKyLdjeU+b7gOXgW6RYP7mPulL9tTToA010/jYOn9fMWkzu fn+t3vEkzzggwc1Olfbfk1fmn14JRGlWgAcL2HkJova7O4lTyHBnJ4S2mVAiGuuXBa/x oz7YUQwnkKuJ9lFzhqWIPSeMHImoEkRLes+R01nTgqMdAAye6mYrzmhnKMAVjZsmbOzc UHTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=RpBWzsJBJ6cptdOujeZB2ZHOHsUzfXI32TYEFOUu7hg=; b=OXaURqdmbNeTcK05B8YzY70C1dwQfQLC8AuLHzGxZtJSlp/t6mxEdtrU3ugsvPfT/Y 5RSAMEs4ZgE7cXbbxPoBi760/bz+doACFz3hZHEVe2K6PMR45UgjG+UBMK3IPD+dYCl8 kwc03P9wKto32BdsNH4I1gWoQvc9rfuSCGBMNzaGkxFIfpf8wON6V8nQ8o1W2+N2W/BJ /WtC+8D2akRO5xEfp0xRyCUMjAdvfO7rVXn0lGsGtKUyJZw6N2tyVM7f1VyaDwlDm7U2 YrZwP//avUovnKhrEa/jBbdiTvl8MSnsS4MMtStfUF8C23RZnZoI6LJ9ybrWwrsML6yM SyOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cIXqkhZP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a12si2432219pln.109.2017.11.29.19.10.12; Wed, 29 Nov 2017 19:10:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cIXqkhZP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753414AbdK3DJy (ORCPT + 99 others); Wed, 29 Nov 2017 22:09:54 -0500 Received: from mail-yw0-f195.google.com ([209.85.161.195]:40767 "EHLO mail-yw0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbdK3DJv (ORCPT ); Wed, 29 Nov 2017 22:09:51 -0500 Received: by mail-yw0-f195.google.com with SMTP id g191so2192275ywe.7 for ; Wed, 29 Nov 2017 19:09:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RpBWzsJBJ6cptdOujeZB2ZHOHsUzfXI32TYEFOUu7hg=; b=cIXqkhZPJTXrW1L7ZbHMNfySFNh7FfhTxt5ZGdjimUXrQrlZ3K6ii9aI8fkv/dJx7M L/r6Qgqv6k2thc3tlgcQZkWX5UkvBwYF2RtpM/AqakiMS7E/qI2kQOC6gaS709qv+xGl 3hxh9Y7ohjnj9ulaZG/YJvO01CBFm/W+oLoQw= 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; bh=RpBWzsJBJ6cptdOujeZB2ZHOHsUzfXI32TYEFOUu7hg=; b=CnpxBIXXSoXxTOtchkDOuk9zcHGA0pkLQ/tK9MogtRT4lw/BXdfZ2r2KZxtRV76Wdx ZvXu1sKfA9Ic6CHajXFQx5qlrY7WEdKsj5iuIMPOQhK4WcqOpM0hQE2+FvOlqNLOY9gT vz/cBYBPYq4n80om2jZjIY+PJLY2tzLTMd/pVxfbiFMn+/x9rQ5y8IrUim/Q74iD4q16 nsdqZ3cDjqeYEqSyJtnoXHPwm/XGqMakgk+gDkaCzLzY4nBLcdNlKMzRIoX9khPExT2I NImBIi1/aI8+EogeAX3H9tOpihglElU50bqHNitSTZ3O8NaTIuFogdAV9JBP6W+bko9n tHHw== X-Gm-Message-State: AJaThX73w/dVedWbbUEFbAOTcsLK1wDLox7/sjKDoXevKaLyUezSXOmy NJ9xsGpDduMEK0i7U4sUuAlA1g== X-Received: by 10.129.57.133 with SMTP id g127mr661830ywa.426.1512011391106; Wed, 29 Nov 2017 19:09:51 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:d3af:69ac:1964:28e8]) by smtp.gmail.com with ESMTPSA id u24sm1460752ywh.84.2017.11.29.19.09.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Nov 2017 19:09:50 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Sean Paul , Daniel Vetter , Jani Nikula , Gustavo Padovan , David Airlie , linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/6] drm: Add some HDCP related #defines Date: Wed, 29 Nov 2017 22:08:57 -0500 Message-Id: <20171130030907.26848-3-seanpaul@chromium.org> X-Mailer: git-send-email 2.15.0.531.g2ccb3012c9-goog In-Reply-To: <20171130030907.26848-1-seanpaul@chromium.org> References: <20171130030907.26848-1-seanpaul@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for implementing HDCP in i915, add some HDCP related register offsets and defines. The dpcd register offsets will go in drm_dp_helper.h whereas the ddc offsets along with generic HDCP stuff will get stuffed in drm_hdcp.h, which is new. Signed-off-by: Sean Paul --- include/drm/drm_dp_helper.h | 17 +++++++++++++++++ include/drm/drm_hdcp.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 include/drm/drm_hdcp.h diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 9049ef133d69..4671d41a2fe1 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -816,6 +816,23 @@ #define DP_CEC_TX_MESSAGE_BUFFER 0x3020 #define DP_CEC_MESSAGE_BUFFER_LENGTH 0x10 +#define DP_AUX_HDCP_BKSV 0x68000 +#define DP_AUX_HDCP_RI_PRIME 0x68005 +#define DP_AUX_HDCP_AKSV 0x68007 +#define DP_AUX_HDCP_AN 0x6800C +#define DP_AUX_HDCP_V_PRIME(h) (0x68014 + h * 4) +#define DP_AUX_HDCP_BCAPS 0x68028 +# define DP_BCAPS_REPEATER_PRESENT BIT(1) +# define DP_BCAPS_HDCP_CAPABLE BIT(0) +#define DP_AUX_HDCP_BSTATUS 0x68029 +# define DP_BSTATUS_REAUTH_REQ BIT(3) +# define DP_BSTATUS_LINK_FAILURE BIT(2) +# define DP_BSTATUS_R0_PRIME_READY BIT(1) +# define DP_BSTATUS_READY BIT(0) +#define DP_AUX_HDCP_BINFO 0x6802A +#define DP_AUX_HDCP_KSV_FIFO 0x6802C +#define DP_AUX_HDCP_AINFO 0x6803B + /* DP 1.2 Sideband message defines */ /* peer device type - DP 1.2a Table 2-92 */ #define DP_PEER_DEVICE_NONE 0x0 diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h new file mode 100644 index 000000000000..d9b0947b6f09 --- /dev/null +++ b/include/drm/drm_hdcp.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2017 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _DRM_HDCP_H_INCLUDED_ +#define _DRM_HDCP_H_INCLUDED_ + +/* Period of hdcp checks (to ensure we're still authenticated) */ +#define DRM_HDCP_CHECK_PERIOD_MS (128 * 16) + +/* Shared lengths/masks between HDMI/DVI/DisplayPort */ +#define DRM_HDCP_AN_LEN 8 +#define DRM_HDCP_BSTATUS_LEN 2 +#define DRM_HDCP_KSV_LEN 5 +#define DRM_HDCP_RI_LEN 2 +#define DRM_HDCP_V_PRIME_PART_LEN 4 +#define DRM_HDCP_V_PRIME_NUM_PARTS 5 +#define DRM_HDCP_NUM_DOWNSTREAM(x) (x & 0x3f) + +/* Slave address for the HDCP registers in the receiver */ +#define DRM_HDCP_DDC_ADDR 0x3A + +/* HDCP register offsets for HDMI/DVI devices */ +#define DRM_HDCP_DDC_BKSV 0x00 +#define DRM_HDCP_DDC_RI_PRIME 0x08 +#define DRM_HDCP_DDC_AKSV 0x10 +#define DRM_HDCP_DDC_AN 0x18 +#define DRM_HDCP_DDC_V_PRIME(h) (0x20 + h * 4) +#define DRM_HDCP_DDC_BCAPS 0x40 +#define DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT BIT(6) +#define DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY BIT(5) +#define DRM_HDCP_DDC_BSTATUS 0x41 +#define DRM_HDCP_DDC_KSV_FIFO 0x43 + +#endif -- 2.15.0.531.g2ccb3012c9-goog From 1585307957013304031@xxx Tue Nov 28 11:11:22 +0000 2017 X-GM-THRID: 1585307957013304031 X-Gmail-Labels: Inbox,Category Promotions,HistoricalUnread