From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29D4028D837 for ; Mon, 12 May 2025 12:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054069; cv=none; b=WThWJjyZwkIKJij+cLjAvRBBEr/gHtKWDBSthIkEke7qxWefOWw8ECWwMoS990TY7xIowpJUVPDTcSrJ0iSpbyJdiB4BWockhTJXcUmu8v7jogPQ0sCgfhWtGMbuu7HmXN0KlevZBTHd6hnH4O2MEIjXXvXIH0Gro+YaHqh+0Pg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054069; c=relaxed/simple; bh=UibPm8JFsOkoI4f4W52fxAdZnmRa6FyaB/wIa4lehxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZxSbbzcoWVI6HHtbHuysczQZ5L8IAss9DizLw2J/LRLb+uaZH8qyj+IZe7iO3jDNbiafS2swo4iAXCDG3kZX0yfkqIgM0AN8Z9SyIwNxAnvh1SvMoijvL67IGKrk2q7P0z8TuMJiNprF1VGOPuJMenMcfHJtHFOQraRwd2djd1A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=WUQAbnRU; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="WUQAbnRU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=oI GW/8ytkikXM0KlGUnSyE/r45nPY+JC9Vsvc+ssHxQ=; b=WUQAbnRUSIOvQdZBB1 kKX15J6wMLpGO+YZFs2AIdwxu3Q0ILJzACDNvtVtL6kVWohEPNTfxOhDHphVurja Cb7XC+Bl1Jx9VzhgaXatwJ7GYLf4j2UIpDZ/JHM7vySIiw2MNKLTBi62p9WD7HKC BcTD1rkN7B8DU8x9VpK/Ok+jQ= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S3; Mon, 12 May 2025 20:46:23 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 01/10] drm/rockchip: inno_hdmi: Merge register definition to c file Date: Mon, 12 May 2025 20:46:02 +0800 Message-ID: <20250512124615.2848731-2-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S3 X-Coremail-Antispam: 1Uf129KBjvAXoWfury8Cw1xAr4rtFy8Zry7Wrg_yoW8ur17Xo W7XFnxXw1UJw1xAw4DC342qrnrAr1kJr1rtr48JaykZFyxJF1q9r13XrW0vw13t348K3s8 Ga40gF1DC3sYyFZ8n29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUIlksUUUUU X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbB0hBLXmgh5MDGhQAAs5 Content-Type: text/plain; charset="utf-8" From: Andy Yan Since this register definition is only use in one single c file, there is no need to put it in a separate header. Signed-off-by: Andy Yan --- Changes in v5: - Split from patch 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 343 +++++++++++++++++++++++++- drivers/gpu/drm/rockchip/inno_hdmi.h | 349 --------------------------- 2 files changed, 340 insertions(+), 352 deletions(-) delete mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.h diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index db4b4038e51d5..bc25f5358bef6 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -29,11 +29,348 @@ =20 #include "rockchip_drm_drv.h" =20 -#include "inno_hdmi.h" +#define INNO_HDMI_MIN_TMDS_CLOCK 25000000U =20 -#define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) +#define DDC_SEGMENT_ADDR 0x30 + +#define HDMI_SCL_RATE (100 * 1000) + +#define DDC_BUS_FREQ_L 0x4b +#define DDC_BUS_FREQ_H 0x4c + +#define HDMI_SYS_CTRL 0x00 +#define m_RST_ANALOG (1 << 6) +#define v_RST_ANALOG (0 << 6) +#define v_NOT_RST_ANALOG (1 << 6) +#define m_RST_DIGITAL (1 << 5) +#define v_RST_DIGITAL (0 << 5) +#define v_NOT_RST_DIGITAL (1 << 5) +#define m_REG_CLK_INV (1 << 4) +#define v_REG_CLK_NOT_INV (0 << 4) +#define v_REG_CLK_INV (1 << 4) +#define m_VCLK_INV (1 << 3) +#define v_VCLK_NOT_INV (0 << 3) +#define v_VCLK_INV (1 << 3) +#define m_REG_CLK_SOURCE (1 << 2) +#define v_REG_CLK_SOURCE_TMDS (0 << 2) +#define v_REG_CLK_SOURCE_SYS (1 << 2) +#define m_POWER (1 << 1) +#define v_PWR_ON (0 << 1) +#define v_PWR_OFF (1 << 1) +#define m_INT_POL (1 << 0) +#define v_INT_POL_HIGH 1 +#define v_INT_POL_LOW 0 + +#define HDMI_VIDEO_CONTRL1 0x01 +#define m_VIDEO_INPUT_FORMAT (7 << 1) +#define m_DE_SOURCE (1 << 0) +#define v_VIDEO_INPUT_FORMAT(n) (n << 1) +#define v_DE_EXTERNAL 1 +#define v_DE_INTERNAL 0 +enum { + VIDEO_INPUT_SDR_RGB444 =3D 0, + VIDEO_INPUT_DDR_RGB444 =3D 5, + VIDEO_INPUT_DDR_YCBCR422 =3D 6 +}; =20 -#define INNO_HDMI_MIN_TMDS_CLOCK 25000000U +#define HDMI_VIDEO_CONTRL2 0x02 +#define m_VIDEO_OUTPUT_COLOR (3 << 6) +#define m_VIDEO_INPUT_BITS (3 << 4) +#define m_VIDEO_INPUT_CSP (1 << 0) +#define v_VIDEO_OUTPUT_COLOR(n) (((n) & 0x3) << 6) +#define v_VIDEO_INPUT_BITS(n) (n << 4) +#define v_VIDEO_INPUT_CSP(n) (n << 0) +enum { + VIDEO_INPUT_12BITS =3D 0, + VIDEO_INPUT_10BITS =3D 1, + VIDEO_INPUT_REVERT =3D 2, + VIDEO_INPUT_8BITS =3D 3, +}; + +#define HDMI_VIDEO_CONTRL 0x03 +#define m_VIDEO_AUTO_CSC (1 << 7) +#define v_VIDEO_AUTO_CSC(n) (n << 7) +#define m_VIDEO_C0_C2_SWAP (1 << 0) +#define v_VIDEO_C0_C2_SWAP(n) (n << 0) +enum { + C0_C2_CHANGE_ENABLE =3D 0, + C0_C2_CHANGE_DISABLE =3D 1, + AUTO_CSC_DISABLE =3D 0, + AUTO_CSC_ENABLE =3D 1, +}; + +#define HDMI_VIDEO_CONTRL3 0x04 +#define m_COLOR_DEPTH_NOT_INDICATED (1 << 4) +#define m_SOF (1 << 3) +#define m_COLOR_RANGE (1 << 2) +#define m_CSC (1 << 0) +#define v_COLOR_DEPTH_NOT_INDICATED(n) ((n) << 4) +#define v_SOF_ENABLE (0 << 3) +#define v_SOF_DISABLE (1 << 3) +#define v_COLOR_RANGE_FULL (1 << 2) +#define v_COLOR_RANGE_LIMITED (0 << 2) +#define v_CSC_ENABLE 1 +#define v_CSC_DISABLE 0 + +#define HDMI_AV_MUTE 0x05 +#define m_AVMUTE_CLEAR (1 << 7) +#define m_AVMUTE_ENABLE (1 << 6) +#define m_AUDIO_MUTE (1 << 1) +#define m_VIDEO_BLACK (1 << 0) +#define v_AVMUTE_CLEAR(n) (n << 7) +#define v_AVMUTE_ENABLE(n) (n << 6) +#define v_AUDIO_MUTE(n) (n << 1) +#define v_VIDEO_MUTE(n) (n << 0) + +#define HDMI_VIDEO_TIMING_CTL 0x08 +#define v_HSYNC_POLARITY(n) (n << 3) +#define v_VSYNC_POLARITY(n) (n << 2) +#define v_INETLACE(n) (n << 1) +#define v_EXTERANL_VIDEO(n) (n << 0) + +#define HDMI_VIDEO_EXT_HTOTAL_L 0x09 +#define HDMI_VIDEO_EXT_HTOTAL_H 0x0a +#define HDMI_VIDEO_EXT_HBLANK_L 0x0b +#define HDMI_VIDEO_EXT_HBLANK_H 0x0c +#define HDMI_VIDEO_EXT_HDELAY_L 0x0d +#define HDMI_VIDEO_EXT_HDELAY_H 0x0e +#define HDMI_VIDEO_EXT_HDURATION_L 0x0f +#define HDMI_VIDEO_EXT_HDURATION_H 0x10 +#define HDMI_VIDEO_EXT_VTOTAL_L 0x11 +#define HDMI_VIDEO_EXT_VTOTAL_H 0x12 +#define HDMI_VIDEO_EXT_VBLANK 0x13 +#define HDMI_VIDEO_EXT_VDELAY 0x14 +#define HDMI_VIDEO_EXT_VDURATION 0x15 + +#define HDMI_VIDEO_CSC_COEF 0x18 + +#define HDMI_AUDIO_CTRL1 0x35 +enum { + CTS_SOURCE_INTERNAL =3D 0, + CTS_SOURCE_EXTERNAL =3D 1, +}; +#define v_CTS_SOURCE(n) (n << 7) + +enum { + DOWNSAMPLE_DISABLE =3D 0, + DOWNSAMPLE_1_2 =3D 1, + DOWNSAMPLE_1_4 =3D 2, +}; +#define v_DOWN_SAMPLE(n) (n << 5) + +enum { + AUDIO_SOURCE_IIS =3D 0, + AUDIO_SOURCE_SPDIF =3D 1, +}; +#define v_AUDIO_SOURCE(n) (n << 3) + +#define v_MCLK_ENABLE(n) (n << 2) +enum { + MCLK_128FS =3D 0, + MCLK_256FS =3D 1, + MCLK_384FS =3D 2, + MCLK_512FS =3D 3, +}; +#define v_MCLK_RATIO(n) (n) + +#define AUDIO_SAMPLE_RATE 0x37 +enum { + AUDIO_32K =3D 0x3, + AUDIO_441K =3D 0x0, + AUDIO_48K =3D 0x2, + AUDIO_882K =3D 0x8, + AUDIO_96K =3D 0xa, + AUDIO_1764K =3D 0xc, + AUDIO_192K =3D 0xe, +}; + +#define AUDIO_I2S_MODE 0x38 +enum { + I2S_CHANNEL_1_2 =3D 1, + I2S_CHANNEL_3_4 =3D 3, + I2S_CHANNEL_5_6 =3D 7, + I2S_CHANNEL_7_8 =3D 0xf +}; +#define v_I2S_CHANNEL(n) ((n) << 2) +enum { + I2S_STANDARD =3D 0, + I2S_LEFT_JUSTIFIED =3D 1, + I2S_RIGHT_JUSTIFIED =3D 2, +}; +#define v_I2S_MODE(n) (n) + +#define AUDIO_I2S_MAP 0x39 +#define AUDIO_I2S_SWAPS_SPDIF 0x3a +#define v_SPIDF_FREQ(n) (n) + +#define N_32K 0x1000 +#define N_441K 0x1880 +#define N_882K 0x3100 +#define N_1764K 0x6200 +#define N_48K 0x1800 +#define N_96K 0x3000 +#define N_192K 0x6000 + +#define HDMI_AUDIO_CHANNEL_STATUS 0x3e +#define m_AUDIO_STATUS_NLPCM (1 << 7) +#define m_AUDIO_STATUS_USE (1 << 6) +#define m_AUDIO_STATUS_COPYRIGHT (1 << 5) +#define m_AUDIO_STATUS_ADDITION (3 << 2) +#define m_AUDIO_STATUS_CLK_ACCURACY (2 << 0) +#define v_AUDIO_STATUS_NLPCM(n) ((n & 1) << 7) +#define AUDIO_N_H 0x3f +#define AUDIO_N_M 0x40 +#define AUDIO_N_L 0x41 + +#define HDMI_AUDIO_CTS_H 0x45 +#define HDMI_AUDIO_CTS_M 0x46 +#define HDMI_AUDIO_CTS_L 0x47 + +#define HDMI_DDC_CLK_L 0x4b +#define HDMI_DDC_CLK_H 0x4c + +#define HDMI_EDID_SEGMENT_POINTER 0x4d +#define HDMI_EDID_WORD_ADDR 0x4e +#define HDMI_EDID_FIFO_OFFSET 0x4f +#define HDMI_EDID_FIFO_ADDR 0x50 + +#define HDMI_PACKET_SEND_MANUAL 0x9c +#define HDMI_PACKET_SEND_AUTO 0x9d +#define m_PACKET_GCP_EN (1 << 7) +#define m_PACKET_MSI_EN (1 << 6) +#define m_PACKET_SDI_EN (1 << 5) +#define m_PACKET_VSI_EN (1 << 4) +#define v_PACKET_GCP_EN(n) ((n & 1) << 7) +#define v_PACKET_MSI_EN(n) ((n & 1) << 6) +#define v_PACKET_SDI_EN(n) ((n & 1) << 5) +#define v_PACKET_VSI_EN(n) ((n & 1) << 4) + +#define HDMI_CONTROL_PACKET_BUF_INDEX 0x9f +enum { + INFOFRAME_VSI =3D 0x05, + INFOFRAME_AVI =3D 0x06, + INFOFRAME_AAI =3D 0x08, +}; + +#define HDMI_CONTROL_PACKET_ADDR 0xa0 +#define HDMI_MAXIMUM_INFO_FRAME_SIZE 0x11 +enum { + AVI_COLOR_MODE_RGB =3D 0, + AVI_COLOR_MODE_YCBCR422 =3D 1, + AVI_COLOR_MODE_YCBCR444 =3D 2, + AVI_COLORIMETRY_NO_DATA =3D 0, + + AVI_COLORIMETRY_SMPTE_170M =3D 1, + AVI_COLORIMETRY_ITU709 =3D 2, + AVI_COLORIMETRY_EXTENDED =3D 3, + + AVI_CODED_FRAME_ASPECT_NO_DATA =3D 0, + AVI_CODED_FRAME_ASPECT_4_3 =3D 1, + AVI_CODED_FRAME_ASPECT_16_9 =3D 2, + + ACTIVE_ASPECT_RATE_SAME_AS_CODED_FRAME =3D 0x08, + ACTIVE_ASPECT_RATE_4_3 =3D 0x09, + ACTIVE_ASPECT_RATE_16_9 =3D 0x0A, + ACTIVE_ASPECT_RATE_14_9 =3D 0x0B, +}; + +#define HDMI_HDCP_CTRL 0x52 +#define m_HDMI_DVI (1 << 1) +#define v_HDMI_DVI(n) (n << 1) + +#define HDMI_INTERRUPT_MASK1 0xc0 +#define HDMI_INTERRUPT_STATUS1 0xc1 +#define m_INT_ACTIVE_VSYNC (1 << 5) +#define m_INT_EDID_READY (1 << 2) + +#define HDMI_INTERRUPT_MASK2 0xc2 +#define HDMI_INTERRUPT_STATUS2 0xc3 +#define m_INT_HDCP_ERR (1 << 7) +#define m_INT_BKSV_FLAG (1 << 6) +#define m_INT_HDCP_OK (1 << 4) + +#define HDMI_STATUS 0xc8 +#define m_HOTPLUG (1 << 7) +#define m_MASK_INT_HOTPLUG (1 << 5) +#define m_INT_HOTPLUG (1 << 1) +#define v_MASK_INT_HOTPLUG(n) ((n & 0x1) << 5) + +#define HDMI_COLORBAR 0xc9 + +#define HDMI_PHY_SYNC 0xce +#define HDMI_PHY_SYS_CTL 0xe0 +#define m_TMDS_CLK_SOURCE (1 << 5) +#define v_TMDS_FROM_PLL (0 << 5) +#define v_TMDS_FROM_GEN (1 << 5) +#define m_PHASE_CLK (1 << 4) +#define v_DEFAULT_PHASE (0 << 4) +#define v_SYNC_PHASE (1 << 4) +#define m_TMDS_CURRENT_PWR (1 << 3) +#define v_TURN_ON_CURRENT (0 << 3) +#define v_CAT_OFF_CURRENT (1 << 3) +#define m_BANDGAP_PWR (1 << 2) +#define v_BANDGAP_PWR_UP (0 << 2) +#define v_BANDGAP_PWR_DOWN (1 << 2) +#define m_PLL_PWR (1 << 1) +#define v_PLL_PWR_UP (0 << 1) +#define v_PLL_PWR_DOWN (1 << 1) +#define m_TMDS_CHG_PWR (1 << 0) +#define v_TMDS_CHG_PWR_UP (0 << 0) +#define v_TMDS_CHG_PWR_DOWN (1 << 0) + +#define HDMI_PHY_CHG_PWR 0xe1 +#define v_CLK_CHG_PWR(n) ((n & 1) << 3) +#define v_DATA_CHG_PWR(n) ((n & 7) << 0) + +#define HDMI_PHY_DRIVER 0xe2 +#define v_CLK_MAIN_DRIVER(n) (n << 4) +#define v_DATA_MAIN_DRIVER(n) (n << 0) + +#define HDMI_PHY_PRE_EMPHASIS 0xe3 +#define v_PRE_EMPHASIS(n) ((n & 7) << 4) +#define v_CLK_PRE_DRIVER(n) ((n & 3) << 2) +#define v_DATA_PRE_DRIVER(n) ((n & 3) << 0) + +#define HDMI_PHY_FEEDBACK_DIV_RATIO_LOW 0xe7 +#define v_FEEDBACK_DIV_LOW(n) (n & 0xff) +#define HDMI_PHY_FEEDBACK_DIV_RATIO_HIGH 0xe8 +#define v_FEEDBACK_DIV_HIGH(n) (n & 1) + +#define HDMI_PHY_PRE_DIV_RATIO 0xed +#define v_PRE_DIV_RATIO(n) (n & 0x1f) + +#define HDMI_CEC_CTRL 0xd0 +#define m_ADJUST_FOR_HISENSE (1 << 6) +#define m_REJECT_RX_BROADCAST (1 << 5) +#define m_BUSFREETIME_ENABLE (1 << 2) +#define m_REJECT_RX (1 << 1) +#define m_START_TX (1 << 0) + +#define HDMI_CEC_DATA 0xd1 +#define HDMI_CEC_TX_OFFSET 0xd2 +#define HDMI_CEC_RX_OFFSET 0xd3 +#define HDMI_CEC_CLK_H 0xd4 +#define HDMI_CEC_CLK_L 0xd5 +#define HDMI_CEC_TX_LENGTH 0xd6 +#define HDMI_CEC_RX_LENGTH 0xd7 +#define HDMI_CEC_TX_INT_MASK 0xd8 +#define m_TX_DONE (1 << 3) +#define m_TX_NOACK (1 << 2) +#define m_TX_BROADCAST_REJ (1 << 1) +#define m_TX_BUSNOTFREE (1 << 0) + +#define HDMI_CEC_RX_INT_MASK 0xd9 +#define m_RX_LA_ERR (1 << 4) +#define m_RX_GLITCH (1 << 3) +#define m_RX_DONE (1 << 0) + +#define HDMI_CEC_TX_INT 0xda +#define HDMI_CEC_RX_INT 0xdb +#define HDMI_CEC_BUSFREETIME_L 0xdc +#define HDMI_CEC_BUSFREETIME_H 0xdd +#define HDMI_CEC_LOGICADDR 0xde + +#define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) =20 #define RK3036_GRF_SOC_CON2 0x148 #define RK3036_HDMI_PHSYNC BIT(4) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.h b/drivers/gpu/drm/rockchi= p/inno_hdmi.h deleted file mode 100644 index 8b7ef3fac4853..0000000000000 --- a/drivers/gpu/drm/rockchip/inno_hdmi.h +++ /dev/null @@ -1,349 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) Rockchip Electronics Co., Ltd. - * Zheng Yang - * Yakir Yang - */ - -#ifndef __INNO_HDMI_H__ -#define __INNO_HDMI_H__ - -#define DDC_SEGMENT_ADDR 0x30 - -#define HDMI_SCL_RATE (100*1000) -#define DDC_BUS_FREQ_L 0x4b -#define DDC_BUS_FREQ_H 0x4c - -#define HDMI_SYS_CTRL 0x00 -#define m_RST_ANALOG (1 << 6) -#define v_RST_ANALOG (0 << 6) -#define v_NOT_RST_ANALOG (1 << 6) -#define m_RST_DIGITAL (1 << 5) -#define v_RST_DIGITAL (0 << 5) -#define v_NOT_RST_DIGITAL (1 << 5) -#define m_REG_CLK_INV (1 << 4) -#define v_REG_CLK_NOT_INV (0 << 4) -#define v_REG_CLK_INV (1 << 4) -#define m_VCLK_INV (1 << 3) -#define v_VCLK_NOT_INV (0 << 3) -#define v_VCLK_INV (1 << 3) -#define m_REG_CLK_SOURCE (1 << 2) -#define v_REG_CLK_SOURCE_TMDS (0 << 2) -#define v_REG_CLK_SOURCE_SYS (1 << 2) -#define m_POWER (1 << 1) -#define v_PWR_ON (0 << 1) -#define v_PWR_OFF (1 << 1) -#define m_INT_POL (1 << 0) -#define v_INT_POL_HIGH 1 -#define v_INT_POL_LOW 0 - -#define HDMI_VIDEO_CONTRL1 0x01 -#define m_VIDEO_INPUT_FORMAT (7 << 1) -#define m_DE_SOURCE (1 << 0) -#define v_VIDEO_INPUT_FORMAT(n) (n << 1) -#define v_DE_EXTERNAL 1 -#define v_DE_INTERNAL 0 -enum { - VIDEO_INPUT_SDR_RGB444 =3D 0, - VIDEO_INPUT_DDR_RGB444 =3D 5, - VIDEO_INPUT_DDR_YCBCR422 =3D 6 -}; - -#define HDMI_VIDEO_CONTRL2 0x02 -#define m_VIDEO_OUTPUT_COLOR (3 << 6) -#define m_VIDEO_INPUT_BITS (3 << 4) -#define m_VIDEO_INPUT_CSP (1 << 0) -#define v_VIDEO_OUTPUT_COLOR(n) (((n) & 0x3) << 6) -#define v_VIDEO_INPUT_BITS(n) (n << 4) -#define v_VIDEO_INPUT_CSP(n) (n << 0) -enum { - VIDEO_INPUT_12BITS =3D 0, - VIDEO_INPUT_10BITS =3D 1, - VIDEO_INPUT_REVERT =3D 2, - VIDEO_INPUT_8BITS =3D 3, -}; - -#define HDMI_VIDEO_CONTRL 0x03 -#define m_VIDEO_AUTO_CSC (1 << 7) -#define v_VIDEO_AUTO_CSC(n) (n << 7) -#define m_VIDEO_C0_C2_SWAP (1 << 0) -#define v_VIDEO_C0_C2_SWAP(n) (n << 0) -enum { - C0_C2_CHANGE_ENABLE =3D 0, - C0_C2_CHANGE_DISABLE =3D 1, - AUTO_CSC_DISABLE =3D 0, - AUTO_CSC_ENABLE =3D 1, -}; - -#define HDMI_VIDEO_CONTRL3 0x04 -#define m_COLOR_DEPTH_NOT_INDICATED (1 << 4) -#define m_SOF (1 << 3) -#define m_COLOR_RANGE (1 << 2) -#define m_CSC (1 << 0) -#define v_COLOR_DEPTH_NOT_INDICATED(n) ((n) << 4) -#define v_SOF_ENABLE (0 << 3) -#define v_SOF_DISABLE (1 << 3) -#define v_COLOR_RANGE_FULL (1 << 2) -#define v_COLOR_RANGE_LIMITED (0 << 2) -#define v_CSC_ENABLE 1 -#define v_CSC_DISABLE 0 - -#define HDMI_AV_MUTE 0x05 -#define m_AVMUTE_CLEAR (1 << 7) -#define m_AVMUTE_ENABLE (1 << 6) -#define m_AUDIO_MUTE (1 << 1) -#define m_VIDEO_BLACK (1 << 0) -#define v_AVMUTE_CLEAR(n) (n << 7) -#define v_AVMUTE_ENABLE(n) (n << 6) -#define v_AUDIO_MUTE(n) (n << 1) -#define v_VIDEO_MUTE(n) (n << 0) - -#define HDMI_VIDEO_TIMING_CTL 0x08 -#define v_HSYNC_POLARITY(n) (n << 3) -#define v_VSYNC_POLARITY(n) (n << 2) -#define v_INETLACE(n) (n << 1) -#define v_EXTERANL_VIDEO(n) (n << 0) - -#define HDMI_VIDEO_EXT_HTOTAL_L 0x09 -#define HDMI_VIDEO_EXT_HTOTAL_H 0x0a -#define HDMI_VIDEO_EXT_HBLANK_L 0x0b -#define HDMI_VIDEO_EXT_HBLANK_H 0x0c -#define HDMI_VIDEO_EXT_HDELAY_L 0x0d -#define HDMI_VIDEO_EXT_HDELAY_H 0x0e -#define HDMI_VIDEO_EXT_HDURATION_L 0x0f -#define HDMI_VIDEO_EXT_HDURATION_H 0x10 -#define HDMI_VIDEO_EXT_VTOTAL_L 0x11 -#define HDMI_VIDEO_EXT_VTOTAL_H 0x12 -#define HDMI_VIDEO_EXT_VBLANK 0x13 -#define HDMI_VIDEO_EXT_VDELAY 0x14 -#define HDMI_VIDEO_EXT_VDURATION 0x15 - -#define HDMI_VIDEO_CSC_COEF 0x18 - -#define HDMI_AUDIO_CTRL1 0x35 -enum { - CTS_SOURCE_INTERNAL =3D 0, - CTS_SOURCE_EXTERNAL =3D 1, -}; -#define v_CTS_SOURCE(n) (n << 7) - -enum { - DOWNSAMPLE_DISABLE =3D 0, - DOWNSAMPLE_1_2 =3D 1, - DOWNSAMPLE_1_4 =3D 2, -}; -#define v_DOWN_SAMPLE(n) (n << 5) - -enum { - AUDIO_SOURCE_IIS =3D 0, - AUDIO_SOURCE_SPDIF =3D 1, -}; -#define v_AUDIO_SOURCE(n) (n << 3) - -#define v_MCLK_ENABLE(n) (n << 2) -enum { - MCLK_128FS =3D 0, - MCLK_256FS =3D 1, - MCLK_384FS =3D 2, - MCLK_512FS =3D 3, -}; -#define v_MCLK_RATIO(n) (n) - -#define AUDIO_SAMPLE_RATE 0x37 -enum { - AUDIO_32K =3D 0x3, - AUDIO_441K =3D 0x0, - AUDIO_48K =3D 0x2, - AUDIO_882K =3D 0x8, - AUDIO_96K =3D 0xa, - AUDIO_1764K =3D 0xc, - AUDIO_192K =3D 0xe, -}; - -#define AUDIO_I2S_MODE 0x38 -enum { - I2S_CHANNEL_1_2 =3D 1, - I2S_CHANNEL_3_4 =3D 3, - I2S_CHANNEL_5_6 =3D 7, - I2S_CHANNEL_7_8 =3D 0xf -}; -#define v_I2S_CHANNEL(n) ((n) << 2) -enum { - I2S_STANDARD =3D 0, - I2S_LEFT_JUSTIFIED =3D 1, - I2S_RIGHT_JUSTIFIED =3D 2, -}; -#define v_I2S_MODE(n) (n) - -#define AUDIO_I2S_MAP 0x39 -#define AUDIO_I2S_SWAPS_SPDIF 0x3a -#define v_SPIDF_FREQ(n) (n) - -#define N_32K 0x1000 -#define N_441K 0x1880 -#define N_882K 0x3100 -#define N_1764K 0x6200 -#define N_48K 0x1800 -#define N_96K 0x3000 -#define N_192K 0x6000 - -#define HDMI_AUDIO_CHANNEL_STATUS 0x3e -#define m_AUDIO_STATUS_NLPCM (1 << 7) -#define m_AUDIO_STATUS_USE (1 << 6) -#define m_AUDIO_STATUS_COPYRIGHT (1 << 5) -#define m_AUDIO_STATUS_ADDITION (3 << 2) -#define m_AUDIO_STATUS_CLK_ACCURACY (2 << 0) -#define v_AUDIO_STATUS_NLPCM(n) ((n & 1) << 7) -#define AUDIO_N_H 0x3f -#define AUDIO_N_M 0x40 -#define AUDIO_N_L 0x41 - -#define HDMI_AUDIO_CTS_H 0x45 -#define HDMI_AUDIO_CTS_M 0x46 -#define HDMI_AUDIO_CTS_L 0x47 - -#define HDMI_DDC_CLK_L 0x4b -#define HDMI_DDC_CLK_H 0x4c - -#define HDMI_EDID_SEGMENT_POINTER 0x4d -#define HDMI_EDID_WORD_ADDR 0x4e -#define HDMI_EDID_FIFO_OFFSET 0x4f -#define HDMI_EDID_FIFO_ADDR 0x50 - -#define HDMI_PACKET_SEND_MANUAL 0x9c -#define HDMI_PACKET_SEND_AUTO 0x9d -#define m_PACKET_GCP_EN (1 << 7) -#define m_PACKET_MSI_EN (1 << 6) -#define m_PACKET_SDI_EN (1 << 5) -#define m_PACKET_VSI_EN (1 << 4) -#define v_PACKET_GCP_EN(n) ((n & 1) << 7) -#define v_PACKET_MSI_EN(n) ((n & 1) << 6) -#define v_PACKET_SDI_EN(n) ((n & 1) << 5) -#define v_PACKET_VSI_EN(n) ((n & 1) << 4) - -#define HDMI_CONTROL_PACKET_BUF_INDEX 0x9f -enum { - INFOFRAME_VSI =3D 0x05, - INFOFRAME_AVI =3D 0x06, - INFOFRAME_AAI =3D 0x08, -}; - -#define HDMI_CONTROL_PACKET_ADDR 0xa0 -#define HDMI_MAXIMUM_INFO_FRAME_SIZE 0x11 -enum { - AVI_COLOR_MODE_RGB =3D 0, - AVI_COLOR_MODE_YCBCR422 =3D 1, - AVI_COLOR_MODE_YCBCR444 =3D 2, - AVI_COLORIMETRY_NO_DATA =3D 0, - - AVI_COLORIMETRY_SMPTE_170M =3D 1, - AVI_COLORIMETRY_ITU709 =3D 2, - AVI_COLORIMETRY_EXTENDED =3D 3, - - AVI_CODED_FRAME_ASPECT_NO_DATA =3D 0, - AVI_CODED_FRAME_ASPECT_4_3 =3D 1, - AVI_CODED_FRAME_ASPECT_16_9 =3D 2, - - ACTIVE_ASPECT_RATE_SAME_AS_CODED_FRAME =3D 0x08, - ACTIVE_ASPECT_RATE_4_3 =3D 0x09, - ACTIVE_ASPECT_RATE_16_9 =3D 0x0A, - ACTIVE_ASPECT_RATE_14_9 =3D 0x0B, -}; - -#define HDMI_HDCP_CTRL 0x52 -#define m_HDMI_DVI (1 << 1) -#define v_HDMI_DVI(n) (n << 1) - -#define HDMI_INTERRUPT_MASK1 0xc0 -#define HDMI_INTERRUPT_STATUS1 0xc1 -#define m_INT_ACTIVE_VSYNC (1 << 5) -#define m_INT_EDID_READY (1 << 2) - -#define HDMI_INTERRUPT_MASK2 0xc2 -#define HDMI_INTERRUPT_STATUS2 0xc3 -#define m_INT_HDCP_ERR (1 << 7) -#define m_INT_BKSV_FLAG (1 << 6) -#define m_INT_HDCP_OK (1 << 4) - -#define HDMI_STATUS 0xc8 -#define m_HOTPLUG (1 << 7) -#define m_MASK_INT_HOTPLUG (1 << 5) -#define m_INT_HOTPLUG (1 << 1) -#define v_MASK_INT_HOTPLUG(n) ((n & 0x1) << 5) - -#define HDMI_COLORBAR 0xc9 - -#define HDMI_PHY_SYNC 0xce -#define HDMI_PHY_SYS_CTL 0xe0 -#define m_TMDS_CLK_SOURCE (1 << 5) -#define v_TMDS_FROM_PLL (0 << 5) -#define v_TMDS_FROM_GEN (1 << 5) -#define m_PHASE_CLK (1 << 4) -#define v_DEFAULT_PHASE (0 << 4) -#define v_SYNC_PHASE (1 << 4) -#define m_TMDS_CURRENT_PWR (1 << 3) -#define v_TURN_ON_CURRENT (0 << 3) -#define v_CAT_OFF_CURRENT (1 << 3) -#define m_BANDGAP_PWR (1 << 2) -#define v_BANDGAP_PWR_UP (0 << 2) -#define v_BANDGAP_PWR_DOWN (1 << 2) -#define m_PLL_PWR (1 << 1) -#define v_PLL_PWR_UP (0 << 1) -#define v_PLL_PWR_DOWN (1 << 1) -#define m_TMDS_CHG_PWR (1 << 0) -#define v_TMDS_CHG_PWR_UP (0 << 0) -#define v_TMDS_CHG_PWR_DOWN (1 << 0) - -#define HDMI_PHY_CHG_PWR 0xe1 -#define v_CLK_CHG_PWR(n) ((n & 1) << 3) -#define v_DATA_CHG_PWR(n) ((n & 7) << 0) - -#define HDMI_PHY_DRIVER 0xe2 -#define v_CLK_MAIN_DRIVER(n) (n << 4) -#define v_DATA_MAIN_DRIVER(n) (n << 0) - -#define HDMI_PHY_PRE_EMPHASIS 0xe3 -#define v_PRE_EMPHASIS(n) ((n & 7) << 4) -#define v_CLK_PRE_DRIVER(n) ((n & 3) << 2) -#define v_DATA_PRE_DRIVER(n) ((n & 3) << 0) - -#define HDMI_PHY_FEEDBACK_DIV_RATIO_LOW 0xe7 -#define v_FEEDBACK_DIV_LOW(n) (n & 0xff) -#define HDMI_PHY_FEEDBACK_DIV_RATIO_HIGH 0xe8 -#define v_FEEDBACK_DIV_HIGH(n) (n & 1) - -#define HDMI_PHY_PRE_DIV_RATIO 0xed -#define v_PRE_DIV_RATIO(n) (n & 0x1f) - -#define HDMI_CEC_CTRL 0xd0 -#define m_ADJUST_FOR_HISENSE (1 << 6) -#define m_REJECT_RX_BROADCAST (1 << 5) -#define m_BUSFREETIME_ENABLE (1 << 2) -#define m_REJECT_RX (1 << 1) -#define m_START_TX (1 << 0) - -#define HDMI_CEC_DATA 0xd1 -#define HDMI_CEC_TX_OFFSET 0xd2 -#define HDMI_CEC_RX_OFFSET 0xd3 -#define HDMI_CEC_CLK_H 0xd4 -#define HDMI_CEC_CLK_L 0xd5 -#define HDMI_CEC_TX_LENGTH 0xd6 -#define HDMI_CEC_RX_LENGTH 0xd7 -#define HDMI_CEC_TX_INT_MASK 0xd8 -#define m_TX_DONE (1 << 3) -#define m_TX_NOACK (1 << 2) -#define m_TX_BROADCAST_REJ (1 << 1) -#define m_TX_BUSNOTFREE (1 << 0) - -#define HDMI_CEC_RX_INT_MASK 0xd9 -#define m_RX_LA_ERR (1 << 4) -#define m_RX_GLITCH (1 << 3) -#define m_RX_DONE (1 << 0) - -#define HDMI_CEC_TX_INT 0xda -#define HDMI_CEC_RX_INT 0xdb -#define HDMI_CEC_BUSFREETIME_L 0xdc -#define HDMI_CEC_BUSFREETIME_H 0xdd -#define HDMI_CEC_LOGICADDR 0xde - -#endif /* __INNO_HDMI_H__ */ --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1375025522B for ; Mon, 12 May 2025 12:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054070; cv=none; b=ZqaMyy6TMH5EpodVbJOBTpyy/X2zGyhXqQsIY88nxtpjtO8It+18IXYJ7HqdIgW7Cc97arJ4Zf1VV8Ijg9ZYZ8GaJvLm3zKJGqK3gRIcQaxuwBAI0v1w0Ds3zhyBMRbU1wGCaIZy+yDa6fNZ9IEKiJfsQZ8ZwSchQhMSEqyCqRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054070; c=relaxed/simple; bh=+mELN+j+0F5Kd5FV0prsxj1bw3gMfhFfw5Yv9Vs8MjU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oQaOtLMwHFYeKELojpe8iW1BvBvGcChxytsNnfOtyAUvp/54v7GuaaluluO06ZCq04wKiuYlB5KypUQ4MPgPqaw4N/QkEuqLdkTsz/yYBj0lDq5LJH/0nZhdqt8GDhs4fywxf1jsYzot8V/OAYqeuHPx4znh05DW5CD2wNcT2Js= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=KLYDIaH7; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="KLYDIaH7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=E+ xwpLeWwS3mjCKrsIh8QRMLwWgj6Czpmtl+ktdgq9g=; b=KLYDIaH7QZNgMasUOq /aNlvhcpixxvbB30lz/ipM4YMii/zHwiOgFIN7TFQdZ6dkoo/a1J5KtsqriMPzoA W56TcCw8KbG11kgW6pYcL9kTBNRIMNcQilMm+R5tv8/x8VdM9/10R/JHowicx3sl 8Pbtp+/B9BEst4GAyU4Z7Z4+o= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S4; Mon, 12 May 2025 20:46:24 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 02/10] drm/rockchip: inno_hdmi: Refactor register macros to make checkpatch happy Date: Mon, 12 May 2025 20:46:03 +0800 Message-ID: <20250512124615.2848731-3-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S4 X-Coremail-Antispam: 1Uf129KBjvJXoW3uw4xXrW5JFy5KFW8Jr1DJrb_yoWkuFyxpF 45Aa4UtryUtF43Kw1ftFn8G3W7tr1UJr4DKr1j9w45ZF4UAw1kJF1UWrsxtFyqqr4kt34U tw4DAw18XasruwUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jh5r7UUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqBhLXmgh6hVMhQAAsa Content-Type: text/plain; charset="utf-8" From: Andy Yan 1. Prefer using the BIT macro 2. Macro argument 'n' as '(n)' to avoid precedence issues 3. Add a blank line after enum declarations Signed-off-by: Andy Yan --- Changes in v5: - Split from patch 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 214 ++++++++++++++------------- 1 file changed, 113 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index bc25f5358bef6..82c62400b2e1e 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -39,32 +39,32 @@ #define DDC_BUS_FREQ_H 0x4c =20 #define HDMI_SYS_CTRL 0x00 -#define m_RST_ANALOG (1 << 6) +#define m_RST_ANALOG BIT(6) #define v_RST_ANALOG (0 << 6) -#define v_NOT_RST_ANALOG (1 << 6) -#define m_RST_DIGITAL (1 << 5) +#define v_NOT_RST_ANALOG BIT(6) +#define m_RST_DIGITAL BIT(5) #define v_RST_DIGITAL (0 << 5) -#define v_NOT_RST_DIGITAL (1 << 5) -#define m_REG_CLK_INV (1 << 4) +#define v_NOT_RST_DIGITAL BIT(5) +#define m_REG_CLK_INV BIT(4) #define v_REG_CLK_NOT_INV (0 << 4) -#define v_REG_CLK_INV (1 << 4) -#define m_VCLK_INV (1 << 3) +#define v_REG_CLK_INV BIT(4) +#define m_VCLK_INV BIT(3) #define v_VCLK_NOT_INV (0 << 3) -#define v_VCLK_INV (1 << 3) -#define m_REG_CLK_SOURCE (1 << 2) +#define v_VCLK_INV BIT(3) +#define m_REG_CLK_SOURCE BIT(2) #define v_REG_CLK_SOURCE_TMDS (0 << 2) -#define v_REG_CLK_SOURCE_SYS (1 << 2) -#define m_POWER (1 << 1) +#define v_REG_CLK_SOURCE_SYS BIT(2) +#define m_POWER BIT(1) #define v_PWR_ON (0 << 1) -#define v_PWR_OFF (1 << 1) -#define m_INT_POL (1 << 0) +#define v_PWR_OFF BIT(1) +#define m_INT_POL BIT(0) #define v_INT_POL_HIGH 1 #define v_INT_POL_LOW 0 =20 #define HDMI_VIDEO_CONTRL1 0x01 #define m_VIDEO_INPUT_FORMAT (7 << 1) -#define m_DE_SOURCE (1 << 0) -#define v_VIDEO_INPUT_FORMAT(n) (n << 1) +#define m_DE_SOURCE BIT(0) +#define v_VIDEO_INPUT_FORMAT(n) ((n) << 1) #define v_DE_EXTERNAL 1 #define v_DE_INTERNAL 0 enum { @@ -76,10 +76,10 @@ enum { #define HDMI_VIDEO_CONTRL2 0x02 #define m_VIDEO_OUTPUT_COLOR (3 << 6) #define m_VIDEO_INPUT_BITS (3 << 4) -#define m_VIDEO_INPUT_CSP (1 << 0) +#define m_VIDEO_INPUT_CSP BIT(0) #define v_VIDEO_OUTPUT_COLOR(n) (((n) & 0x3) << 6) -#define v_VIDEO_INPUT_BITS(n) (n << 4) -#define v_VIDEO_INPUT_CSP(n) (n << 0) +#define v_VIDEO_INPUT_BITS(n) ((n) << 4) +#define v_VIDEO_INPUT_CSP(n) ((n) << 0) enum { VIDEO_INPUT_12BITS =3D 0, VIDEO_INPUT_10BITS =3D 1, @@ -88,10 +88,10 @@ enum { }; =20 #define HDMI_VIDEO_CONTRL 0x03 -#define m_VIDEO_AUTO_CSC (1 << 7) -#define v_VIDEO_AUTO_CSC(n) (n << 7) -#define m_VIDEO_C0_C2_SWAP (1 << 0) -#define v_VIDEO_C0_C2_SWAP(n) (n << 0) +#define m_VIDEO_AUTO_CSC BIT(7) +#define v_VIDEO_AUTO_CSC(n) ((n) << 7) +#define m_VIDEO_C0_C2_SWAP BIT(0) +#define v_VIDEO_C0_C2_SWAP(n) ((n) << 0) enum { C0_C2_CHANGE_ENABLE =3D 0, C0_C2_CHANGE_DISABLE =3D 1, @@ -100,33 +100,33 @@ enum { }; =20 #define HDMI_VIDEO_CONTRL3 0x04 -#define m_COLOR_DEPTH_NOT_INDICATED (1 << 4) -#define m_SOF (1 << 3) -#define m_COLOR_RANGE (1 << 2) -#define m_CSC (1 << 0) +#define m_COLOR_DEPTH_NOT_INDICATED BIT(4) +#define m_SOF BIT(3) +#define m_COLOR_RANGE BIT(2) +#define m_CSC BIT(0) #define v_COLOR_DEPTH_NOT_INDICATED(n) ((n) << 4) #define v_SOF_ENABLE (0 << 3) -#define v_SOF_DISABLE (1 << 3) -#define v_COLOR_RANGE_FULL (1 << 2) +#define v_SOF_DISABLE BIT(3) +#define v_COLOR_RANGE_FULL BIT(2) #define v_COLOR_RANGE_LIMITED (0 << 2) #define v_CSC_ENABLE 1 #define v_CSC_DISABLE 0 =20 #define HDMI_AV_MUTE 0x05 -#define m_AVMUTE_CLEAR (1 << 7) -#define m_AVMUTE_ENABLE (1 << 6) -#define m_AUDIO_MUTE (1 << 1) -#define m_VIDEO_BLACK (1 << 0) -#define v_AVMUTE_CLEAR(n) (n << 7) -#define v_AVMUTE_ENABLE(n) (n << 6) -#define v_AUDIO_MUTE(n) (n << 1) -#define v_VIDEO_MUTE(n) (n << 0) +#define m_AVMUTE_CLEAR BIT(7) +#define m_AVMUTE_ENABLE BIT(6) +#define m_AUDIO_MUTE BIT(1) +#define m_VIDEO_BLACK BIT(0) +#define v_AVMUTE_CLEAR(n) ((n) << 7) +#define v_AVMUTE_ENABLE(n) ((n) << 6) +#define v_AUDIO_MUTE(n) ((n) << 1) +#define v_VIDEO_MUTE(n) ((n) << 0) =20 #define HDMI_VIDEO_TIMING_CTL 0x08 -#define v_HSYNC_POLARITY(n) (n << 3) -#define v_VSYNC_POLARITY(n) (n << 2) -#define v_INETLACE(n) (n << 1) -#define v_EXTERANL_VIDEO(n) (n << 0) +#define v_HSYNC_POLARITY(n) ((n) << 3) +#define v_VSYNC_POLARITY(n) ((n) << 2) +#define v_INETLACE(n) ((n) << 1) +#define v_EXTERANL_VIDEO(n) ((n) << 0) =20 #define HDMI_VIDEO_EXT_HTOTAL_L 0x09 #define HDMI_VIDEO_EXT_HTOTAL_H 0x0a @@ -149,31 +149,37 @@ enum { CTS_SOURCE_INTERNAL =3D 0, CTS_SOURCE_EXTERNAL =3D 1, }; -#define v_CTS_SOURCE(n) (n << 7) + +#define v_CTS_SOURCE(n) ((n) << 7) =20 enum { DOWNSAMPLE_DISABLE =3D 0, DOWNSAMPLE_1_2 =3D 1, DOWNSAMPLE_1_4 =3D 2, }; -#define v_DOWN_SAMPLE(n) (n << 5) + +#define v_DOWN_SAMPLE(n) ((n) << 5) =20 enum { AUDIO_SOURCE_IIS =3D 0, AUDIO_SOURCE_SPDIF =3D 1, }; -#define v_AUDIO_SOURCE(n) (n << 3) =20 -#define v_MCLK_ENABLE(n) (n << 2) +#define v_AUDIO_SOURCE(n) ((n) << 3) + +#define v_MCLK_ENABLE(n) ((n) << 2) + enum { MCLK_128FS =3D 0, MCLK_256FS =3D 1, MCLK_384FS =3D 2, MCLK_512FS =3D 3, }; + #define v_MCLK_RATIO(n) (n) =20 #define AUDIO_SAMPLE_RATE 0x37 + enum { AUDIO_32K =3D 0x3, AUDIO_441K =3D 0x0, @@ -185,18 +191,22 @@ enum { }; =20 #define AUDIO_I2S_MODE 0x38 + enum { I2S_CHANNEL_1_2 =3D 1, I2S_CHANNEL_3_4 =3D 3, I2S_CHANNEL_5_6 =3D 7, I2S_CHANNEL_7_8 =3D 0xf }; + #define v_I2S_CHANNEL(n) ((n) << 2) + enum { I2S_STANDARD =3D 0, I2S_LEFT_JUSTIFIED =3D 1, I2S_RIGHT_JUSTIFIED =3D 2, }; + #define v_I2S_MODE(n) (n) =20 #define AUDIO_I2S_MAP 0x39 @@ -212,12 +222,12 @@ enum { #define N_192K 0x6000 =20 #define HDMI_AUDIO_CHANNEL_STATUS 0x3e -#define m_AUDIO_STATUS_NLPCM (1 << 7) -#define m_AUDIO_STATUS_USE (1 << 6) -#define m_AUDIO_STATUS_COPYRIGHT (1 << 5) +#define m_AUDIO_STATUS_NLPCM BIT(7) +#define m_AUDIO_STATUS_USE BIT(6) +#define m_AUDIO_STATUS_COPYRIGHT BIT(5) #define m_AUDIO_STATUS_ADDITION (3 << 2) #define m_AUDIO_STATUS_CLK_ACCURACY (2 << 0) -#define v_AUDIO_STATUS_NLPCM(n) ((n & 1) << 7) +#define v_AUDIO_STATUS_NLPCM(n) (((n) & 1) << 7) #define AUDIO_N_H 0x3f #define AUDIO_N_M 0x40 #define AUDIO_N_L 0x41 @@ -236,16 +246,17 @@ enum { =20 #define HDMI_PACKET_SEND_MANUAL 0x9c #define HDMI_PACKET_SEND_AUTO 0x9d -#define m_PACKET_GCP_EN (1 << 7) -#define m_PACKET_MSI_EN (1 << 6) -#define m_PACKET_SDI_EN (1 << 5) -#define m_PACKET_VSI_EN (1 << 4) -#define v_PACKET_GCP_EN(n) ((n & 1) << 7) -#define v_PACKET_MSI_EN(n) ((n & 1) << 6) -#define v_PACKET_SDI_EN(n) ((n & 1) << 5) -#define v_PACKET_VSI_EN(n) ((n & 1) << 4) +#define m_PACKET_GCP_EN BIT(7) +#define m_PACKET_MSI_EN BIT(6) +#define m_PACKET_SDI_EN BIT(5) +#define m_PACKET_VSI_EN BIT(4) +#define v_PACKET_GCP_EN(n) (((n) & 1) << 7) +#define v_PACKET_MSI_EN(n) (((n) & 1) << 6) +#define v_PACKET_SDI_EN(n) (((n) & 1) << 5) +#define v_PACKET_VSI_EN(n) (((n) & 1) << 4) =20 #define HDMI_CONTROL_PACKET_BUF_INDEX 0x9f + enum { INFOFRAME_VSI =3D 0x05, INFOFRAME_AVI =3D 0x06, @@ -254,6 +265,7 @@ enum { =20 #define HDMI_CONTROL_PACKET_ADDR 0xa0 #define HDMI_MAXIMUM_INFO_FRAME_SIZE 0x11 + enum { AVI_COLOR_MODE_RGB =3D 0, AVI_COLOR_MODE_YCBCR422 =3D 1, @@ -275,76 +287,76 @@ enum { }; =20 #define HDMI_HDCP_CTRL 0x52 -#define m_HDMI_DVI (1 << 1) -#define v_HDMI_DVI(n) (n << 1) +#define m_HDMI_DVI BIT(1) +#define v_HDMI_DVI(n) ((n) << 1) =20 #define HDMI_INTERRUPT_MASK1 0xc0 #define HDMI_INTERRUPT_STATUS1 0xc1 -#define m_INT_ACTIVE_VSYNC (1 << 5) -#define m_INT_EDID_READY (1 << 2) +#define m_INT_ACTIVE_VSYNC BIT(5) +#define m_INT_EDID_READY BIT(2) =20 #define HDMI_INTERRUPT_MASK2 0xc2 #define HDMI_INTERRUPT_STATUS2 0xc3 -#define m_INT_HDCP_ERR (1 << 7) -#define m_INT_BKSV_FLAG (1 << 6) -#define m_INT_HDCP_OK (1 << 4) +#define m_INT_HDCP_ERR BIT(7) +#define m_INT_BKSV_FLAG BIT(6) +#define m_INT_HDCP_OK BIT(4) =20 #define HDMI_STATUS 0xc8 -#define m_HOTPLUG (1 << 7) -#define m_MASK_INT_HOTPLUG (1 << 5) -#define m_INT_HOTPLUG (1 << 1) -#define v_MASK_INT_HOTPLUG(n) ((n & 0x1) << 5) +#define m_HOTPLUG BIT(7) +#define m_MASK_INT_HOTPLUG BIT(5) +#define m_INT_HOTPLUG BIT(1) +#define v_MASK_INT_HOTPLUG(n) (((n) & 0x1) << 5) =20 #define HDMI_COLORBAR 0xc9 =20 #define HDMI_PHY_SYNC 0xce #define HDMI_PHY_SYS_CTL 0xe0 -#define m_TMDS_CLK_SOURCE (1 << 5) +#define m_TMDS_CLK_SOURCE BIT(5) #define v_TMDS_FROM_PLL (0 << 5) -#define v_TMDS_FROM_GEN (1 << 5) -#define m_PHASE_CLK (1 << 4) +#define v_TMDS_FROM_GEN BIT(5) +#define m_PHASE_CLK BIT(4) #define v_DEFAULT_PHASE (0 << 4) -#define v_SYNC_PHASE (1 << 4) -#define m_TMDS_CURRENT_PWR (1 << 3) +#define v_SYNC_PHASE BIT(4) +#define m_TMDS_CURRENT_PWR BIT(3) #define v_TURN_ON_CURRENT (0 << 3) -#define v_CAT_OFF_CURRENT (1 << 3) -#define m_BANDGAP_PWR (1 << 2) +#define v_CAT_OFF_CURRENT BIT(3) +#define m_BANDGAP_PWR BIT(2) #define v_BANDGAP_PWR_UP (0 << 2) -#define v_BANDGAP_PWR_DOWN (1 << 2) -#define m_PLL_PWR (1 << 1) +#define v_BANDGAP_PWR_DOWN BIT(2) +#define m_PLL_PWR BIT(1) #define v_PLL_PWR_UP (0 << 1) -#define v_PLL_PWR_DOWN (1 << 1) -#define m_TMDS_CHG_PWR (1 << 0) +#define v_PLL_PWR_DOWN BIT(1) +#define m_TMDS_CHG_PWR BIT(0) #define v_TMDS_CHG_PWR_UP (0 << 0) -#define v_TMDS_CHG_PWR_DOWN (1 << 0) +#define v_TMDS_CHG_PWR_DOWN BIT(0) =20 #define HDMI_PHY_CHG_PWR 0xe1 -#define v_CLK_CHG_PWR(n) ((n & 1) << 3) -#define v_DATA_CHG_PWR(n) ((n & 7) << 0) +#define v_CLK_CHG_PWR(n) (((n) & 1) << 3) +#define v_DATA_CHG_PWR(n) (((n) & 7) << 0) =20 #define HDMI_PHY_DRIVER 0xe2 -#define v_CLK_MAIN_DRIVER(n) (n << 4) -#define v_DATA_MAIN_DRIVER(n) (n << 0) +#define v_CLK_MAIN_DRIVER(n) ((n) << 4) +#define v_DATA_MAIN_DRIVER(n) ((n) << 0) =20 #define HDMI_PHY_PRE_EMPHASIS 0xe3 -#define v_PRE_EMPHASIS(n) ((n & 7) << 4) -#define v_CLK_PRE_DRIVER(n) ((n & 3) << 2) -#define v_DATA_PRE_DRIVER(n) ((n & 3) << 0) +#define v_PRE_EMPHASIS(n) (((n) & 7) << 4) +#define v_CLK_PRE_DRIVER(n) (((n) & 3) << 2) +#define v_DATA_PRE_DRIVER(n) (((n) & 3) << 0) =20 #define HDMI_PHY_FEEDBACK_DIV_RATIO_LOW 0xe7 -#define v_FEEDBACK_DIV_LOW(n) (n & 0xff) +#define v_FEEDBACK_DIV_LOW(n) ((n) & 0xff) #define HDMI_PHY_FEEDBACK_DIV_RATIO_HIGH 0xe8 -#define v_FEEDBACK_DIV_HIGH(n) (n & 1) +#define v_FEEDBACK_DIV_HIGH(n) ((n) & 1) =20 #define HDMI_PHY_PRE_DIV_RATIO 0xed -#define v_PRE_DIV_RATIO(n) (n & 0x1f) +#define v_PRE_DIV_RATIO(n) ((n) & 0x1f) =20 #define HDMI_CEC_CTRL 0xd0 -#define m_ADJUST_FOR_HISENSE (1 << 6) -#define m_REJECT_RX_BROADCAST (1 << 5) -#define m_BUSFREETIME_ENABLE (1 << 2) -#define m_REJECT_RX (1 << 1) -#define m_START_TX (1 << 0) +#define m_ADJUST_FOR_HISENSE BIT(6) +#define m_REJECT_RX_BROADCAST BIT(5) +#define m_BUSFREETIME_ENABLE BIT(2) +#define m_REJECT_RX BIT(1) +#define m_START_TX BIT(0) =20 #define HDMI_CEC_DATA 0xd1 #define HDMI_CEC_TX_OFFSET 0xd2 @@ -354,15 +366,15 @@ enum { #define HDMI_CEC_TX_LENGTH 0xd6 #define HDMI_CEC_RX_LENGTH 0xd7 #define HDMI_CEC_TX_INT_MASK 0xd8 -#define m_TX_DONE (1 << 3) -#define m_TX_NOACK (1 << 2) -#define m_TX_BROADCAST_REJ (1 << 1) -#define m_TX_BUSNOTFREE (1 << 0) +#define m_TX_DONE BIT(3) +#define m_TX_NOACK BIT(2) +#define m_TX_BROADCAST_REJ BIT(1) +#define m_TX_BUSNOTFREE BIT(0) =20 #define HDMI_CEC_RX_INT_MASK 0xd9 -#define m_RX_LA_ERR (1 << 4) -#define m_RX_GLITCH (1 << 3) -#define m_RX_DONE (1 << 0) +#define m_RX_LA_ERR BIT(4) +#define m_RX_GLITCH BIT(3) +#define m_RX_DONE BIT(0) =20 #define HDMI_CEC_TX_INT 0xda #define HDMI_CEC_RX_INT 0xdb --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6B53C2AE68 for ; Mon, 12 May 2025 12:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054069; cv=none; b=f+vLKy/QnlDQ9RxoWZy6h9iw+ev1Tu9lAyYJldV7KlzG16V67VoLdVr8L4k1MS2/kjDJipEi2/X/xCZYulKSK/aQHlGsG66r7JvbuTWCYp/4xv0mSeuDGMA8Ahs9ofVruqMtWk9iGUFPvUtBSlEXb3vmmEbSPop/ylRI8eMCsP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054069; c=relaxed/simple; bh=uXsu7jH8yVXs4V58qXRyevJOKQZzPHtuB5q75Rk/5aI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LWQ3l1l1/30qhLs5NGgB+5Hw+siYjvf6MWaQ0G6bgw4tXI6UpKPx1kLwNY0MtZ/E/WNjWn4zYfL8059vyMIvouQYrhwv/YhpckMFypgI9Sh0j+417H6Pc5AAl+VbIy2ABjYZganDjtMb3escsGDe2lkKTGmwgMeQETG6hdKEVnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=cGbEwpQ3; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="cGbEwpQ3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=4a n3GeKBTudslqJaw/NeBqgOS4NHJwbOQHtDOLQOmp4=; b=cGbEwpQ3urxmguwLZG 6WqUJ55fUpI4A8g3EOK5ethJ0EKKEzDGOTCHu2yfhS7oAsGJNG+M0k8Klurf5KMs ySImhowU+BYn9uCUl7DmhM9dPPTYjJSL/Mq4RGk/kky3d+U+a167QtLHeHeZYMav GcZ4J1CR9/DON/oUFHBGpwpj0= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S5; Mon, 12 May 2025 20:46:25 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 03/10] drm/rockchip: inno_hdmi: Remove unnecessary parentheses to make checkpatch happy Date: Mon, 12 May 2025 20:46:04 +0800 Message-ID: <20250512124615.2848731-4-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S5 X-Coremail-Antispam: 1Uf129KBjvdXoWruw4UZF45Jry3ZFWkury3Jwb_yoWDXFX_KF 18Wr1rCF48Zrn8A3ZIk3y5ZF9FvayI9F4fuFs5t393JFn7JryxJ3sxCrW3AF9xWF1YyFn5 Ca1qvr1UAFnIkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUeb4S7UUUUU== X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbB0gNLXmgh5MDGsgAAsd Content-Type: text/plain; charset="utf-8" From: Andy Yan Remove unnecessary parentheses to make checkpatch happy. Signed-off-by: Andy Yan --- Changes in v5: - Split from PATCH 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 82c62400b2e1e..7b4c952f26922 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -1124,8 +1124,7 @@ static int inno_hdmi_i2c_write(struct inno_hdmi *hdmi= , struct i2c_msg *msgs) * we assume that each word write to this i2c adapter * should be the offset of EDID word address. */ - if ((msgs->len !=3D 1) || - ((msgs->addr !=3D DDC_ADDR) && (msgs->addr !=3D DDC_SEGMENT_ADDR))) + if (msgs->len !=3D 1 || (msgs->addr !=3D DDC_ADDR && msgs->addr !=3D DDC_= SEGMENT_ADDR)) return -EINVAL; =20 reinit_completion(&hdmi->i2c->cmp); --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C67C29375A for ; Mon, 12 May 2025 12:47:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054071; cv=none; b=qWQK+GW8xSxLbq3sGwct5Km4/A+7Opzu0jz3pHuwKDYzjWdlPWtF2fS9+Y08JaTHV8NX3zYZ76gV2UJllvK8p6AD/yVU6ALazS5tJ7AGuZel1+D9UKGxY8VtaR6oCZHje5tyVXg/N14gXWMKD1/fKfh/0C8qH9A6f5WI7Y4zGrI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054071; c=relaxed/simple; bh=FXEAMgy/QZ/2vaFLHRVnXdf18i6dKFzOQcxhXQAi/2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k3j/wEtX41K9uvAjSk/t3GXb1s9gF6vyG/YE4Y0Lq239mmHmxFwz5fvCcHHbencnbVDmBcAn09d/J7Cqn+aji1rYQdIY8Oe89zx7LT/1Yz5W+RC5XtbwiO6cJPmJz9220GBWwGU0qhYkSPomo5R3i1nytsPYjUVtnAKEBC6xABQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=S9h0zUC7; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="S9h0zUC7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=jv nMc/BqFyXtWd3kydBRw6WznkhMsheiUWEV9yI10UU=; b=S9h0zUC7pYvZzdrV/b ZLDqwd7iXMmoe+IioQ+LrDFvB6q1Ez42dFbON5cLhQYqMfQsxlyS++Q6h3uXAVOx cWeJwLXQHCSaSVY+9tmPRCu2/Ek6lzzCCTVc0sEKpdzCgEOat5//GPEIvQzrjJGk BF9AmsrNAZv5T6OG7wjbKnd6A= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S6; Mon, 12 May 2025 20:46:26 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 04/10] drm/rockchip: inno_hdmi: Rename function inno_hdmi_reset to inno_hdmi_init_hw Date: Mon, 12 May 2025 20:46:05 +0800 Message-ID: <20250512124615.2848731-5-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7Cw1xGF17Ww1fAry7CF45KFg_yoW8JF43pa yUCryUCF4fGa1jqF1UAF4kCr4ayas7KayxurWxWw1Skwn09r9YyFnYyw4Sva43AryxZ3Z2 yFs7Ga45ZFy2yw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j8zV8UUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqAFLXmgh6hVMrAAAsq Content-Type: text/plain; charset="utf-8" From: Andy Yan This function not only configure hardware reset register, but also do some other configurations. Therefore, it is more appropriate to name it inno_hdmi_init_hw, which will also facilitate the addition of other functions to this function in the following patch. Signed-off-by: Andy Yan --- Changes in v5: - Split from PATCH 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 7b4c952f26922..2d41cf59752f2 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -604,7 +604,7 @@ static void inno_hdmi_power_up(struct inno_hdmi *hdmi, inno_hdmi_sys_power(hdmi, true); }; =20 -static void inno_hdmi_reset(struct inno_hdmi *hdmi) +static void inno_hdmi_init_hw(struct inno_hdmi *hdmi) { u32 val; u32 msk; @@ -1290,7 +1290,7 @@ static int inno_hdmi_bind(struct device *dev, struct = device *master, goto err_disable_clk; } =20 - inno_hdmi_reset(hdmi); + inno_hdmi_init_hw(hdmi); =20 hdmi->ddc =3D inno_hdmi_i2c_adapter(hdmi); if (IS_ERR(hdmi->ddc)) { --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 29CD0268FEF for ; Mon, 12 May 2025 12:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054069; cv=none; b=ueG8i2rIIbIVVmFQeloR0i8EZ6i7tYaJHsgloXmjIA01+4ToLYazQLBkubEsE1MnGyBVsHpQFEPaY5Ap6pSnKbfvo8fOIiXfYyR3GzcDhP+pdC5qYWRT6Ut22+4mBx6Tp7w89b9sJpFB2jQn6rceOtE+lmn23j+nVZ+2xJoFQRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054069; c=relaxed/simple; bh=3m6kRTDNq2S8HTnX+DD72JLmY6w1xe6OW0/zxiDhR4o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QlFPxa9JzfS7NSFCGd3zXG17V3sC6388OEfqcctH4yQ610EEqiYJQmCVtPirVI7upC55gFgm+IWZXED6+eeHw6JL3DrN3oWN6fDbmFjRT9PBMxLQkmH7goRwi6QBBUfa1jwiMetwo7iQ7q47diCs5J3r3iiMsfBR6hUJhrZv6oQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=SyabuS8O; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="SyabuS8O" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=Rk lIkmPrOmsT98b/PoJKEZlaxWXv3nBZ0SUzoEELd/Y=; b=SyabuS8OJkdWRTSru6 CLzuLZvTm+YP3ZkThzxcfpGyu+kKt4UD0vJQoH3fjUSajZrNgZFSzcA50aWc7h1g tXT38zqg/nEqkyPtrUDzTifxXlMpWqsbtQHCmHI7pYs1fvECQDc/IloTt1jQRHxM H3wFyyFaAnVLVe+MkL7yJv190= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S7; Mon, 12 May 2025 20:46:27 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 05/10] drm/rockchip: inno_hdmi: Move ddc/i2c configuration and HOTPLUG unmute to inno_hdmi_init_hw Date: Mon, 12 May 2025 20:46:06 +0800 Message-ID: <20250512124615.2848731-6-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7uFW3Zw1rJF48KF43Cw45ZFb_yoW8Kr47pr ZxCF15tr4fGFy8Xr17ZF1kArZIya4fJ3WYkrWxGw1Syr1UWr9Ykr93AFWfXF98ArWxZ3Z3 trWkKay5Wa4jvaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07je38nUUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbB0g5LXmgh5MDG2wAAs5 Content-Type: text/plain; charset="utf-8" From: Andy Yan Putting these scattered initialization code together is helpful for the following migration to the DRM bridge driver mode. Signed-off-by: Andy Yan --- Changes in v5: - Split from PATCH 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 2d41cf59752f2..82f2904ed7a3b 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -620,6 +620,21 @@ static void inno_hdmi_init_hw(struct inno_hdmi *hdmi) hdmi_modb(hdmi, HDMI_SYS_CTRL, msk, val); =20 inno_hdmi_standby(hdmi); + + /* + * When the controller isn't configured to an accurate + * video timing and there is no reference clock available, + * then the TMDS clock source would be switched to PCLK_HDMI, + * so we need to init the TMDS rate to PCLK rate, and + * reconfigure the DDC clock. + */ + if (hdmi->refclk) + inno_hdmi_i2c_init(hdmi, clk_get_rate(hdmi->refclk)); + else + inno_hdmi_i2c_init(hdmi, clk_get_rate(hdmi->pclk)); + + /* Unmute hotplug interrupt */ + hdmi_modb(hdmi, HDMI_STATUS, m_MASK_INT_HOTPLUG, v_MASK_INT_HOTPLUG(1)); } =20 static int inno_hdmi_disable_frame(struct drm_connector *connector, @@ -1299,27 +1314,12 @@ static int inno_hdmi_bind(struct device *dev, struc= t device *master, goto err_disable_clk; } =20 - /* - * When the controller isn't configured to an accurate - * video timing and there is no reference clock available, - * then the TMDS clock source would be switched to PCLK_HDMI, - * so we need to init the TMDS rate to PCLK rate, and - * reconfigure the DDC clock. - */ - if (hdmi->refclk) - inno_hdmi_i2c_init(hdmi, clk_get_rate(hdmi->refclk)); - else - inno_hdmi_i2c_init(hdmi, clk_get_rate(hdmi->pclk)); - ret =3D inno_hdmi_register(drm, hdmi); if (ret) goto err_put_adapter; =20 dev_set_drvdata(dev, hdmi); =20 - /* Unmute hotplug interrupt */ - hdmi_modb(hdmi, HDMI_STATUS, m_MASK_INT_HOTPLUG, v_MASK_INT_HOTPLUG(1)); - ret =3D devm_request_threaded_irq(dev, irq, inno_hdmi_hardirq, inno_hdmi_irq, IRQF_SHARED, dev_name(dev), hdmi); --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DFCEB29374F for ; Mon, 12 May 2025 12:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054072; cv=none; b=HP9zwPUkW53ucs4n6KWsmqyFmBHIoAkaUv/DffB9tBWi4UihL+gAxoAxMHVIOLMd71F7rY7ze02BSjm7ToQdfgfSUo9rDvUKRf/AmKwky0NI3hc8f44sZHW94B9NvUyCRdBLjbO0VGnrCFAZDUjz+tFWL4L7gHSSLeH2erkDh2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054072; c=relaxed/simple; bh=hcYfPbFndzTK608drhVdqWy5hbxjEjMmde+Z3vCLOWo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D4f72uKFTNxGcwHFmFjhKnGHZRmrSZ1WNo0i5mJk43JE5E7uHnDPM8NsWNJJXeAiQTjpjygWEvUdzNayGNaTCkhIEM7IcEtC2xrlRdFyUfLhH7Kn7dxx6xs1p7ZsNJbrSoIKBXocquNn7GJx5Z/En3kO0FrvqPnnAixYaJpOPIM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=nxkU46cu; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="nxkU46cu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=/f llhH49zJ2qqNotPb0/V/XIjS6GRWcrmyUFx3A66GI=; b=nxkU46cuzlAiP651th eVdK97/YFrS22d/RhcyKGHWK2FJJTBwK1f6hqgCIBP19sOIE9XFVsgf/1QjCnYOj F7jaH8R2AHZIClaUocUdJmrqf8jwaGS5ob1ydcEhP7nS7Jw5ZZ2y4Qr9S8JGtVAG 9CibCTQBFF3tRjF6Q8w7uHuZk= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S8; Mon, 12 May 2025 20:46:27 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 06/10] drm/rockchip: inno_hdmi: Use sleep_range instead of udelay Date: Mon, 12 May 2025 20:46:07 +0800 Message-ID: <20250512124615.2848731-7-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S8 X-Coremail-Antispam: 1Uf129KBjvdXoW7GFW3Zr4DurykCFy7ZFW5Jrb_yoWDWrg_W3 WxXr18CF4v9rnxJF13A3yfCFyqya4Y9ws3WF4FyasIyF18XFW29rZxZFn8J3sxGF4YkFs7 Ga1jvrWFyrnIkjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU03CztUUUUU== X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqA1LXmgh6hVM3wAAsV Content-Type: text/plain; charset="utf-8" From: Andy Yan usleep_range is preferred over udelay. Signed-off-by: Andy Yan --- Changes in v5: - Split from PATCH 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 82f2904ed7a3b..f362803060796 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -610,10 +610,10 @@ static void inno_hdmi_init_hw(struct inno_hdmi *hdmi) u32 msk; =20 hdmi_modb(hdmi, HDMI_SYS_CTRL, m_RST_DIGITAL, v_NOT_RST_DIGITAL); - udelay(100); + usleep_range(100, 150); =20 hdmi_modb(hdmi, HDMI_SYS_CTRL, m_RST_ANALOG, v_NOT_RST_ANALOG); - udelay(100); + usleep_range(100, 150); =20 msk =3D m_REG_CLK_INV | m_REG_CLK_SOURCE | m_POWER | m_INT_POL; val =3D v_REG_CLK_INV | v_REG_CLK_SOURCE_SYS | v_PWR_ON | v_INT_POL_HIGH; --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.3]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DFBEE2920A8 for ; Mon, 12 May 2025 12:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054072; cv=none; b=mlmuvhea4zMqqpEklnHhmVdMsi1pFDnRMcvmYEYgvsyuLZIPR2ZlKzJAV53WH2jGRW0F3Vz9e0kaqUlZL8Tslf8YCvcL/38Z7JR/QvKLj0UtH4S2sclbADL172XVlnytJ+IGoaQ0YWbUKVNZ3c7rmzNxja3FLZ+ELkZ9PlZdOQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054072; c=relaxed/simple; bh=CguizQ4yTMFm83+hGjc98jh2INAj50rnlcb59ypO+2Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JuHCGIr18WS48FkBDzr3pQTVY/BzrsQ/fwe7An2X67h59OZwDDrmAivV3OYTU15PalNPQK3aENAUFI+Ar+ytVIOyEDh2wlG+tt7T9ti2FyFE5EZM2wDOFPnv14k6kCqnbfUvs89HYlG3vRBhYYWvO5HmoYC0OKNzzLqzopg2u4o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=YXxeFWMq; arc=none smtp.client-ip=117.135.210.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="YXxeFWMq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=ck 0Oa6Hq1RQ1X+FOIxxUqrsCrvgqpQ03ONEP831KWyU=; b=YXxeFWMqp2G21M7k8n d0sl7XHelAhyRhuHaW0wKr/ikCC4CPKZirbQUsAnQ8kfPXyIFc0ezL2D9HsHxtq5 CdolXmRc83opYm5EFTrTTzE9zvgnZQ3Hu9P5DXL/O5CEBkxdtyYhQ1005lmsN4A5 4qhhrssf/ZGThy7Ldj2O08kbI= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S9; Mon, 12 May 2025 20:46:28 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 07/10] drm/rockchip: inno_hdmi: switch i2c registration to devm functions Date: Mon, 12 May 2025 20:46:08 +0800 Message-ID: <20250512124615.2848731-8-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S9 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFWfXryxWw4Utr43Ww47XFb_yoW8ZFyfpr W7AF4YgrWxZF4vgr4DZF4kCF1ayay8GayxWFWIgwsakwnxWry5tFyrXryS9a45A3srXanr tr4vq345uF1UKaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j3189UUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqA1LXmgh6hVM3wABsU Content-Type: text/plain; charset="utf-8" From: Andy Yan Switch from i2c_add_adapter() to resource managed devm_i2c_add_adapter(), which will make the cleanup code more simpler. Signed-off-by: Andy Yan --- Changes in v5: - Split from PATCH 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index f362803060796..776a2aa74e49c 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -1230,10 +1230,9 @@ static struct i2c_adapter *inno_hdmi_i2c_adapter(str= uct inno_hdmi *hdmi) strscpy(adap->name, "Inno HDMI", sizeof(adap->name)); i2c_set_adapdata(adap, hdmi); =20 - ret =3D i2c_add_adapter(adap); + ret =3D devm_i2c_add_adapter(hdmi->dev, adap); if (ret) { dev_warn(hdmi->dev, "cannot add %s I2C adapter\n", adap->name); - devm_kfree(hdmi->dev, i2c); return ERR_PTR(ret); } =20 @@ -1316,7 +1315,7 @@ static int inno_hdmi_bind(struct device *dev, struct = device *master, =20 ret =3D inno_hdmi_register(drm, hdmi); if (ret) - goto err_put_adapter; + goto err_disable_clk; =20 dev_set_drvdata(dev, hdmi); =20 @@ -1330,8 +1329,6 @@ static int inno_hdmi_bind(struct device *dev, struct = device *master, err_cleanup_hdmi: hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); -err_put_adapter: - i2c_put_adapter(hdmi->ddc); err_disable_clk: clk_disable_unprepare(hdmi->refclk); err_disable_pclk: @@ -1347,7 +1344,6 @@ static void inno_hdmi_unbind(struct device *dev, stru= ct device *master, hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); =20 - i2c_put_adapter(hdmi->ddc); clk_disable_unprepare(hdmi->refclk); clk_disable_unprepare(hdmi->pclk); } --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 14654258CEA for ; Mon, 12 May 2025 12:47:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054071; cv=none; b=Pob16keXN0LLf/Rf2+pCqOlesUf3q0Lej/IhdO3eUnX5WhkEl+l7n8P7pP+P9CxFSPaRpZT3naaNN0o4YbcEthgnLDTnB2Czyf2JdygulEesE+WvtE3wkIgwZ21U9/84X3hsYa6n9bqm711xiya8NYuepRtCBNhndaoRdnOyJc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054071; c=relaxed/simple; bh=V1keSoVKR33dBQrRuFhe/vQPYp82UwEAETDkAyvChFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fs2BddES1t77z4NJBiZQIekFGnXbkssUp+Tz1bOa6MJcUwf5W3qsTdviy/bAhhGIRK1yJ6Cd2JIgtFxNj/KALc63UzN7bFCo5C/7DCOqZedwuYj7xotaTiww+GRtJxcWhwfdQKPIz5dpx5BmjVGv7E8HWiw95CU5P2tNQuZ+yd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=dYEgk0mr; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="dYEgk0mr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=dB S7SAsAp5FhUlU/3iHX21eFkYpu2uCNBgSKCpFIXoc=; b=dYEgk0mr8SQrs9C3Yb mU0uQ95jeLLh/2SUuUKGtv75BEX7AbJnbBkDRE/oPkQv7kzOro8QdBRuEwi7ZRDV MK0WAaFt3v94mYzWD9cHkgMgEyNW7ozuZYXnvGuevseJkpE5jSS+VO7kZ1i9PIxV R0OE50jCrxiXCI7EeDADEoQvA= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S10; Mon, 12 May 2025 20:46:29 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 08/10] drm/rockchip: inno_hdmi: Simpify clk get/enable by devm_clk_get_enabled api Date: Mon, 12 May 2025 20:46:09 +0800 Message-ID: <20250512124615.2848731-9-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S10 X-Coremail-Antispam: 1Uf129KBjvJXoWxXF1fJr1UGF4fWr43Cry3Jwb_yoW5uw4kpr y7AFWYqryxJF4jg34UZF4UJr1FyF4UGa47GrWxWan3AwnxXr15KFW0vryS9FWFyr95Za13 trWkXFy5Z3WUWF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j8nYwUUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbB0g9LXmgh5MDHDwAAst Content-Type: text/plain; charset="utf-8" From: Andy Yan Make use of devm_clk_get_enabled() to replace devm_clk_get() and clk_prepare_enable(), which will make the cleanup of clk code simpler. Signed-off-by: Andy Yan --- Changes in v5: - Split from PATCH 9/10 drivers/gpu/drm/rockchip/inno_hdmi.c | 50 +++++++--------------------- 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchi= p/inno_hdmi.c index 776a2aa74e49c..1ab3ad4bde9ea 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c @@ -1269,53 +1269,34 @@ static int inno_hdmi_bind(struct device *dev, struc= t device *master, if (IS_ERR(hdmi->regs)) return PTR_ERR(hdmi->regs); =20 - hdmi->pclk =3D devm_clk_get(hdmi->dev, "pclk"); + hdmi->pclk =3D devm_clk_get_enabled(hdmi->dev, "pclk"); if (IS_ERR(hdmi->pclk)) return dev_err_probe(dev, PTR_ERR(hdmi->pclk), "Unable to get HDMI pclk\= n"); =20 - ret =3D clk_prepare_enable(hdmi->pclk); - if (ret) - return dev_err_probe(dev, ret, "Cannot enable HDMI pclk: %d\n", ret); - - hdmi->refclk =3D devm_clk_get_optional(hdmi->dev, "ref"); - if (IS_ERR(hdmi->refclk)) { - ret =3D dev_err_probe(dev, PTR_ERR(hdmi->refclk), "Unable to get HDMI re= fclk\n"); - goto err_disable_pclk; - } - - ret =3D clk_prepare_enable(hdmi->refclk); - if (ret) { - ret =3D dev_err_probe(dev, ret, "Cannot enable HDMI refclk: %d\n", ret); - goto err_disable_pclk; - } + hdmi->refclk =3D devm_clk_get_optional_enabled(hdmi->dev, "ref"); + if (IS_ERR(hdmi->refclk)) + return dev_err_probe(dev, PTR_ERR(hdmi->refclk), "Unable to get HDMI ref= clk\n"); =20 if (hdmi->variant->dev_type =3D=3D RK3036_HDMI) { hdmi->grf =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,gr= f"); - if (IS_ERR(hdmi->grf)) { - ret =3D dev_err_probe(dev, PTR_ERR(hdmi->grf), - "Unable to get rockchip,grf\n"); - goto err_disable_clk; - } + if (IS_ERR(hdmi->grf)) + return dev_err_probe(dev, + PTR_ERR(hdmi->grf), "Unable to get rockchip,grf\n"); } =20 irq =3D platform_get_irq(pdev, 0); - if (irq < 0) { - ret =3D irq; - goto err_disable_clk; - } + if (irq < 0) + return irq; =20 inno_hdmi_init_hw(hdmi); =20 hdmi->ddc =3D inno_hdmi_i2c_adapter(hdmi); - if (IS_ERR(hdmi->ddc)) { - ret =3D PTR_ERR(hdmi->ddc); - hdmi->ddc =3D NULL; - goto err_disable_clk; - } + if (IS_ERR(hdmi->ddc)) + return PTR_ERR(hdmi->ddc); =20 ret =3D inno_hdmi_register(drm, hdmi); if (ret) - goto err_disable_clk; + return ret; =20 dev_set_drvdata(dev, hdmi); =20 @@ -1329,10 +1310,6 @@ static int inno_hdmi_bind(struct device *dev, struct= device *master, err_cleanup_hdmi: hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); -err_disable_clk: - clk_disable_unprepare(hdmi->refclk); -err_disable_pclk: - clk_disable_unprepare(hdmi->pclk); return ret; } =20 @@ -1343,9 +1320,6 @@ static void inno_hdmi_unbind(struct device *dev, stru= ct device *master, =20 hdmi->connector.funcs->destroy(&hdmi->connector); hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); - - clk_disable_unprepare(hdmi->refclk); - clk_disable_unprepare(hdmi->pclk); } =20 static const struct component_ops inno_hdmi_ops =3D { --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5DDC6293B70 for ; Mon, 12 May 2025 13:02:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054979; cv=none; b=Zu0wFiDrDPb+MGHoNYC0sHOqxnlvm43DHC6UohAkAa8f2+m2cyd1jo2VU6IuDv7B/2PDL3Aab4OZhunyjvJXPQW7+n5++73pSkn7mp4HtBmlX54aK+xq5qLl/Swa7RLHgYiofgvbd1/tRIrepQ9fujrMTMCAK7GGtia8WFPpC/Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054979; c=relaxed/simple; bh=VR+oIydAgKs+JXwBHK3NIwyblm5E5lOhJplmBrUx010=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F/i/Xb40kG0+/VHa015JojmUS3kf2iNVj+T5iiE169I/I3ODaEsYQ1tvMKThdUF8orsQrD8pPpqVRzCu+K5mzTC7xJdwnIkCtOS3gV3aJRpwlpzAfXRWdp1txjUyCQdjvISocLalBeYXFjBMMJlOX+YF/AdbqEUfp7lBkcxKTtM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=b1PHt/p8; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="b1PHt/p8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=oJ 9/osYL4DDM44SiwCMwCPovpFIpouBP5LSsduArYSA=; b=b1PHt/p8upzOG8ujmC yzT+TV2RRwr5uB9DCrzavIlC6vu2Tggb4Br9T5HKURtuqBA1519cJGb73DaVYKuA xXk6ME7UdlgBaeXhTchPt+tLg5zFUd3kHv6iAabQnfY9S+p1S1Ba+7ZktU2AZCOD a3eqXoQViiFJ00uqN9Bt7UGus= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S11; Mon, 12 May 2025 20:46:30 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 09/10] drm/rockchip: inno-hdmi: Convert to drm bridge Date: Mon, 12 May 2025 20:46:10 +0800 Message-ID: <20250512124615.2848731-10-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S11 X-Coremail-Antispam: 1Uf129KBjvAXoWfWF17Zw1xZr1kXFy7try7Wrg_yoW5Kry5Jo Z7JFn8Xr4xuryxWrWUKF10kF4jva1ayrn3Z3WrArWDZan8Gw4jga47KryrZFZrXF1avrW2 kw1kKrs3Xrn7Jr4kn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUIyxRDUUUU X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbB0g9LXmgh5MDHDwABss Content-Type: text/plain; charset="utf-8" From: Andy Yan Convert it to drm bridge driver, it will be convenient for us to migrate the connector part to the display driver later. Signed-off-by: Andy Yan --- Changes in v5: - Split cleanup code to separate patch - Switch to devm_drm_bridge_alloc() API Changes in v4: - Do not store colorimetry within inno_hdmi struct Changes in v3: - First included in v3 drivers/gpu/drm/bridge/Kconfig | 7 + drivers/gpu/drm/bridge/Makefile | 1 + .../inno_hdmi.c =3D> bridge/inno-hdmi.c} | 503 +++++------------- drivers/gpu/drm/rockchip/Kconfig | 1 + drivers/gpu/drm/rockchip/Makefile | 2 +- drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c | 188 +++++++ include/drm/bridge/inno_hdmi.h | 33 ++ 7 files changed, 366 insertions(+), 369 deletions(-) rename drivers/gpu/drm/{rockchip/inno_hdmi.c =3D> bridge/inno-hdmi.c} (69%) create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c create mode 100644 include/drm/bridge/inno_hdmi.h diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index b9e0ca85226a6..b70df0c3cc03d 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -100,6 +100,13 @@ config DRM_I2C_NXP_TDA998X help Support for NXP Semiconductors TDA998X HDMI encoders. =20 +config DRM_INNO_HDMI + tristate + select DRM_BRIDGE_CONNECTOR + select DRM_DISPLAY_HDMI_HELPER + select DRM_DISPLAY_HELPER + select DRM_KMS_HELPER + config DRM_ITE_IT6263 tristate "ITE IT6263 LVDS/HDMI bridge" depends on OF diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makef= ile index 245e8a27e3fc5..efe049afa4d27 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_DRM_FSL_LDB) +=3D fsl-ldb.o tda998x-y :=3D tda998x_drv.o obj-$(CONFIG_DRM_I2C_NXP_TDA998X) +=3D tda998x.o =20 +obj-$(CONFIG_DRM_INNO_HDMI) +=3D inno-hdmi.o obj-$(CONFIG_DRM_ITE_IT6263) +=3D ite-it6263.o obj-$(CONFIG_DRM_ITE_IT6505) +=3D ite-it6505.o obj-$(CONFIG_DRM_LONTIUM_LT8912B) +=3D lontium-lt8912b.o diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/bridge/= inno-hdmi.c similarity index 69% rename from drivers/gpu/drm/rockchip/inno_hdmi.c rename to drivers/gpu/drm/bridge/inno-hdmi.c index 1ab3ad4bde9ea..e53e1849fe37b 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/bridge/inno-hdmi.c @@ -3,12 +3,14 @@ * Copyright (C) Rockchip Electronics Co., Ltd. * Zheng Yang * Yakir Yang + * Andy Yan */ =20 #include #include #include #include +#include #include #include #include @@ -17,18 +19,18 @@ #include #include =20 +#include #include #include #include #include +#include #include #include =20 #include #include =20 -#include "rockchip_drm_drv.h" - #define INNO_HDMI_MIN_TMDS_CLOCK 25000000U =20 #define DDC_SEGMENT_ADDR 0x30 @@ -382,29 +384,6 @@ enum { #define HDMI_CEC_BUSFREETIME_H 0xdd #define HDMI_CEC_LOGICADDR 0xde =20 -#define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) - -#define RK3036_GRF_SOC_CON2 0x148 -#define RK3036_HDMI_PHSYNC BIT(4) -#define RK3036_HDMI_PVSYNC BIT(5) - -enum inno_hdmi_dev_type { - RK3036_HDMI, - RK3128_HDMI, -}; - -struct inno_hdmi_phy_config { - unsigned long pixelclock; - u8 pre_emphasis; - u8 voltage_level_control; -}; - -struct inno_hdmi_variant { - enum inno_hdmi_dev_type dev_type; - struct inno_hdmi_phy_config *phy_configs; - struct inno_hdmi_phy_config *default_phy_config; -}; - struct inno_hdmi_i2c { struct i2c_adapter adap; =20 @@ -417,41 +396,17 @@ struct inno_hdmi_i2c { =20 struct inno_hdmi { struct device *dev; - + struct drm_bridge bridge; struct clk *pclk; struct clk *refclk; void __iomem *regs; struct regmap *grf; =20 - struct drm_connector connector; - struct rockchip_encoder encoder; - struct inno_hdmi_i2c *i2c; struct i2c_adapter *ddc; - - const struct inno_hdmi_variant *variant; -}; - -struct inno_hdmi_connector_state { - struct drm_connector_state base; - unsigned int colorimetry; + const struct inno_hdmi_plat_data *plat_data; }; =20 -static struct inno_hdmi *encoder_to_inno_hdmi(struct drm_encoder *encoder) -{ - struct rockchip_encoder *rkencoder =3D to_rockchip_encoder(encoder); - - return container_of(rkencoder, struct inno_hdmi, encoder); -} - -static struct inno_hdmi *connector_to_inno_hdmi(struct drm_connector *conn= ector) -{ - return container_of(connector, struct inno_hdmi, connector); -} - -#define to_inno_hdmi_conn_state(conn_state) \ - container_of_const(conn_state, struct inno_hdmi_connector_state, base) - enum { CSC_RGB_0_255_TO_ITU601_16_235_8BIT, CSC_RGB_0_255_TO_ITU709_16_235_8BIT, @@ -494,23 +449,15 @@ static const char coeff_csc[][24] =3D { }, }; =20 -static struct inno_hdmi_phy_config rk3036_hdmi_phy_configs[] =3D { - { 74250000, 0x3f, 0xbb }, - { 165000000, 0x6f, 0xbb }, - { ~0UL, 0x00, 0x00 } -}; - -static struct inno_hdmi_phy_config rk3128_hdmi_phy_configs[] =3D { - { 74250000, 0x3f, 0xaa }, - { 165000000, 0x5f, 0xaa }, - { ~0UL, 0x00, 0x00 } -}; +static struct inno_hdmi *bridge_to_inno_hdmi(struct drm_bridge *bridge) +{ + return container_of(bridge, struct inno_hdmi, bridge); +} =20 static int inno_hdmi_find_phy_config(struct inno_hdmi *hdmi, unsigned long pixelclk) { - const struct inno_hdmi_phy_config *phy_configs =3D - hdmi->variant->phy_configs; + const struct inno_hdmi_phy_config *phy_configs =3D hdmi->plat_data->phy_c= onfigs; int i; =20 for (i =3D 0; phy_configs[i].pixelclock !=3D ~0UL; i++) { @@ -582,12 +529,12 @@ static void inno_hdmi_power_up(struct inno_hdmi *hdmi, int ret =3D inno_hdmi_find_phy_config(hdmi, mpixelclock); =20 if (ret < 0) { - phy_config =3D hdmi->variant->default_phy_config; + phy_config =3D hdmi->plat_data->default_phy_config; DRM_DEV_ERROR(hdmi->dev, "Using default phy configuration for TMDS rate %lu", mpixelclock); } else { - phy_config =3D &hdmi->variant->phy_configs[ret]; + phy_config =3D &hdmi->plat_data->phy_configs[ret]; } =20 inno_hdmi_sys_power(hdmi, false); @@ -637,14 +584,13 @@ static void inno_hdmi_init_hw(struct inno_hdmi *hdmi) hdmi_modb(hdmi, HDMI_STATUS, m_MASK_INT_HOTPLUG, v_MASK_INT_HOTPLUG(1)); } =20 -static int inno_hdmi_disable_frame(struct drm_connector *connector, - enum hdmi_infoframe_type type) +static int inno_hdmi_bridge_clear_infoframe(struct drm_bridge *bridge, + enum hdmi_infoframe_type type) { - struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); =20 if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(connector->dev, - "Unsupported infoframe type: %u\n", type); + drm_err(bridge->dev, "Unsupported infoframe type: %u\n", type); return 0; } =20 @@ -653,20 +599,19 @@ static int inno_hdmi_disable_frame(struct drm_connect= or *connector, return 0; } =20 -static int inno_hdmi_upload_frame(struct drm_connector *connector, - enum hdmi_infoframe_type type, - const u8 *buffer, size_t len) +static int inno_hdmi_bridge_write_infoframe(struct drm_bridge *bridge, + enum hdmi_infoframe_type type, + const u8 *buffer, size_t len) { - struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); ssize_t i; =20 if (type !=3D HDMI_INFOFRAME_TYPE_AVI) { - drm_err(connector->dev, - "Unsupported infoframe type: %u\n", type); + drm_err(bridge->dev, "Unsupported infoframe type: %u\n", type); return 0; } =20 - inno_hdmi_disable_frame(connector, type); + inno_hdmi_bridge_clear_infoframe(bridge, type); =20 for (i =3D 0; i < len; i++) hdmi_writeb(hdmi, HDMI_CONTROL_PACKET_ADDR + i, buffer[i]); @@ -674,23 +619,26 @@ static int inno_hdmi_upload_frame(struct drm_connecto= r *connector, return 0; } =20 -static const struct drm_connector_hdmi_funcs inno_hdmi_hdmi_connector_func= s =3D { - .clear_infoframe =3D inno_hdmi_disable_frame, - .write_infoframe =3D inno_hdmi_upload_frame, -}; - -static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi) +static int inno_hdmi_config_video_csc(struct inno_hdmi *hdmi, + struct drm_connector *connector, + struct drm_display_mode *mode) { - struct drm_connector *connector =3D &hdmi->connector; struct drm_connector_state *conn_state =3D connector->state; - struct inno_hdmi_connector_state *inno_conn_state =3D - to_inno_hdmi_conn_state(conn_state); int c0_c2_change =3D 0; int csc_enable =3D 0; int csc_mode =3D 0; int auto_csc =3D 0; int value; int i; + int colorimetry; + u8 vic =3D drm_match_cea_mode(mode); + + if (vic =3D=3D 6 || vic =3D=3D 7 || vic =3D=3D 21 || vic =3D=3D 22 || + vic =3D=3D 2 || vic =3D=3D 3 || vic =3D=3D 17 || vic =3D=3D 18) + colorimetry =3D HDMI_COLORIMETRY_ITU_601; + else + colorimetry =3D HDMI_COLORIMETRY_ITU_709; + =20 /* Input video mode is SDR RGB24bit, data enable signal from external */ hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL1, v_DE_EXTERNAL | @@ -720,7 +668,7 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi = *hdmi) return 0; } } else { - if (inno_conn_state->colorimetry =3D=3D HDMI_COLORIMETRY_ITU_601) { + if (colorimetry =3D=3D HDMI_COLORIMETRY_ITU_601) { if (conn_state->hdmi.output_format =3D=3D HDMI_COLORSPACE_YUV444) { csc_mode =3D CSC_RGB_0_255_TO_ITU601_16_235_8BIT; auto_csc =3D AUTO_CSC_DISABLE; @@ -738,8 +686,7 @@ static int inno_hdmi_config_video_csc(struct inno_hdmi = *hdmi) } =20 for (i =3D 0; i < 24; i++) - hdmi_writeb(hdmi, HDMI_VIDEO_CSC_COEF + i, - coeff_csc[csc_mode][i]); + hdmi_writeb(hdmi, HDMI_VIDEO_CSC_COEF + i, coeff_csc[csc_mode][i]); =20 value =3D v_SOF_DISABLE | csc_enable | v_COLOR_DEPTH_NOT_INDICATED(1); hdmi_writeb(hdmi, HDMI_VIDEO_CONTRL3, value); @@ -753,15 +700,11 @@ static int inno_hdmi_config_video_csc(struct inno_hdm= i *hdmi) static int inno_hdmi_config_video_timing(struct inno_hdmi *hdmi, struct drm_display_mode *mode) { - int value, psync; - - if (hdmi->variant->dev_type =3D=3D RK3036_HDMI) { - psync =3D mode->flags & DRM_MODE_FLAG_PHSYNC ? RK3036_HDMI_PHSYNC : 0; - value =3D HIWORD_UPDATE(psync, RK3036_HDMI_PHSYNC); - psync =3D mode->flags & DRM_MODE_FLAG_PVSYNC ? RK3036_HDMI_PVSYNC : 0; - value |=3D HIWORD_UPDATE(psync, RK3036_HDMI_PVSYNC); - regmap_write(hdmi->grf, RK3036_GRF_SOC_CON2, value); - } + const struct inno_hdmi_plat_ops *plat_ops =3D hdmi->plat_data->ops; + u32 value; + + if (plat_ops && plat_ops->enable) + plat_ops->enable(hdmi->dev, mode); =20 /* Set detail external video timing polarity and interlace mode */ value =3D v_EXTERANL_VIDEO(1); @@ -810,14 +753,16 @@ static int inno_hdmi_config_video_timing(struct inno_= hdmi *hdmi, return 0; } =20 -static int inno_hdmi_setup(struct inno_hdmi *hdmi, - struct drm_atomic_state *state) +static int inno_hdmi_setup(struct inno_hdmi *hdmi, struct drm_atomic_state= *state) { - struct drm_connector *connector =3D &hdmi->connector; - struct drm_display_info *display =3D &connector->display_info; + struct drm_bridge *bridge =3D &hdmi->bridge; + struct drm_connector *connector; + struct drm_display_info *info; struct drm_connector_state *new_conn_state; struct drm_crtc_state *new_crtc_state; =20 + connector =3D drm_atomic_get_new_connector_for_encoder(state, bridge->enc= oder); + new_conn_state =3D drm_atomic_get_new_connector_state(state, connector); if (WARN_ON(!new_conn_state)) return -EINVAL; @@ -826,17 +771,18 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, if (WARN_ON(!new_crtc_state)) return -EINVAL; =20 + info =3D &connector->display_info; + /* Mute video and audio output */ hdmi_modb(hdmi, HDMI_AV_MUTE, m_AUDIO_MUTE | m_VIDEO_BLACK, v_AUDIO_MUTE(1) | v_VIDEO_MUTE(1)); =20 /* Set HDMI Mode */ - hdmi_writeb(hdmi, HDMI_HDCP_CTRL, - v_HDMI_DVI(display->is_hdmi)); + hdmi_writeb(hdmi, HDMI_HDCP_CTRL, v_HDMI_DVI(info->is_hdmi)); =20 inno_hdmi_config_video_timing(hdmi, &new_crtc_state->adjusted_mode); =20 - inno_hdmi_config_video_csc(hdmi); + inno_hdmi_config_video_csc(hdmi, connector, &new_crtc_state->adjusted_mod= e); =20 drm_atomic_helper_connector_hdmi_update_infoframes(connector, state); =20 @@ -857,9 +803,11 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi, return 0; } =20 -static enum drm_mode_status inno_hdmi_display_mode_valid(struct inno_hdmi = *hdmi, - const struct drm_display_mode *mode) +static enum drm_mode_status inno_hdmi_bridge_mode_valid(struct drm_bridge = *bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) { + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); unsigned long mpixelclk, max_tolerance; long rounded_refclk; =20 @@ -889,189 +837,56 @@ static enum drm_mode_status inno_hdmi_display_mode_v= alid(struct inno_hdmi *hdmi, return MODE_OK; } =20 -static void inno_hdmi_encoder_enable(struct drm_encoder *encoder, - struct drm_atomic_state *state) -{ - struct inno_hdmi *hdmi =3D encoder_to_inno_hdmi(encoder); - - inno_hdmi_setup(hdmi, state); -} - -static void inno_hdmi_encoder_disable(struct drm_encoder *encoder, - struct drm_atomic_state *state) -{ - struct inno_hdmi *hdmi =3D encoder_to_inno_hdmi(encoder); - - inno_hdmi_standby(hdmi); -} - -static int -inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder, - struct drm_crtc_state *crtc_state, - struct drm_connector_state *conn_state) -{ - struct rockchip_crtc_state *s =3D to_rockchip_crtc_state(crtc_state); - struct drm_display_mode *mode =3D &crtc_state->adjusted_mode; - u8 vic =3D drm_match_cea_mode(mode); - struct inno_hdmi_connector_state *inno_conn_state =3D - to_inno_hdmi_conn_state(conn_state); - - s->output_mode =3D ROCKCHIP_OUT_MODE_P888; - s->output_type =3D DRM_MODE_CONNECTOR_HDMIA; - - if (vic =3D=3D 6 || vic =3D=3D 7 || - vic =3D=3D 21 || vic =3D=3D 22 || - vic =3D=3D 2 || vic =3D=3D 3 || - vic =3D=3D 17 || vic =3D=3D 18) - inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_601; - else - inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_709; - - return 0; -} - -static const struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_func= s =3D { - .atomic_check =3D inno_hdmi_encoder_atomic_check, - .atomic_enable =3D inno_hdmi_encoder_enable, - .atomic_disable =3D inno_hdmi_encoder_disable, -}; - -static enum drm_connector_status -inno_hdmi_connector_detect(struct drm_connector *connector, bool force) +static enum drm_connector_status inno_hdmi_bridge_detect(struct drm_bridge= *bridge) { - struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); =20 return (hdmi_readb(hdmi, HDMI_STATUS) & m_HOTPLUG) ? connector_status_connected : connector_status_disconnected; } =20 -static int inno_hdmi_connector_get_modes(struct drm_connector *connector) +static const struct drm_edid * +inno_hdmi_bridge_edid_read(struct drm_bridge *bridge, struct drm_connector= *connector) { - struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); const struct drm_edid *drm_edid; - int ret =3D 0; - - if (!hdmi->ddc) - return 0; - - drm_edid =3D drm_edid_read_ddc(connector, hdmi->ddc); - drm_edid_connector_update(connector, drm_edid); - ret =3D drm_edid_connector_add_modes(connector); - drm_edid_free(drm_edid); - - return ret; -} - -static enum drm_mode_status -inno_hdmi_connector_mode_valid(struct drm_connector *connector, - const struct drm_display_mode *mode) -{ - struct inno_hdmi *hdmi =3D connector_to_inno_hdmi(connector); - - return inno_hdmi_display_mode_valid(hdmi, mode); -} =20 -static void -inno_hdmi_connector_destroy_state(struct drm_connector *connector, - struct drm_connector_state *state) -{ - struct inno_hdmi_connector_state *inno_conn_state =3D - to_inno_hdmi_conn_state(state); + drm_edid =3D drm_edid_read_ddc(connector, bridge->ddc); + if (!drm_edid) + dev_dbg(hdmi->dev, "failed to get edid\n"); =20 - __drm_atomic_helper_connector_destroy_state(&inno_conn_state->base); - kfree(inno_conn_state); + return drm_edid; } =20 -static void inno_hdmi_connector_reset(struct drm_connector *connector) +static void inno_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { - struct inno_hdmi_connector_state *inno_conn_state; - - if (connector->state) { - inno_hdmi_connector_destroy_state(connector, connector->state); - connector->state =3D NULL; - } - - inno_conn_state =3D kzalloc(sizeof(*inno_conn_state), GFP_KERNEL); - if (!inno_conn_state) - return; - - __drm_atomic_helper_connector_reset(connector, &inno_conn_state->base); - __drm_atomic_helper_connector_hdmi_reset(connector, connector->state); + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); =20 - inno_conn_state->colorimetry =3D HDMI_COLORIMETRY_ITU_709; + inno_hdmi_setup(hdmi, state); } =20 -static struct drm_connector_state * -inno_hdmi_connector_duplicate_state(struct drm_connector *connector) +static void inno_hdmi_bridge_atomic_disable(struct drm_bridge *bridge, + struct drm_atomic_state *state) { - struct inno_hdmi_connector_state *inno_conn_state; - - if (WARN_ON(!connector->state)) - return NULL; - - inno_conn_state =3D kmemdup(to_inno_hdmi_conn_state(connector->state), - sizeof(*inno_conn_state), GFP_KERNEL); - - if (!inno_conn_state) - return NULL; + struct inno_hdmi *hdmi =3D bridge_to_inno_hdmi(bridge); =20 - __drm_atomic_helper_connector_duplicate_state(connector, - &inno_conn_state->base); - - return &inno_conn_state->base; + inno_hdmi_standby(hdmi); } =20 -static const struct drm_connector_funcs inno_hdmi_connector_funcs =3D { - .fill_modes =3D drm_helper_probe_single_connector_modes, - .detect =3D inno_hdmi_connector_detect, - .reset =3D inno_hdmi_connector_reset, - .atomic_duplicate_state =3D inno_hdmi_connector_duplicate_state, - .atomic_destroy_state =3D inno_hdmi_connector_destroy_state, -}; - -static struct drm_connector_helper_funcs inno_hdmi_connector_helper_funcs = =3D { - .atomic_check =3D drm_atomic_helper_connector_hdmi_check, - .get_modes =3D inno_hdmi_connector_get_modes, - .mode_valid =3D inno_hdmi_connector_mode_valid, +static const struct drm_bridge_funcs inno_hdmi_bridge_funcs =3D { + .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, + .atomic_reset =3D drm_atomic_helper_bridge_reset, + .atomic_enable =3D inno_hdmi_bridge_atomic_enable, + .atomic_disable =3D inno_hdmi_bridge_atomic_disable, + .detect =3D inno_hdmi_bridge_detect, + .edid_read =3D inno_hdmi_bridge_edid_read, + .hdmi_clear_infoframe =3D inno_hdmi_bridge_clear_infoframe, + .hdmi_write_infoframe =3D inno_hdmi_bridge_write_infoframe, + .mode_valid =3D inno_hdmi_bridge_mode_valid, }; =20 -static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hd= mi) -{ - struct drm_encoder *encoder =3D &hdmi->encoder.encoder; - struct device *dev =3D hdmi->dev; - - encoder->possible_crtcs =3D drm_of_find_possible_crtcs(drm, dev->of_node); - - /* - * If we failed to find the CRTC(s) which this encoder is - * supposed to be connected to, it's because the CRTC has - * not been registered yet. Defer probing, and hope that - * the required CRTC is added later. - */ - if (encoder->possible_crtcs =3D=3D 0) - return -EPROBE_DEFER; - - drm_encoder_helper_add(encoder, &inno_hdmi_encoder_helper_funcs); - drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); - - hdmi->connector.polled =3D DRM_CONNECTOR_POLL_HPD; - - drm_connector_helper_add(&hdmi->connector, - &inno_hdmi_connector_helper_funcs); - drmm_connector_hdmi_init(drm, &hdmi->connector, - "Rockchip", "Inno HDMI", - &inno_hdmi_connector_funcs, - &inno_hdmi_hdmi_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA, - hdmi->ddc, - BIT(HDMI_COLORSPACE_RGB), - 8); - - drm_connector_attach_encoder(&hdmi->connector, encoder); - - return 0; -} - static irqreturn_t inno_hdmi_i2c_irq(struct inno_hdmi *hdmi) { struct inno_hdmi_i2c *i2c =3D hdmi->i2c; @@ -1111,7 +926,7 @@ static irqreturn_t inno_hdmi_irq(int irq, void *dev_id) { struct inno_hdmi *hdmi =3D dev_id; =20 - drm_helper_hpd_irq_event(hdmi->connector.dev); + drm_helper_hpd_irq_event(hdmi->bridge.dev); =20 return IRQ_HANDLED; } @@ -1243,128 +1058,80 @@ static struct i2c_adapter *inno_hdmi_i2c_adapter(s= truct inno_hdmi *hdmi) return adap; } =20 -static int inno_hdmi_bind(struct device *dev, struct device *master, - void *data) +struct inno_hdmi *inno_hdmi_bind(struct device *dev, + struct drm_encoder *encoder, + const struct inno_hdmi_plat_data *plat_data) { struct platform_device *pdev =3D to_platform_device(dev); - struct drm_device *drm =3D data; struct inno_hdmi *hdmi; - const struct inno_hdmi_variant *variant; int irq; int ret; =20 - hdmi =3D devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL); - if (!hdmi) - return -ENOMEM; - - hdmi->dev =3D dev; + if (!plat_data->phy_configs || !plat_data->default_phy_config) { + dev_err(dev, "Missing platform PHY ops\n"); + return ERR_PTR(-ENODEV); + } =20 - variant =3D of_device_get_match_data(hdmi->dev); - if (!variant) - return -EINVAL; + hdmi =3D devm_drm_bridge_alloc(dev, struct inno_hdmi, bridge, &inno_hdmi_= bridge_funcs); + if (IS_ERR(hdmi)) + return ERR_CAST(hdmi); =20 - hdmi->variant =3D variant; + hdmi->dev =3D dev; + hdmi->plat_data =3D plat_data; =20 hdmi->regs =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(hdmi->regs)) - return PTR_ERR(hdmi->regs); + return ERR_CAST(hdmi->regs); =20 hdmi->pclk =3D devm_clk_get_enabled(hdmi->dev, "pclk"); - if (IS_ERR(hdmi->pclk)) - return dev_err_probe(dev, PTR_ERR(hdmi->pclk), "Unable to get HDMI pclk\= n"); + if (IS_ERR(hdmi->pclk)) { + dev_err_probe(dev, PTR_ERR(hdmi->pclk), "Unable to get HDMI pclk\n"); + return ERR_CAST(hdmi->pclk); + } =20 hdmi->refclk =3D devm_clk_get_optional_enabled(hdmi->dev, "ref"); - if (IS_ERR(hdmi->refclk)) - return dev_err_probe(dev, PTR_ERR(hdmi->refclk), "Unable to get HDMI ref= clk\n"); - - if (hdmi->variant->dev_type =3D=3D RK3036_HDMI) { - hdmi->grf =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,gr= f"); - if (IS_ERR(hdmi->grf)) - return dev_err_probe(dev, - PTR_ERR(hdmi->grf), "Unable to get rockchip,grf\n"); + if (IS_ERR(hdmi->refclk)) { + dev_err_probe(dev, PTR_ERR(hdmi->refclk), "Unable to get HDMI refclk\n"); + return ERR_CAST(hdmi->refclk); } =20 - irq =3D platform_get_irq(pdev, 0); - if (irq < 0) - return irq; - inno_hdmi_init_hw(hdmi); =20 - hdmi->ddc =3D inno_hdmi_i2c_adapter(hdmi); - if (IS_ERR(hdmi->ddc)) - return PTR_ERR(hdmi->ddc); - - ret =3D inno_hdmi_register(drm, hdmi); - if (ret) - return ret; - - dev_set_drvdata(dev, hdmi); + irq =3D platform_get_irq(pdev, 0); + if (irq < 0) + return ERR_PTR(irq); =20 ret =3D devm_request_threaded_irq(dev, irq, inno_hdmi_hardirq, inno_hdmi_irq, IRQF_SHARED, dev_name(dev), hdmi); - if (ret < 0) - goto err_cleanup_hdmi; - - return 0; -err_cleanup_hdmi: - hdmi->connector.funcs->destroy(&hdmi->connector); - hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); - return ret; -} - -static void inno_hdmi_unbind(struct device *dev, struct device *master, - void *data) -{ - struct inno_hdmi *hdmi =3D dev_get_drvdata(dev); - - hdmi->connector.funcs->destroy(&hdmi->connector); - hdmi->encoder.encoder.funcs->destroy(&hdmi->encoder.encoder); -} + if (ret) + return ERR_PTR(ret); =20 -static const struct component_ops inno_hdmi_ops =3D { - .bind =3D inno_hdmi_bind, - .unbind =3D inno_hdmi_unbind, -}; + hdmi->bridge.driver_private =3D hdmi; + hdmi->bridge.ops =3D DRM_BRIDGE_OP_DETECT | + DRM_BRIDGE_OP_EDID | + DRM_BRIDGE_OP_HDMI | + DRM_BRIDGE_OP_HPD; + hdmi->bridge.of_node =3D pdev->dev.of_node; + hdmi->bridge.type =3D DRM_MODE_CONNECTOR_HDMIA; + hdmi->bridge.vendor =3D "Inno"; + hdmi->bridge.product =3D "Inno HDMI"; + + hdmi->bridge.ddc =3D inno_hdmi_i2c_adapter(hdmi); + if (IS_ERR(hdmi->bridge.ddc)) + return ERR_CAST(hdmi->bridge.ddc); + + ret =3D devm_drm_bridge_add(dev, &hdmi->bridge); + if (ret) + return ERR_PTR(ret); =20 -static int inno_hdmi_probe(struct platform_device *pdev) -{ - return component_add(&pdev->dev, &inno_hdmi_ops); -} + ret =3D drm_bridge_attach(encoder, &hdmi->bridge, NULL, DRM_BRIDGE_ATTACH= _NO_CONNECTOR); + if (ret) + return ERR_PTR(ret); =20 -static void inno_hdmi_remove(struct platform_device *pdev) -{ - component_del(&pdev->dev, &inno_hdmi_ops); + return hdmi; } - -static const struct inno_hdmi_variant rk3036_inno_hdmi_variant =3D { - .dev_type =3D RK3036_HDMI, - .phy_configs =3D rk3036_hdmi_phy_configs, - .default_phy_config =3D &rk3036_hdmi_phy_configs[1], -}; - -static const struct inno_hdmi_variant rk3128_inno_hdmi_variant =3D { - .dev_type =3D RK3128_HDMI, - .phy_configs =3D rk3128_hdmi_phy_configs, - .default_phy_config =3D &rk3128_hdmi_phy_configs[1], -}; - -static const struct of_device_id inno_hdmi_dt_ids[] =3D { - { .compatible =3D "rockchip,rk3036-inno-hdmi", - .data =3D &rk3036_inno_hdmi_variant, - }, - { .compatible =3D "rockchip,rk3128-inno-hdmi", - .data =3D &rk3128_inno_hdmi_variant, - }, - {}, -}; -MODULE_DEVICE_TABLE(of, inno_hdmi_dt_ids); - -struct platform_driver inno_hdmi_driver =3D { - .probe =3D inno_hdmi_probe, - .remove =3D inno_hdmi_remove, - .driver =3D { - .name =3D "innohdmi-rockchip", - .of_match_table =3D inno_hdmi_dt_ids, - }, -}; +EXPORT_SYMBOL_GPL(inno_hdmi_bind); +MODULE_AUTHOR("Andy Yan "); +MODULE_DESCRIPTION("INNOSILICON HDMI transmitter library"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kc= onfig index cb8ff41dca2fc..67d1c8c3082a2 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -12,6 +12,7 @@ config DRM_ROCKCHIP select DRM_DISPLAY_DP_AUX_BUS if ROCKCHIP_ANALOGIX_DP select DRM_DW_HDMI if ROCKCHIP_DW_HDMI select DRM_DW_HDMI_QP if ROCKCHIP_DW_HDMI_QP + select DRM_INNO_HDMI if ROCKCHIP_INNO_HDMI select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI select DRM_DW_MIPI_DSI2 if ROCKCHIP_DW_MIPI_DSI2 select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/M= akefile index 2b867cebbc121..11176db14af6e 100644 --- a/drivers/gpu/drm/rockchip/Makefile +++ b/drivers/gpu/drm/rockchip/Makefile @@ -14,7 +14,7 @@ rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) +=3D dw_hdmi-rockc= hip.o rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI_QP) +=3D dw_hdmi_qp-rockchip.o rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) +=3D dw-mipi-dsi-rockchip.o rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI2) +=3D dw-mipi-dsi2-rockchip.o -rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) +=3D inno_hdmi.o +rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) +=3D inno_hdmi-rockchip.o rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) +=3D rockchip_lvds.o rockchipdrm-$(CONFIG_ROCKCHIP_RGB) +=3D rockchip_rgb.o rockchipdrm-$(CONFIG_ROCKCHIP_RK3066_HDMI) +=3D rk3066_hdmi.o diff --git a/drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c b/drivers/gpu/dr= m/rockchip/inno_hdmi-rockchip.c new file mode 100644 index 0000000000000..31cb2a90308c1 --- /dev/null +++ b/drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c @@ -0,0 +1,188 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) Rockchip Electronics Co., Ltd. + * Zheng Yang + * Andy Yan + */ +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "rockchip_drm_drv.h" + +#define HIWORD_UPDATE(val, mask) ((val) | (mask) << 16) + +#define RK3036_GRF_SOC_CON2 0x148 +#define RK3036_HDMI_PHSYNC BIT(4) +#define RK3036_HDMI_PVSYNC BIT(5) + +enum inno_hdmi_dev_type { + RK3036_HDMI, + RK3128_HDMI, +}; + +struct inno_hdmi_connector_state { + struct drm_connector_state base; + unsigned int colorimetry; +}; + +struct rockchip_inno_hdmi { + struct inno_hdmi *base; + struct device *dev; + struct regmap *grf; + struct rockchip_encoder encoder; +}; + +static struct inno_hdmi_phy_config rk3036_hdmi_phy_configs[] =3D { + { 74250000, 0x3f, 0xbb }, + { 165000000, 0x6f, 0xbb }, + { ~0UL, 0x00, 0x00 } +}; + +static struct inno_hdmi_phy_config rk3128_hdmi_phy_configs[] =3D { + { 74250000, 0x3f, 0xaa }, + { 165000000, 0x5f, 0xaa }, + { ~0UL, 0x00, 0x00 } +}; + +static void inno_hdmi_rk3036_enable(struct device *dev, struct drm_display= _mode *mode) +{ + struct rockchip_inno_hdmi *hdmi =3D dev_get_drvdata(dev); + int value, psync; + + psync =3D mode->flags & DRM_MODE_FLAG_PHSYNC ? RK3036_HDMI_PHSYNC : 0; + value =3D HIWORD_UPDATE(psync, RK3036_HDMI_PHSYNC); + psync =3D mode->flags & DRM_MODE_FLAG_PVSYNC ? RK3036_HDMI_PVSYNC : 0; + value |=3D HIWORD_UPDATE(psync, RK3036_HDMI_PVSYNC); + regmap_write(hdmi->grf, RK3036_GRF_SOC_CON2, value); +} + +static int inno_hdmi_encoder_atomic_check(struct drm_encoder *encoder, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct rockchip_crtc_state *s =3D to_rockchip_crtc_state(crtc_state); + + s->output_mode =3D ROCKCHIP_OUT_MODE_P888; + s->output_type =3D DRM_MODE_CONNECTOR_HDMIA; + + return 0; +} + +static const struct drm_encoder_helper_funcs inno_hdmi_rockchip_encoder_he= lper_funcs =3D { + .atomic_check =3D inno_hdmi_encoder_atomic_check, +}; + +static int inno_hdmi_rockchip_bind(struct device *dev, struct device *mast= er, void *data) +{ + struct drm_device *drm =3D data; + struct drm_connector *connector; + struct drm_encoder *encoder; + struct rockchip_inno_hdmi *hdmi; + const struct inno_hdmi_plat_data *plat_data; + int ret; + + hdmi =3D devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL); + if (!hdmi) + return -ENOMEM; + + hdmi->dev =3D dev; + + plat_data =3D of_device_get_match_data(hdmi->dev); + if (!plat_data) + return -EINVAL; + + if (of_device_is_compatible(dev->of_node, "rockchip,rk3036-inno-hdmi")) { + hdmi->grf =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,gr= f"); + if (IS_ERR(hdmi->grf)) + return dev_err_probe(dev, + PTR_ERR(hdmi->grf), "Unable to get rockchip,grf\n"); + } + + encoder =3D &hdmi->encoder.encoder; + encoder->possible_crtcs =3D drm_of_find_possible_crtcs(drm, dev->of_node); + + /* + * If we failed to find the CRTC(s) which this encoder is + * supposed to be connected to, it's because the CRTC has + * not been registered yet. Defer probing, and hope that + * the required CRTC is added later. + */ + if (encoder->possible_crtcs =3D=3D 0) + return -EPROBE_DEFER; + + ret =3D drmm_encoder_init(drm, encoder, NULL, DRM_MODE_ENCODER_TMDS, NULL= ); + if (ret) + return ret; + + drm_encoder_helper_add(encoder, &inno_hdmi_rockchip_encoder_helper_funcs); + + dev_set_drvdata(dev, hdmi); + + hdmi->base =3D inno_hdmi_bind(dev, encoder, plat_data); + + connector =3D drm_bridge_connector_init(drm, encoder); + if (IS_ERR(connector)) { + ret =3D PTR_ERR(connector); + dev_err(hdmi->dev, "failed to init bridge connector: %d\n", ret); + return ret; + } + + return drm_connector_attach_encoder(connector, encoder); +} + +static const struct component_ops inno_hdmi_rockchip_ops =3D { + .bind =3D inno_hdmi_rockchip_bind, +}; + +static int inno_hdmi_rockchip_probe(struct platform_device *pdev) +{ + return component_add(&pdev->dev, &inno_hdmi_rockchip_ops); +} + +static void inno_hdmi_rockchip_remove(struct platform_device *pdev) +{ + component_del(&pdev->dev, &inno_hdmi_rockchip_ops); +} + +static const struct inno_hdmi_plat_ops rk3036_inno_hdmi_plat_ops =3D { + .enable =3D inno_hdmi_rk3036_enable, +}; + +static const struct inno_hdmi_plat_data rk3036_inno_hdmi_plat_data =3D { + .ops =3D &rk3036_inno_hdmi_plat_ops, + .phy_configs =3D rk3036_hdmi_phy_configs, + .default_phy_config =3D &rk3036_hdmi_phy_configs[1], +}; + +static const struct inno_hdmi_plat_data rk3128_inno_hdmi_plat_data =3D { + .phy_configs =3D rk3128_hdmi_phy_configs, + .default_phy_config =3D &rk3128_hdmi_phy_configs[1], +}; + +static const struct of_device_id inno_hdmi_rockchip_dt_ids[] =3D { + { .compatible =3D "rockchip,rk3036-inno-hdmi", + .data =3D &rk3036_inno_hdmi_plat_data, + }, + { .compatible =3D "rockchip,rk3128-inno-hdmi", + .data =3D &rk3128_inno_hdmi_plat_data, + }, + {}, +}; +MODULE_DEVICE_TABLE(of, inno_hdmi_rockchip_dt_ids); + +struct platform_driver inno_hdmi_driver =3D { + .probe =3D inno_hdmi_rockchip_probe, + .remove =3D inno_hdmi_rockchip_remove, + .driver =3D { + .name =3D "innohdmi-rockchip", + .of_match_table =3D inno_hdmi_rockchip_dt_ids, + }, +}; diff --git a/include/drm/bridge/inno_hdmi.h b/include/drm/bridge/inno_hdmi.h new file mode 100644 index 0000000000000..8b39655212e24 --- /dev/null +++ b/include/drm/bridge/inno_hdmi.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (c) 2025 Rockchip Electronics Co., Ltd. + */ + +#ifndef __INNO_HDMI__ +#define __INNO_HDMI__ + +struct device; +struct drm_encoder; +struct drm_display_mode; +struct inno_hdmi; + +struct inno_hdmi_plat_ops { + void (*enable)(struct device *pdev, struct drm_display_mode *mode); +}; + +struct inno_hdmi_phy_config { + unsigned long pixelclock; + u8 pre_emphasis; + u8 voltage_level_control; +}; + +struct inno_hdmi_plat_data { + const struct inno_hdmi_plat_ops *ops; + struct inno_hdmi_phy_config *phy_configs; + struct inno_hdmi_phy_config *default_phy_config; +}; + +struct inno_hdmi *inno_hdmi_bind(struct device *pdev, + struct drm_encoder *encoder, + const struct inno_hdmi_plat_data *plat_data); +#endif /* __INNO_HDMI__ */ --=20 2.43.0 From nobody Mon Feb 9 05:03:44 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 146C2293725 for ; Mon, 12 May 2025 12:47:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054071; cv=none; b=qMlshyaKmwEotR18kpVHeMMo4JM5kZSSt3HsRzZJiJ6iMJ/8uaBlINb9QvcUsjGkMIc+BZuq2baTrd2PJqAUXtPAeuVObXneNWkbxzcYtlt1DZbCX+A/tlldRsE6GDqD4Ltc2T1j5aAtgEpApmD5pZBJXfvLdM265eki3NLSPiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747054071; c=relaxed/simple; bh=1+nhmkwcFu1eh/mVxyMIdHA5WrXPXGKZShwCeQjRlhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kLr7lrrUlFT91puPEaYE01+n/b9kwPMB9JwFQq3M8rDyeZ3XAJdZlbuTfrfr5VO+P/uOh6LU/ouRrtzOY8Jwuct7CuSGHb0yVIWlmOueSMuvssnxq1xTp6pCq6et4jmNC4NUnF1f+7KagQvqnQyJZjl3GGv1yjAkOfreoIsoA7Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=lOTRFDuX; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="lOTRFDuX" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=W7 TPmz56+bTrrWezkI50FNZkhcBlfYF3xYROFZ7Kqfs=; b=lOTRFDuXOP4BAUVjSJ Q5rFUAdtQVwhl+9Oy5tf1kT/m+Q15aatk3A68LAvdmjYUk/VffXx60htnqnZFgA5 y5A4OwVLiFBQJ2u9NaTRu//C6LQFMBXIm2LaB7b8lya5lpKa3ET70Kdj/x1f6g3M edxutcQHwPPygDzQFfmwK414k= Received: from ProDesk.. (unknown []) by gzsmtp3 (Coremail) with SMTP id PigvCgC3chWY7SFoQ+_OAQ--.62400S12; Mon, 12 May 2025 20:46:31 +0800 (CST) From: Andy Yan To: dmitry.baryshkov@oss.qualcomm.com, heiko@sntech.de Cc: jonas@kwiboo.se, Laurent.pinchart@ideasonboard.com, mripard@kernel.org, neil.armstrong@linaro.org, hjc@rock-chips.com, tzimmermann@suse.de, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Andy Yan Subject: [PATCH v5 10/10] MAINTAINERS: Add entry for Innosilicon hdmi bridge library Date: Mon, 12 May 2025 20:46:11 +0800 Message-ID: <20250512124615.2848731-11-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250512124615.2848731-1-andyshrk@163.com> References: <20250512124615.2848731-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: PigvCgC3chWY7SFoQ+_OAQ--.62400S12 X-Coremail-Antispam: 1Uf129KBjvdXoW7GFyUKrW8Jr48GFy7AFykuFg_yoWfWFb_AF 1xC3y0vr4YkFWjk397Ca1fW39Ikw4xJa4fX3Z5tws7tas8AryDtwnY9Fy0qr15CF18Ga9F qay5XFyakry3WjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0a9aPUUUUU== X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqBNLXmgh6hVNRAAAsR Content-Type: text/plain; charset="utf-8" From: Andy Yan Add entry for Innosilicon hdmi bridge library Signed-off-by: Andy Yan --- Changes in v5: - First included in this version MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 81b81cc68ca24..3718e570b4739 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11694,6 +11694,14 @@ M: Samuel Holland S: Maintained F: drivers/power/supply/ip5xxx_power.c =20 +INNOSILICON HDMI BRIDGE DRIVER +M: Andy Yan +L: dri-devel@lists.freedesktop.org +S: Maintained +T: git https://gitlab.freedesktop.org/drm/misc/kernel.git +F: drivers/gpu/drm/bridge/inno-hdmi.c +F: include/drm/bridge/inno_hdmi.h + INOTIFY M: Jan Kara R: Amir Goldstein --=20 2.43.0