Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp5347566ybi; Tue, 4 Jun 2019 05:25:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMqk2wEacvTUOtbUxl0uoURXlNGxWf4MlJbTfW8pBChpt744g+iuIZ/Ct6WnNYj6sbcoAg X-Received: by 2002:a17:90a:22c6:: with SMTP id s64mr4500310pjc.5.1559651105003; Tue, 04 Jun 2019 05:25:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559651104; cv=none; d=google.com; s=arc-20160816; b=IuYUYUdnBX55figVhT5b6IzkVId4ImNGvzag7VrI8i9BbN0nzBfwNdtXC2JiAIAabb F7Q5Idbl0OSO0m6V1wZwPD2qNS+9o7QBmKZGIAbjeg4y9olBvbBjNr664I7xom6q2tBb CkCO+Wl66Tyz6Nd0tqcQyr6G717HkVE9UyYTa8mxTeo0FSBSB8ZEtZctwCKHBml6NOig jn266rEFvr6DdOYCrgiKIhF7O29kl6PTvO0cbYYIaXCoy9fNDnW0KqxkoKSlwh5GbeDF L6SstiAKYGUc10HhwVhq6wjMdraYgRrbOgQkq2KfkPzp2qH73xMYni+qzmz4bhh4QQjn C9hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:message-id:references:subject:cc:to :from; bh=AbkmjuG0wLjjNU+PWjYCP3FpdWTiyRa9GM9zlXui2CA=; b=WuIL1Dj77MANClOwV7PD3iiEgPuLQ09OSh1FXC0ZdMByTKilt7u9EIErimUjDWwu5Y BGp19s++L0PSUrI5C2gzC2pSsoMEX5G/92h7WZX9XPChPLPAOkavZu7rN4tf+cjno+BX aDIhCkQpAgsqGoy92Xl8Jfmp2Cf+WDorYBUsXovsOmMaFFm44m6/8fFeb+ZY+VqPukJU 2AjUSDG00y8l8R5G08zR3nsB2TJGU3UXSKd/UiFa9J/89+eElXVD4J5EBFPwIzt3X+Zk tCpARYyJuS0lH5N0eWhrYLoKzm2URjZg7khmWTIzTBDCn9QGeHtAtRlHkuEd7c25v0Pz c/Lg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f1si22786228pgu.521.2019.06.04.05.24.46; Tue, 04 Jun 2019 05:25:04 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727730AbfFDMX0 (ORCPT + 99 others); Tue, 4 Jun 2019 08:23:26 -0400 Received: from verein.lst.de ([213.95.11.211]:35831 "EHLO newverein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbfFDMXZ (ORCPT ); Tue, 4 Jun 2019 08:23:25 -0400 Received: by newverein.lst.de (Postfix, from userid 2005) id 664D468BFE; Tue, 4 Jun 2019 14:22:58 +0200 (CEST) From: Torsten Duwe To: Maxime Ripard , Chen-Yu Tsai , Rob Herring , Mark Rutland , Thierry Reding , David Airlie , Daniel Vetter , Andrzej Hajda , Laurent Pinchart , Icenowy Zheng , Sean Paul , Vasily Khoruzhick , Harald Geyer , Greg Kroah-Hartman , Thomas Gleixner Cc: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] drm/bridge: Prepare Analogix anx6345 support References: <20190604122150.29D6468B05@newverein.lst.de> Message-Id: <20190604122258.664D468BFE@newverein.lst.de> Date: Tue, 4 Jun 2019 14:22:58 +0200 (CEST) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add bit definitions required for the anx6345 and add a sanity check in anx_dp_aux_transfer. Signed-off-by: Icenowy Zheng Signed-off-by: Vasily Khoruzhick Signed-off-by: Torsten Duwe --- drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 +- drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h | 8 ++++++++ drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c index d6016f789d80..e9d2ed4d410d 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.c @@ -124,7 +124,7 @@ ssize_t anx_dp_aux_transfer(struct regmap *map_dptx, else /* For non-zero-sized set the length field. */ ctrl1 |= (msg->size - 1) << SP_AUX_LENGTH_SHIFT; - if ((msg->request & DP_AUX_I2C_READ) == 0) { + if ((msg->size > 0) && ((msg->request & DP_AUX_I2C_READ) == 0)) { /* When WRITE | MOT write values to data buffer */ err = regmap_bulk_write(map_dptx, SP_DP_BUF_DATA0_REG, buffer, diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h index 30436c88f181..95ab89eecc60 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-dptx.h @@ -83,7 +83,11 @@ #define SP_CHA_STA BIT(2) /* Bits for DP System Control Register 3 */ #define SP_HPD_STATUS BIT(6) +#define SP_HPD_FORCE BIT(5) +#define SP_HPD_CTRL BIT(4) #define SP_STRM_VALID BIT(2) +#define SP_STRM_FORCE BIT(1) +#define SP_STRM_CTRL BIT(0) /* Bits for DP System Control Register 4 */ #define SP_ENHANCED_MODE BIT(3) @@ -128,6 +132,9 @@ #define SP_LINK_BW_SET_MASK 0x1f #define SP_INITIAL_SLIM_M_AUD_SEL BIT(5) +/* DP Lane Count Setting Register */ +#define SP_DP_LANE_COUNT_SET_REG 0xa1 + /* DP Training Pattern Set Register */ #define SP_DP_TRAINING_PATTERN_SET_REG 0xa2 @@ -141,6 +148,7 @@ /* DP Link Training Control Register */ #define SP_DP_LT_CTRL_REG 0xa8 +#define SP_DP_LT_INPROGRESS 0x80 #define SP_LT_ERROR_TYPE_MASK 0x70 # define SP_LT_NO_ERROR 0x00 # define SP_LT_AUX_WRITE_ERROR 0x01 diff --git a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h index f48293f86f9d..e3391a50b5d1 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h +++ b/drivers/gpu/drm/bridge/analogix/analogix-i2c-txcommon.h @@ -188,6 +188,9 @@ #define SP_VBIT BIT(1) #define SP_AUDIO_LAYOUT BIT(0) +/* Analog Debug Register 1 */ +#define SP_ANALOG_DEBUG1_REG 0xdc + /* Analog Debug Register 2 */ #define SP_ANALOG_DEBUG2_REG 0xdd #define SP_FORCE_SW_OFF_BYPASS 0x20 -- 2.16.4