Skip to contentSkip to conversation

Add support for KeemBay DRM driver

PATCH Superseded Anitha Chrisanthus 5 participants 23 messages Aug 31, 2020 – Oct 7, 2020 Page 1 of 2

Subsystems (4)

v7 of 13 Superseded Latest is v13 →

lore
Share & tools
lore

Anitha Chrisanthus

author maintainer
#0 lore raw

v7 cover Add support for KeemBay DRM driver

This is a new DRM driver for Intel's KeemBay SOC. The SoC couples an ARM Cortex A53 CPU with an Intel Movidius VPU.

This driver is tested with the KMB EVM board which is the refernce baord for Keem Bay SOC. The SOC's display pipeline is as follows

+--------------+    +---------+    +-----------------------+
|LCD controller| -> |Mipi DSI | -> |Mipi to HDMI Converter |
+--------------+    +---------+    +-----------------------+

LCD controller and Mipi DSI transmitter are part of the SOC and mipi to HDMI converter is ADV7535 for KMB EVM board.

The DRM driver is a basic KMS atomic modesetting display driver and has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Only 1080p resolution and single plane is supported at this time. The usecase is for debugging video and camera outputs.

Device tree patches are under review here
https://lore.kernel.org/linux-arm-kernel/[email protected]/T/

Changes since v1:
- Removed redundant license text, updated license
- Rearranged include blocks
- renamed global vars and removed extern in c
- Used upclassing for dev_private
- Used drm_dev_init in drm device create
- minor cleanups

Changes since v2:
- squashed all commits to a single commit
- logging changed to drm_info, drm_dbg etc.
- used devm_drm_dev_alloc()
- removed commented out sections and general cleanup

Changes since v3:
- renamed dev_p to kmb
- moved clocks under kmb_clock, consolidated clk initializations
- use drmm functions
- use DRM_GEM_CMA_DRIVER_OPS_VMAP
- more cleanups

Changes since v4:
- corrected spellings

Changes since v5:
- corrected checkpatch warnings/checks
-Please ignore checkpatch checks on Camelcase - this is how it is named in the databook
- Please ignore checkpatch warnings on misspelled for hsa, dout, widthn etc. - they are spelled as in the databook
- Please ignore checkpatch checks on macro arguments reuse - its confirmed ok

Changes since v6:
- review changes Sam Ravnborg and Thomas Zimmerman
split patch into 4 parts, part1 register definitions, part2 display driver files, part3 mipi dsi, part4 build files (Sam) removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) split dphy_init_sequence smaller (Sam)
removed redundant checks in kmb_dsi (Sam)
changed kmb_dsi_init to drm_bridge_connector_init and drm_connector_attach_encoder to bridge's connector (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam) use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state (Sam)

Anitha Chrisanthus (4):
drm/kmb: Keem Bay driver register definition
drm/kmb: Add support for KeemBay Display
drm/kmb: Mipi DSI part of the display driver
drm/kmb: Build files for KeemBay Display driver

 drivers/gpu/drm/Kconfig         |    2 +
 drivers/gpu/drm/Makefile        |    1 +
 drivers/gpu/drm/kmb/Kconfig     |   13 +
 drivers/gpu/drm/kmb/Makefile    |    2 +
 drivers/gpu/drm/kmb/kmb_crtc.c  |  224 ++++++
 drivers/gpu/drm/kmb/kmb_drv.c   |  676 +++++++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.h   |  170 +++++
 drivers/gpu/drm/kmb/kmb_dsi.c   | 1523 +++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/kmb/kmb_dsi.h   |  350 +++++++++
 drivers/gpu/drm/kmb/kmb_plane.c |  480 ++++++++++++
 drivers/gpu/drm/kmb/kmb_plane.h |  110 +++
 drivers/gpu/drm/kmb/kmb_regs.h  |  748 +++++++++++++++++++
 12 files changed, 4299 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/Kconfig
 create mode 100644 drivers/gpu/drm/kmb/Makefile
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_regs.h
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#1 lore raw

PATCH v7 1/4 drm/kmb: Keem Bay driver register definition

Register definitions for Keem Bay display driver

v2: removed license text (Sam)
v3: Squashed all 59 commits to one
v4: review changes from Sam Ravnborg
renamed dev_p to kmb
v5: corrected spellings
v6: corrected checkpatch warnings

---
 drivers/gpu/drm/kmb/kmb_regs.h | 748 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 748 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_regs.h
drivers/gpu/drm/kmb/kmb_regs.h new file +748 -0
new file mode 100644
index 0000000..f794ac3
@@ -0,0 +1,748 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_REGS_H__
+#define __KMB_REGS_H__
+
+#define ENABLE					 1
+#define DISABLE					 0
+/*from Data Book section 12.5.8.1 page 4322 */
+#define CPR_BASE_ADDR                           (0x20810000)
+#define MIPI_BASE_ADDR                          (0x20900000)
+/*from Data Book section 12.11.6.1 page 4972 */
+#define LCD_BASE_ADDR                           (0x20930000)
+#define MSS_CAM_BASE_ADDR			(MIPI_BASE_ADDR + 0x10000)
+#define LCD_MMIO_SIZE				(0x3000)
+#define MIPI_MMIO_SIZE				(0x4000)
+#define MSS_CAM_MMIO_SIZE			(0x30)
+
+/***************************************************************************
+ *		   LCD controller control register defines
+ ***************************************************************************/
+#define LCD_CONTROL				(0x4 * 0x000)
+#define LCD_CTRL_PROGRESSIVE			  (0 << 0)
+#define LCD_CTRL_INTERLACED			  BIT(0)
+#define LCD_CTRL_ENABLE				  BIT(1)
+#define LCD_CTRL_VL1_ENABLE			  BIT(2)
+#define LCD_CTRL_VL2_ENABLE			  BIT(3)
+#define LCD_CTRL_GL1_ENABLE			  BIT(4)
+#define LCD_CTRL_GL2_ENABLE			  BIT(5)
+#define LCD_CTRL_ALPHA_BLEND_VL1		  (0 << 6)
+#define LCD_CTRL_ALPHA_BLEND_VL2		  BIT(6)
+#define LCD_CTRL_ALPHA_BLEND_GL1		  (2 << 6)
+#define LCD_CTRL_ALPHA_BLEND_GL2		  (3 << 6)
+#define LCD_CTRL_ALPHA_TOP_VL1			  (0 << 8)
+#define LCD_CTRL_ALPHA_TOP_VL2			  BIT(8)
+#define LCD_CTRL_ALPHA_TOP_GL1			  (2 << 8)
+#define LCD_CTRL_ALPHA_TOP_GL2			  (3 << 8)
+#define LCD_CTRL_ALPHA_MIDDLE_VL1		  (0 << 10)
+#define LCD_CTRL_ALPHA_MIDDLE_VL2		  BIT(10)
+#define LCD_CTRL_ALPHA_MIDDLE_GL1		  (2 << 10)
+#define LCD_CTRL_ALPHA_MIDDLE_GL2		  (3 << 10)
+#define LCD_CTRL_ALPHA_BOTTOM_VL1		  (0 << 12)
+#define LCD_CTRL_ALPHA_BOTTOM_VL2		  BIT(12)
+#define LCD_CTRL_ALPHA_BOTTOM_GL1		  (2 << 12)
+#define LCD_CTRL_ALPHA_BOTTOM_GL2		  (3 << 12)
+#define LCD_CTRL_TIM_GEN_ENABLE			  BIT(14)
+#define LCD_CTRL_CONTINUOUS			  (0 << 15)
+#define LCD_CTRL_ONE_SHOT			  BIT(15)
+#define LCD_CTRL_PWM0_EN			  BIT(16)
+#define LCD_CTRL_PWM1_EN			  BIT(17)
+#define LCD_CTRL_PWM2_EN			  BIT(18)
+#define LCD_CTRL_OUTPUT_DISABLED		  (0 << 19)
+#define LCD_CTRL_OUTPUT_ENABLED			  BIT(19)
+#define LCD_CTRL_BPORCH_ENABLE			  BIT(21)
+#define LCD_CTRL_FPORCH_ENABLE			  BIT(22)
+#define LCD_CTRL_PIPELINE_DMA			  BIT(28)
+#define LCD_CTRL_VHSYNC_IDLE_LVL		  BIT(31)
+
+/*interrupts */
+#define LCD_INT_STATUS				(0x4 * 0x001)
+#define LCD_INT_EOF				  BIT(0)
+#define LCD_INT_LINE_CMP			  BIT(1)
+#define LCD_INT_VERT_COMP			  BIT(2)
+#define LAYER0_DMA_DONE				  BIT(3)
+#define LAYER0_DMA_IDLE				  BIT(4)
+#define LAYER0_DMA_FIFO_OVERFLOW		  BIT(5)
+#define LAYER0_DMA_FIFO_UNDERFLOW		  BIT(6)
+#define LAYER0_DMA_CB_FIFO_OVERFLOW		  BIT(7)
+#define LAYER0_DMA_CB_FIFO_UNDERFLOW		  BIT(8)
+#define LAYER0_DMA_CR_FIFO_OVERFLOW		  BIT(9)
+#define LAYER0_DMA_CR_FIFO_UNDERFLOW		  BIT(10)
+#define LAYER1_DMA_DONE				  BIT(11)
+#define LAYER1_DMA_IDLE				  BIT(12)
+#define LAYER1_DMA_FIFO_OVERFLOW		  BIT(13)
+#define LAYER1_DMA_FIFO_UNDERFLOW		  BIT(14)
+#define LAYER1_DMA_CB_FIFO_OVERFLOW		  BIT(15)
+#define LAYER1_DMA_CB_FIFO_UNDERFLOW		  BIT(16)
+#define LAYER1_DMA_CR_FIFO_OVERFLOW		  BIT(17)
+#define LAYER1_DMA_CR_FIFO_UNDERFLOW		  BIT(18)
+#define LAYER2_DMA_DONE				  BIT(19)
+#define LAYER2_DMA_IDLE				  BIT(20)
+#define LAYER2_DMA_FIFO_OVERFLOW		  BIT(21)
+#define LAYER2_DMA_FIFO_UNDERFLOW		  BIT(22)
+#define LAYER3_DMA_DONE				  BIT(23)
+#define LAYER3_DMA_IDLE				  BIT(24)
+#define LAYER3_DMA_FIFO_OVERFLOW		  BIT(25)
+#define LAYER3_DMA_FIFO_UNDERFLOW		  BIT(26)
+#define LCD_INT_LAYER				  (0x07fffff8)
+#define LCD_INT_ENABLE				(0x4 * 0x002)
+#define LCD_INT_CLEAR				(0x4 * 0x003)
+#define LCD_LINE_COUNT				(0x4 * 0x004)
+#define LCD_LINE_COMPARE			(0x4 * 0x005)
+#define LCD_VSTATUS				(0x4 * 0x006)
+
+/*LCD_VSTATUS_COMPARE Vertcal interval in which to generate vertcal
+ * interval interrupt
+ */
+/* BITS 13 and 14 */
+#define LCD_VSTATUS_COMPARE			(0x4 * 0x007)
+#define LCD_VSTATUS_VERTICAL_STATUS_MASK	  (3 << 13)
+#define LCD_VSTATUS_COMPARE_VSYNC		  (0 << 13)
+#define LCD_VSTATUS_COMPARE_BACKPORCH		  BIT(13)
+#define LCD_VSTATUS_COMPARE_ACTIVE		  (2 << 13)
+#define LCD_VSTATUS_COMPARE_FRONT_PORCH		  (3 << 13)
+
+#define LCD_SCREEN_WIDTH			(0x4 * 0x008)
+#define LCD_SCREEN_HEIGHT			(0x4 * 0x009)
+#define LCD_FIELD_INT_CFG			(0x4 * 0x00a)
+#define LCD_FIFO_FLUSH				(0x4 * 0x00b)
+#define LCD_BG_COLOUR_LS			(0x4 * 0x00c)
+#define LCD_BG_COLOUR_MS			(0x4 * 0x00d)
+#define LCD_RAM_CFG			        (0x4 * 0x00e)
+
+/****************************************************************************
+ *		   LCD controller Layer config register
+ ****************************************************************************
+ */
+#define LCD_LAYER0_CFG		        (0x4 * 0x100)
+#define LCD_LAYERn_CFG(N)			(LCD_LAYER0_CFG + (0x400 * (N)))
+#define LCD_LAYER_SCALE_H			BIT(1)
+#define LCD_LAYER_SCALE_V			BIT(2)
+#define LCD_LAYER_SCALE_H_V			(LCD_LAYER_SCALE_H | \
+						      LCD_LAYER_SCALE_V)
+#define LCD_LAYER_CSC_EN			BIT(3)
+#define LCD_LAYER_ALPHA_STATIC			BIT(4)
+#define LCD_LAYER_ALPHA_EMBED			BIT(5)
+#define LCD_LAYER_ALPHA_COMBI			(LCD_LAYER_ALPHA_STATIC | \
+						      LCD_LAYER_ALPHA_EMBED)
+/* RGB multiplied with alpha */
+#define LCD_LAYER_ALPHA_PREMULT			BIT(6)
+#define LCD_LAYER_INVERT_COL			BIT(7)
+#define LCD_LAYER_TRANSPARENT_EN		BIT(8)
+#define LCD_LAYER_FORMAT_YCBCR444PLAN		(0 << 9)
+#define LCD_LAYER_FORMAT_YCBCR422PLAN		BIT(9)
+#define LCD_LAYER_FORMAT_YCBCR420PLAN		(2 << 9)
+#define LCD_LAYER_FORMAT_RGB888PLAN		(3 << 9)
+#define LCD_LAYER_FORMAT_YCBCR444LIN		(4 << 9)
+#define LCD_LAYER_FORMAT_YCBCR422LIN		(5 << 9)
+#define LCD_LAYER_FORMAT_RGB888			(6 << 9)
+#define LCD_LAYER_FORMAT_RGBA8888		(7 << 9)
+#define LCD_LAYER_FORMAT_RGBX8888		(8 << 9)
+#define LCD_LAYER_FORMAT_RGB565			(9 << 9)
+#define LCD_LAYER_FORMAT_RGBA1555		(0xa << 9)
+#define LCD_LAYER_FORMAT_XRGB1555		(0xb << 9)
+#define LCD_LAYER_FORMAT_RGB444			(0xc << 9)
+#define LCD_LAYER_FORMAT_RGBA4444		(0xd << 9)
+#define LCD_LAYER_FORMAT_RGBX4444		(0xe << 9)
+#define LCD_LAYER_FORMAT_RGB332			(0xf << 9)
+#define LCD_LAYER_FORMAT_RGBA3328		(0x10 << 9)
+#define LCD_LAYER_FORMAT_RGBX3328		(0x11 << 9)
+#define LCD_LAYER_FORMAT_CLUT			(0x12 << 9)
+#define LCD_LAYER_FORMAT_NV12			(0x1c << 9)
+#define LCD_LAYER_PLANAR_STORAGE		BIT(14)
+#define LCD_LAYER_8BPP				(0 << 15)
+#define LCD_LAYER_16BPP				BIT(15)
+#define LCD_LAYER_24BPP				(2 << 15)
+#define LCD_LAYER_32BPP				(3 << 15)
+#define LCD_LAYER_Y_ORDER			BIT(17)
+#define LCD_LAYER_CRCB_ORDER			BIT(18)
+#define LCD_LAYER_BGR_ORDER			BIT(19)
+#define LCD_LAYER_LUT_2ENT			(0 << 20)
+#define LCD_LAYER_LUT_4ENT			BIT(20)
+#define LCD_LAYER_LUT_16ENT			(2 << 20)
+#define LCD_LAYER_NO_FLIP			(0 << 22)
+#define LCD_LAYER_FLIP_V			BIT(22)
+#define LCD_LAYER_FLIP_H			(2 << 22)
+#define LCD_LAYER_ROT_R90			(3 << 22)
+#define LCD_LAYER_ROT_L90			(4 << 22)
+#define LCD_LAYER_ROT_180			(5 << 22)
+#define LCD_LAYER_FIFO_00			(0 << 25)
+#define LCD_LAYER_FIFO_25			BIT(25)
+#define LCD_LAYER_FIFO_50			(2 << 25)
+#define LCD_LAYER_FIFO_100			(3 << 25)
+#define LCD_LAYER_INTERLEAVE_DIS		(0 << 27)
+#define LCD_LAYER_INTERLEAVE_V			BIT(27)
+#define LCD_LAYER_INTERLEAVE_H			(2 << 27)
+#define LCD_LAYER_INTERLEAVE_CH			(3 << 27)
+#define LCD_LAYER_INTERLEAVE_V_SUB		(4 << 27)
+#define LCD_LAYER_INTERLEAVE_H_SUB		(5 << 27)
+#define LCD_LAYER_INTERLEAVE_CH_SUB		(6 << 27)
+#define LCD_LAYER_INTER_POS_EVEN		(0 << 30)
+#define LCD_LAYER_INTER_POS_ODD			BIT(30)
+
+#define LCD_LAYER0_COL_START		(0x4 * 0x101)
+#define LCD_LAYERn_COL_START(N)		(LCD_LAYER0_COL_START + (0x400 * (N)))
+#define LCD_LAYER0_ROW_START		(0x4 * 0x102)
+#define LCD_LAYERn_ROW_START(N)		(LCD_LAYER0_ROW_START + (0x400 * (N)))
+#define LCD_LAYER0_WIDTH		(0x4 * 0x103)
+#define LCD_LAYERn_WIDTH(N)		(LCD_LAYER0_WIDTH + (0x400 * (N)))
+#define LCD_LAYER0_HEIGHT		(0x4 * 0x104)
+#define LCD_LAYERn_HEIGHT(N)		(LCD_LAYER0_HEIGHT + (0x400 * (N)))
+#define LCD_LAYER0_SCALE_CFG		(0x4 * 0x105)
+#define LCD_LAYERn_SCALE_CFG(N)		(LCD_LAYER0_SCALE_CFG + (0x400 * (N)))
+#define LCD_LAYER0_ALPHA		(0x4 * 0x106)
+#define LCD_LAYERn_ALPHA(N)		(LCD_LAYER0_ALPHA + (0x400 * (N)))
+#define LCD_LAYER0_INV_COLOUR_LS	(0x4 * 0x107)
+#define LCD_LAYERn_INV_COLOUR_LS(N)	(LCD_LAYER0_INV_COLOUR_LS + \
+					(0x400 * (N)))
+#define LCD_LAYER0_INV_COLOUR_MS	(0x4 * 0x108)
+#define LCD_LAYERn_INV_COLOUR_MS(N)	(LCD_LAYER0_INV_COLOUR_MS + \
+					(0x400 * (N)))
+#define LCD_LAYER0_TRANS_COLOUR_LS	(0x4 * 0x109)
+#define LCD_LAYERn_TRANS_COLOUR_LS(N)	(LCD_LAYER0_TRANS_COLOUR_LS + \
+					(0x400 * (N)))
+#define LCD_LAYER0_TRANS_COLOUR_MS	(0x4 * 0x10a)
+#define LCD_LAYERn_TRANS_COLOUR_MS(N)	(LCD_LAYER0_TRANS_COLOUR_MS + \
+					(0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF11		(0x4 * 0x10b)
+#define LCD_LAYERn_CSC_COEFF11(N)	(LCD_LAYER0_CSC_COEFF11 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF12		(0x4 * 0x10c)
+#define LCD_LAYERn_CSC_COEFF12(N)	(LCD_LAYER0_CSC_COEFF12 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF13		(0x4 * 0x10d)
+#define LCD_LAYERn_CSC_COEFF13(N)	(LCD_LAYER0_CSC_COEFF13 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF21		(0x4 * 0x10e)
+#define LCD_LAYERn_CSC_COEFF21(N)	(LCD_LAYER0_CSC_COEFF21 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF22		(0x4 * 0x10f)
+#define LCD_LAYERn_CSC_COEFF22(N)	(LCD_LAYER0_CSC_COEFF22 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF23		(0x4 * 0x110)
+#define LCD_LAYERn_CSC_COEFF23(N)	(LCD_LAYER0_CSC_COEFF23 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF31		(0x4 * 0x111)
+#define LCD_LAYERn_CSC_COEFF31(N)	(LCD_LAYER0_CSC_COEFF31 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF32		(0x4 * 0x112)
+#define LCD_LAYERn_CSC_COEFF32(N)	(LCD_LAYER0_CSC_COEFF32 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_COEFF33		(0x4 * 0x113)
+#define LCD_LAYERn_CSC_COEFF33(N)	(LCD_LAYER0_CSC_COEFF33 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_OFF1		(0x4 * 0x114)
+#define LCD_LAYERn_CSC_OFF1(N)		(LCD_LAYER0_CSC_OFF1 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_OFF2		(0x4 * 0x115)
+#define LCD_LAYERn_CSC_OFF2(N)		(LCD_LAYER0_CSC_OFF2 + (0x400 * (N)))
+#define LCD_LAYER0_CSC_OFF3		(0x4 * 0x116)
+#define LCD_LAYERn_CSC_OFF3(N)		(LCD_LAYER0_CSC_OFF3 + (0x400 * (N)))
+
+/*  LCD controller Layer DMA config register */
+#define LCD_LAYER0_DMA_CFG			(0x4 * 0x117)
+#define LCD_LAYERn_DMA_CFG(N)			(LCD_LAYER0_DMA_CFG + \
+						(0x400 * (N)))
+#define LCD_DMA_LAYER_ENABLE			  BIT(0)
+#define LCD_DMA_LAYER_STATUS			  BIT(1)
+#define LCD_DMA_LAYER_AUTO_UPDATE		  BIT(2)
+#define LCD_DMA_LAYER_CONT_UPDATE		  BIT(3)
+#define LCD_DMA_LAYER_CONT_PING_PONG_UPDATE	  (LCD_DMA_LAYER_AUTO_UPDATE \
+						| LCD_DMA_LAYER_CONT_UPDATE)
+#define LCD_DMA_LAYER_FIFO_ADR_MODE		  BIT(4)
+#define LCD_DMA_LAYER_AXI_BURST_1		  BIT(5)
+#define LCD_DMA_LAYER_AXI_BURST_2		  (2 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_3		  (3 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_4		  (4 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_5		  (5 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_6		  (6 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_7		  (7 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_8		  (8 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_9		  (9 << 5)
+#define LCD_DMA_LAYER_AXI_BURST_10		  (0xa << 5)
+#define LCD_DMA_LAYER_AXI_BURST_11		  (0xb << 5)
+#define LCD_DMA_LAYER_AXI_BURST_12		  (0xc << 5)
+#define LCD_DMA_LAYER_AXI_BURST_13		  (0xd << 5)
+#define LCD_DMA_LAYER_AXI_BURST_14		  (0xe << 5)
+#define LCD_DMA_LAYER_AXI_BURST_15		  (0xf << 5)
+#define LCD_DMA_LAYER_AXI_BURST_16		  (0x10 << 5)
+#define LCD_DMA_LAYER_VSTRIDE_EN		  BIT(10)
+
+#define LCD_LAYER0_DMA_START_ADR		(0x4 * 0x118)
+#define LCD_LAYERn_DMA_START_ADDR(N)		(LCD_LAYER0_DMA_START_ADR \
+						+ (0x400 * (N)))
+#define LCD_LAYER0_DMA_START_SHADOW		(0x4 * 0x119)
+#define LCD_LAYERn_DMA_START_SHADOW(N)		(LCD_LAYER0_DMA_START_SHADOW \
+						+ (0x400 * (N)))
+#define LCD_LAYER0_DMA_LEN			(0x4 * 0x11a)
+#define LCD_LAYERn_DMA_LEN(N)			(LCD_LAYER0_DMA_LEN + \
+						(0x400 * (N)))
+#define LCD_LAYER0_DMA_LEN_SHADOW		(0x4 * 0x11b)
+#define LCD_LAYERn_DMA_LEN_SHADOW(N)		(LCD_LAYER0_DMA_LEN_SHADOW + \
+						(0x400 * (N)))
+#define LCD_LAYER0_DMA_STATUS			(0x4 * 0x11c)
+#define LCD_LAYERn_DMA_STATUS(N)		(LCD_LAYER0_DMA_STATUS + \
+						(0x400 * (N)))
+#define LCD_LAYER0_DMA_LINE_WIDTH		(0x4 * 0x11d)
+#define LCD_LAYERn_DMA_LINE_WIDTH(N)		(LCD_LAYER0_DMA_LINE_WIDTH + \
+						(0x400 * (N)))
+#define LCD_LAYER0_DMA_LINE_VSTRIDE		(0x4 * 0x11e)
+#define LCD_LAYERn_DMA_LINE_VSTRIDE(N)		(LCD_LAYER0_DMA_LINE_VSTRIDE +\
+						(0x400 * (N)))
+#define LCD_LAYER0_DMA_FIFO_STATUS		(0x4 * 0x11f)
+#define LCD_LAYERn_DMA_FIFO_STATUS(N)		(LCD_LAYER0_DMA_FIFO_STATUS + \
+						(0x400 * (N)))
+#define LCD_LAYER0_CFG2				(0x4 * 0x120)
+#define LCD_LAYERn_CFG2(N)			(LCD_LAYER0_CFG2 + (0x400 * (N)))
+#define LCD_LAYER0_DMA_START_CB_ADR		(0x4 * 0x700)
+#define LCD_LAYERn_DMA_START_CB_ADR(N)		(LCD_LAYER0_DMA_START_CB_ADR + \
+						(0x20 * (N)))
+#define LCD_LAYER0_DMA_START_CB_SHADOW		(0x4 * 0x701)
+#define LCD_LAYERn_DMA_START_CB_SHADOW(N)	(LCD_LAYER0_DMA_START_CB_SHADOW\
+						+ (0x20 * (N)))
+#define LCD_LAYER0_DMA_CB_LINE_WIDTH		(0x4 * 0x702)
+#define LCD_LAYERn_DMA_CB_LINE_WIDTH(N)		(LCD_LAYER0_DMA_CB_LINE_WIDTH +\
+						(0x20 * (N)))
+#define LCD_LAYER0_DMA_CB_LINE_VSTRIDE		(0x4 * 0x703)
+#define LCD_LAYERn_DMA_CB_LINE_VSTRIDE(N)	(LCD_LAYER0_DMA_CB_LINE_VSTRIDE\
+						+ (0x20 * (N)))
+#define LCD_LAYER0_DMA_START_CR_ADR		(0x4 * 0x704)
+#define LCD_LAYERn_DMA_START_CR_ADR(N)		(LCD_LAYER0_DMA_START_CR_ADR + \
+						(0x20 * (N)))
+#define LCD_LAYER0_DMA_START_CR_SHADOW		(0x4 * 0x705)
+#define LCD_LAYERn_DMA_START_CR_SHADOW(N)	\
+						(LCD_LAYER0_DMA_START_CR_SHADOW\
+						 + (0x20 * (N)))
+#define LCD_LAYER0_DMA_CR_LINE_WIDTH		(0x4 * 0x706)
+#define LCD_LAYERn_DMA_CR_LINE_WIDTH(N)		(LCD_LAYER0_DMA_CR_LINE_WIDTH +\
+						(0x20 * (N)))
+#define LCD_LAYER0_DMA_CR_LINE_VSTRIDE		(0x4 * 0x707)
+#define LCD_LAYERn_DMA_CR_LINE_VSTRIDE(N)	(LCD_LAYER0_DMA_CR_LINE_VSTRIDE\
+						+ (0x20 * (N)))
+#define LCD_LAYER1_DMA_START_CB_ADR		(0x4 * 0x708)
+#define LCD_LAYER1_DMA_START_CB_SHADOW		(0x4 * 0x709)
+#define LCD_LAYER1_DMA_CB_LINE_WIDTH		(0x4 * 0x70a)
+#define LCD_LAYER1_DMA_CB_LINE_VSTRIDE		(0x4 * 0x70b)
+#define LCD_LAYER1_DMA_START_CR_ADR		(0x4 * 0x70c)
+#define LCD_LAYER1_DMA_START_CR_SHADOW		(0x4 * 0x70d)
+#define LCD_LAYER1_DMA_CR_LINE_WIDTH		(0x4 * 0x70e)
+#define LCD_LAYER1_DMA_CR_LINE_VSTRIDE		(0x4 * 0x70f)
+
+/****************************************************************************
+ *		   LCD controller output format register defines
+ ****************************************************************************/
+#define LCD_OUT_FORMAT_CFG			(0x4 * 0x800)
+#define LCD_OUTF_FORMAT_RGB121212                 (0x00)
+#define LCD_OUTF_FORMAT_RGB101010                 (0x01)
+#define LCD_OUTF_FORMAT_RGB888                    (0x02)
+#define LCD_OUTF_FORMAT_RGB666                    (0x03)
+#define LCD_OUTF_FORMAT_RGB565                    (0x04)
+#define LCD_OUTF_FORMAT_RGB444                    (0x05)
+#define LCD_OUTF_FORMAT_MRGB121212                (0x10)
+#define LCD_OUTF_FORMAT_MRGB101010                (0x11)
+#define LCD_OUTF_FORMAT_MRGB888                   (0x12)
+#define LCD_OUTF_FORMAT_MRGB666                   (0x13)
+#define LCD_OUTF_FORMAT_MRGB565                   (0x14)
+#define LCD_OUTF_FORMAT_YCBCR420_8B_LEGACY        (0x08)
+#define LCD_OUTF_FORMAT_YCBCR420_8B_DCI           (0x09)
+#define LCD_OUTF_FORMAT_YCBCR420_8B               (0x0A)
+#define LCD_OUTF_FORMAT_YCBCR420_10B              (0x0B)
+#define LCD_OUTF_FORMAT_YCBCR420_12B              (0x0C)
+#define LCD_OUTF_FORMAT_YCBCR422_8B               (0x0D)
+#define LCD_OUTF_FORMAT_YCBCR422_10B              (0x0E)
+#define LCD_OUTF_FORMAT_YCBCR444                  (0x0F)
+#define LCD_OUTF_FORMAT_MYCBCR420_8B_LEGACY       (0x18)
+#define LCD_OUTF_FORMAT_MYCBCR420_8B_DCI          (0x19)
+#define LCD_OUTF_FORMAT_MYCBCR420_8B              (0x1A)
+#define LCD_OUTF_FORMAT_MYCBCR420_10B             (0x1B)
+#define LCD_OUTF_FORMAT_MYCBCR420_12B             (0x1C)
+#define LCD_OUTF_FORMAT_MYCBCR422_8B              (0x1D)
+#define LCD_OUTF_FORMAT_MYCBCR422_10B             (0x1E)
+#define LCD_OUTF_FORMAT_MYCBCR444                 (0x1F)
+#define LCD_OUTF_BGR_ORDER			  BIT(5)
+#define LCD_OUTF_Y_ORDER			  BIT(6)
+#define LCD_OUTF_CRCB_ORDER			  BIT(7)
+#define LCD_OUTF_SYNC_MODE			  BIT(11)
+#define LCD_OUTF_RGB_CONV_MODE			  BIT(14)
+#define LCD_OUTF_MIPI_RGB_MODE			  BIT(18)
+
+#define LCD_HSYNC_WIDTH				(0x4 * 0x801)
+#define LCD_H_BACKPORCH				(0x4 * 0x802)
+#define LCD_H_ACTIVEWIDTH			(0x4 * 0x803)
+#define LCD_H_FRONTPORCH			(0x4 * 0x804)
+#define LCD_VSYNC_WIDTH				(0x4 * 0x805)
+#define LCD_V_BACKPORCH				(0x4 * 0x806)
+#define LCD_V_ACTIVEHEIGHT			(0x4 * 0x807)
+#define LCD_V_FRONTPORCH			(0x4 * 0x808)
+#define LCD_VSYNC_START				(0x4 * 0x809)
+#define LCD_VSYNC_END				(0x4 * 0x80a)
+#define LCD_V_BACKPORCH_EVEN			(0x4 * 0x80b)
+#define LCD_VSYNC_WIDTH_EVEN			(0x4 * 0x80c)
+#define LCD_V_ACTIVEHEIGHT_EVEN			(0x4 * 0x80d)
+#define LCD_V_FRONTPORCH_EVEN			(0x4 * 0x80e)
+#define LCD_VSYNC_START_EVEN			(0x4 * 0x80f)
+#define LCD_VSYNC_END_EVEN			(0x4 * 0x810)
+#define LCD_TIMING_GEN_TRIG			(0x4 * 0x811)
+#define LCD_PWM0_CTRL				(0x4 * 0x812)
+#define LCD_PWM0_RPT_LEADIN			(0x4 * 0x813)
+#define LCD_PWM0_HIGH_LOW			(0x4 * 0x814)
+#define LCD_PWM1_CTRL				(0x4 * 0x815)
+#define LCD_PWM1_RPT_LEADIN			(0x4 * 0x816)
+#define LCD_PWM1_HIGH_LOW			(0x4 * 0x817)
+#define LCD_PWM2_CTRL				(0x4 * 0x818)
+#define LCD_PWM2_RPT_LEADIN			(0x4 * 0x819)
+#define LCD_PWM2_HIGH_LOW			(0x4 * 0x81a)
+#define LCD_VIDEO0_DMA0_BYTES			(0x4 * 0xb00)
+#define LCD_VIDEO0_DMA0_STATE			(0x4 * 0xb01)
+#define LCD_DMA_STATE_ACTIVE			  BIT(3)
+#define LCD_VIDEO0_DMA1_BYTES			(0x4 * 0xb02)
+#define LCD_VIDEO0_DMA1_STATE			(0x4 * 0xb03)
+#define LCD_VIDEO0_DMA2_BYTES			(0x4 * 0xb04)
+#define LCD_VIDEO0_DMA2_STATE			(0x4 * 0xb05)
+#define LCD_VIDEO1_DMA0_BYTES			(0x4 * 0xb06)
+#define LCD_VIDEO1_DMA0_STATE			(0x4 * 0xb07)
+#define LCD_VIDEO1_DMA1_BYTES			(0x4 * 0xb08)
+#define LCD_VIDEO1_DMA1_STATE			(0x4 * 0xb09)
+#define LCD_VIDEO1_DMA2_BYTES			(0x4 * 0xb0a)
+#define LCD_VIDEO1_DMA2_STATE			(0x4 * 0xb0b)
+#define LCD_GRAPHIC0_DMA_BYTES			(0x4 * 0xb0c)
+#define LCD_GRAPHIC0_DMA_STATE			(0x4 * 0xb0d)
+#define LCD_GRAPHIC1_DMA_BYTES			(0x4 * 0xb0e)
+#define LCD_GRAPHIC1_DMA_STATE			(0x4 * 0xb0f)
+
+/***************************************************************************
+ *		   MIPI controller control register defines
+ ***********************************************i****************************/
+#define MIPI0_HS_BASE_ADDR			(MIPI_BASE_ADDR + 0x400)
+#define HS_OFFSET(M)				(((M) + 1) * 0x400)
+
+#define MIPI_TX_HS_CTRL				(0x0)
+#define   MIPI_TXm_HS_CTRL(M)			(MIPI_TX_HS_CTRL + HS_OFFSET(M))
+#define   HS_CTRL_EN				BIT(0)
+/*1:CSI 0:DSI */
+#define   HS_CTRL_CSIDSIN			BIT(2)
+/*1:LCD, 0:DMA */
+#define   TX_SOURCE				BIT(3)
+#define   ACTIVE_LANES(n)			((n) << 4)
+#define   LCD_VC(ch)				((ch) << 8)
+#define   DSI_EOTP_EN				BIT(11)
+#define   DSI_CMD_HFP_EN			BIT(12)
+#define   CRC_EN				BIT(14)
+#define   HSEXIT_CNT(n)				((n) << 16)
+#define   HSCLKIDLE_CNT				BIT(24)
+#define MIPI_TX_HS_SYNC_CFG			(0x8)
+#define   MIPI_TXm_HS_SYNC_CFG(M)		(MIPI_TX_HS_SYNC_CFG \
+						+ HS_OFFSET(M))
+#define   LINE_SYNC_PKT_ENABLE			BIT(0)
+#define   FRAME_COUNTER_ACTIVE			BIT(1)
+#define   LINE_COUNTER_ACTIVE			BIT(2)
+#define   DSI_V_BLANKING			BIT(4)
+#define   DSI_HSA_BLANKING			BIT(5)
+#define   DSI_HBP_BLANKING			BIT(6)
+#define   DSI_HFP_BLANKING			BIT(7)
+#define   DSI_SYNC_PULSE_EVENTN			BIT(8)
+#define   DSI_LPM_FIRST_VSA_LINE		BIT(9)
+#define   DSI_LPM_LAST_VFP_LINE			BIT(10)
+#define   WAIT_ALL_SECT				BIT(11)
+#define   WAIT_TRIG_POS				BIT(15)
+#define   ALWAYS_USE_HACT(f)			((f) << 19)
+#define   FRAME_GEN_EN(f)			((f) << 23)
+#define   HACT_WAIT_STOP(f)			((f) << 28)
+#define MIPI_TX0_HS_FG0_SECT0_PH		(0x40)
+#define   MIPI_TXm_HS_FGn_SECTo_PH(M, N, O)	(MIPI_TX0_HS_FG0_SECT0_PH + \
+						HS_OFFSET(M) + (0x2C * (N)) \
+						+ (8 * (O)))
+#define   MIPI_TX_SECT_WC_MASK			(0xffff)
+#define	  MIPI_TX_SECT_VC_MASK			(3)
+#define   MIPI_TX_SECT_VC_SHIFT			(22)
+#define   MIPI_TX_SECT_DT_MASK			(0x3f)
+#define   MIPI_TX_SECT_DT_SHIFT			(16)
+#define   MIPI_TX_SECT_DM_MASK			(3)
+#define   MIPI_TX_SECT_DM_SHIFT			(24)
+#define   MIPI_TX_SECT_DMA_PACKED		BIT(26)
+#define MIPI_TX_HS_FG0_SECT_UNPACKED_BYTES0	(0x60)
+#define MIPI_TX_HS_FG0_SECT_UNPACKED_BYTES1	(0x64)
+#define   MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0(M, N)	\
+					(MIPI_TX_HS_FG0_SECT_UNPACKED_BYTES0 \
+					+ HS_OFFSET(M) + (0x2C * (N)))
+#define MIPI_TX_HS_FG0_SECT0_LINE_CFG		(0x44)
+#define   MIPI_TXm_HS_FGn_SECTo_LINE_CFG(M, N, O)	\
+				(MIPI_TX_HS_FG0_SECT0_LINE_CFG + HS_OFFSET(M) \
+				+ (0x2C * (N)) + (8 * (O)))
+
+#define MIPI_TX_HS_FG0_NUM_LINES		(0x68)
+#define   MIPI_TXm_HS_FGn_NUM_LINES(M, N)	\
+				(MIPI_TX_HS_FG0_NUM_LINES + HS_OFFSET(M) \
+				+ (0x2C * (N)))
+#define MIPI_TX_HS_VSYNC_WIDTHS0		(0x104)
+#define   MIPI_TXm_HS_VSYNC_WIDTHn(M, N)		\
+				(MIPI_TX_HS_VSYNC_WIDTHS0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_V_BACKPORCHES0		(0x16c)
+#define   MIPI_TXm_HS_V_BACKPORCHESn(M, N)	\
+				(MIPI_TX_HS_V_BACKPORCHES0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_V_FRONTPORCHES0		(0x174)
+#define   MIPI_TXm_HS_V_FRONTPORCHESn(M, N)	\
+				(MIPI_TX_HS_V_FRONTPORCHES0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_V_ACTIVE0			(0x17c)
+#define   MIPI_TXm_HS_V_ACTIVEn(M, N)		\
+				(MIPI_TX_HS_V_ACTIVE0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_HSYNC_WIDTH0			(0x10c)
+#define   MIPI_TXm_HS_HSYNC_WIDTHn(M, N)		\
+				(MIPI_TX_HS_HSYNC_WIDTH0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_H_BACKPORCH0			(0x11c)
+#define   MIPI_TXm_HS_H_BACKPORCHn(M, N)		\
+				(MIPI_TX_HS_H_BACKPORCH0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_H_FRONTPORCH0		(0x12c)
+#define   MIPI_TXm_HS_H_FRONTPORCHn(M, N)	\
+				(MIPI_TX_HS_H_FRONTPORCH0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_H_ACTIVE0			(0x184)
+#define   MIPI_TXm_HS_H_ACTIVEn(M, N)		\
+				(MIPI_TX_HS_H_ACTIVE0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_LLP_HSYNC_WIDTH0		(0x13c)
+#define   MIPI_TXm_HS_LLP_HSYNC_WIDTHn(M, N)	\
+				(MIPI_TX_HS_LLP_HSYNC_WIDTH0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_LLP_H_BACKPORCH0		(0x14c)
+#define   MIPI_TXm_HS_LLP_H_BACKPORCHn(M, N)	\
+				(MIPI_TX_HS_LLP_H_BACKPORCH0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define MIPI_TX_HS_LLP_H_FRONTPORCH0		(0x15c)
+#define   MIPI_TXm_HS_LLP_H_FRONTPORCHn(M, N)	\
+				(MIPI_TX_HS_LLP_H_FRONTPORCH0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+
+#define MIPI_TX_HS_MC_FIFO_CTRL_EN		(0x194)
+#define   MIPI_TXm_HS_MC_FIFO_CTRL_EN(M)	\
+				(MIPI_TX_HS_MC_FIFO_CTRL_EN + HS_OFFSET(M))
+
+#define MIPI_TX_HS_MC_FIFO_CHAN_ALLOC0		(0x198)
+#define MIPI_TX_HS_MC_FIFO_CHAN_ALLOC1		(0x19c)
+#define   MIPI_TXm_HS_MC_FIFO_CHAN_ALLOCn(M, N)	\
+			(MIPI_TX_HS_MC_FIFO_CHAN_ALLOC0 + HS_OFFSET(M) \
+			+ (0x4 * (N)))
+#define   SET_MC_FIFO_CHAN_ALLOC(dev, ctrl, vc, sz)	\
+		kmb_write_bits_mipi(dev, \
+				MIPI_TXm_HS_MC_FIFO_CHAN_ALLOCn(ctrl, \
+				(vc) / 2), ((vc) % 2) * 16, 16, sz)
+#define MIPI_TX_HS_MC_FIFO_RTHRESHOLD0		(0x1a0)
+#define MIPI_TX_HS_MC_FIFO_RTHRESHOLD1		(0x1a4)
+#define   MIPI_TXm_HS_MC_FIFO_RTHRESHOLDn(M, N)	\
+				(MIPI_TX_HS_MC_FIFO_RTHRESHOLD0 + HS_OFFSET(M) \
+				+ (0x4 * (N)))
+#define   SET_MC_FIFO_RTHRESHOLD(dev, ctrl, vc, th)	\
+	kmb_write_bits_mipi(dev, MIPI_TXm_HS_MC_FIFO_RTHRESHOLDn(ctrl, \
+				(vc) / 2), ((vc) % 2) * 16, 16, th)
+#define MIPI_TX_HS_DMA_CFG			(0x1a8)
+#define MIPI_TX_HS_DMA_START_ADR_CHAN0		(0x1ac)
+#define MIPI_TX_HS_DMA_LEN_CHAN0		(0x1b4)
+
+/* MIPI IRQ */
+#define MIPI_CTRL_IRQ_STATUS0				(0x00)
+#define   MIPI_DPHY_ERR_IRQ				1
+#define   MIPI_DPHY_ERR_MASK				0x7FE	/*bits 1-10 */
+#define   MIPI_HS_IRQ					13
+/*bits 13-22 */
+#define   MIPI_HS_IRQ_MASK				0x7FE000
+#define   MIPI_LP_EVENT_IRQ				25
+#define   MIPI_GET_IRQ_STAT0(dev)		kmb_read_mipi(dev, \
+						MIPI_CTRL_IRQ_STATUS0)
+#define MIPI_CTRL_IRQ_STATUS1				(0x04)
+#define   MIPI_HS_RX_EVENT_IRQ				0
+#define   MIPI_GET_IRQ_STAT1(dev)		kmb_read_mipi(dev, \
+						MIPI_CTRL_IRQ_STATUS1)
+#define MIPI_CTRL_IRQ_ENABLE0				(0x08)
+#define   SET_MIPI_CTRL_IRQ_ENABLE0(dev, M, N)	kmb_set_bit_mipi(dev, \
+						MIPI_CTRL_IRQ_ENABLE0, \
+						(M) + (N))
+#define   MIPI_GET_IRQ_ENABLED0(dev)		kmb_read_mipi(dev, \
+						MIPI_CTRL_IRQ_ENABLE0)
+#define MIPI_CTRL_IRQ_ENABLE1				(0x0c)
+#define   MIPI_GET_IRQ_ENABLED1(dev)		kmb_read_mipi(dev, \
+						MIPI_CTRL_IRQ_ENABLE1)
+#define MIPI_CTRL_IRQ_CLEAR0				(0x010)
+#define   SET_MIPI_CTRL_IRQ_CLEAR0(dev, M, N)		\
+		kmb_set_bit_mipi(dev, MIPI_CTRL_IRQ_CLEAR0, (M) + (N))
+#define MIPI_CTRL_IRQ_CLEAR1				(0x014)
+#define   SET_MIPI_CTRL_IRQ_CLEAR1(dev, M, N)		\
+		kmb_set_bit_mipi(dev, MIPI_CTRL_IRQ_CLEAR1, (M) + (N))
+#define MIPI_CTRL_DIG_LOOPBACK				(0x018)
+#define MIPI_TX_HS_IRQ_STATUS				(0x01c)
+#define   MIPI_TX_HS_IRQ_STATUSm(M)		(MIPI_TX_HS_IRQ_STATUS + \
+						HS_OFFSET(M))
+#define   GET_MIPI_TX_HS_IRQ_STATUS(dev, M)	kmb_read_mipi(dev, \
+						MIPI_TX_HS_IRQ_STATUSm(M))
+#define   MIPI_TX_HS_IRQ_LINE_COMPARE			BIT(1)
+#define   MIPI_TX_HS_IRQ_FRAME_DONE_0			BIT(2)
+#define   MIPI_TX_HS_IRQ_FRAME_DONE_1			BIT(3)
+#define   MIPI_TX_HS_IRQ_FRAME_DONE_2			BIT(4)
+#define   MIPI_TX_HS_IRQ_FRAME_DONE_3			BIT(5)
+#define   MIPI_TX_HS_IRQ_DMA_DONE_0			BIT(6)
+#define   MIPI_TX_HS_IRQ_DMA_IDLE_0			BIT(7)
+#define   MIPI_TX_HS_IRQ_DMA_DONE_1			BIT(8)
+#define   MIPI_TX_HS_IRQ_DMA_IDLE_1			BIT(9)
+#define   MIPI_TX_HS_IRQ_DMA_DONE_2			BIT(10)
+#define   MIPI_TX_HS_IRQ_DMA_IDLE_2			BIT(11)
+#define   MIPI_TX_HS_IRQ_DMA_DONE_3			BIT(12)
+#define   MIPI_TX_HS_IRQ_DMA_IDLE_3			BIT(13)
+#define   MIPI_TX_HS_IRQ_MC_FIFO_UNDERFLOW		BIT(14)
+#define   MIPI_TX_HS_IRQ_MC_FIFO_OVERFLOW		BIT(15)
+#define   MIPI_TX_HS_IRQ_LLP_FIFO_EMPTY			BIT(16)
+#define   MIPI_TX_HS_IRQ_LLP_REQUEST_QUEUE_FULL		BIT(17)
+#define   MIPI_TX_HS_IRQ_LLP_REQUEST_QUEUE_ERROR	BIT(18)
+#define   MIPI_TX_HS_IRQ_LLP_WORD_COUNT_ERROR		BIT(20)
+#define   MIPI_TX_HS_IRQ_FRAME_DONE			\
+				(MIPI_TX_HS_IRQ_FRAME_DONE_0 | \
+				MIPI_TX_HS_IRQ_FRAME_DONE_1 | \
+				MIPI_TX_HS_IRQ_FRAME_DONE_2 | \
+				MIPI_TX_HS_IRQ_FRAME_DONE_3)
+
+#define MIPI_TX_HS_IRQ_DMA_DONE				\
+				(MIPI_TX_HS_IRQ_DMA_DONE_0 | \
+				MIPI_TX_HS_IRQ_DMA_DONE_1 | \
+				MIPI_TX_HS_IRQ_DMA_DONE_2 | \
+				MIPI_TX_HS_IRQ_DMA_DONE_3)
+
+#define MIPI_TX_HS_IRQ_DMA_IDLE				\
+				(MIPI_TX_HS_IRQ_DMA_IDLE_0 | \
+				MIPI_TX_HS_IRQ_DMA_IDLE_1 | \
+				MIPI_TX_HS_IRQ_DMA_IDLE_2 | \
+				MIPI_TX_HS_IRQ_DMA_IDLE_3)
+
+#define MIPI_TX_HS_IRQ_ERROR				\
+				(MIPI_TX_HS_IRQ_MC_FIFO_UNDERFLOW | \
+				MIPI_TX_HS_IRQ_MC_FIFO_OVERFLOW | \
+				MIPI_TX_HS_IRQ_LLP_FIFO_EMPTY | \
+				MIPI_TX_HS_IRQ_LLP_REQUEST_QUEUE_FULL | \
+				MIPI_TX_HS_IRQ_LLP_REQUEST_QUEUE_ERROR | \
+				MIPI_TX_HS_IRQ_LLP_WORD_COUNT_ERROR)
+
+#define MIPI_TX_HS_IRQ_ALL				\
+				(MIPI_TX_HS_IRQ_FRAME_DONE | \
+				MIPI_TX_HS_IRQ_DMA_DONE | \
+				MIPI_TX_HS_IRQ_DMA_IDLE | \
+				MIPI_TX_HS_IRQ_LINE_COMPARE | \
+				MIPI_TX_HS_IRQ_ERROR)
+
+#define MIPI_TX_HS_IRQ_ENABLE				(0x020)
+#define   SET_HS_IRQ_ENABLE(dev, M, val)	kmb_set_bitmask_mipi(dev, \
+						MIPI_TX_HS_IRQ_ENABLE \
+						+ HS_OFFSET(M), val)
+#define   CLR_HS_IRQ_ENABLE(dev, M, val)	kmb_clr_bitmask_mipi(dev, \
+						MIPI_TX_HS_IRQ_ENABLE \
+						+ HS_OFFSET(M), val)
+#define	  GET_HS_IRQ_ENABLE(dev, M)		kmb_read_mipi(dev, \
+						MIPI_TX_HS_IRQ_ENABLE \
+						+ HS_OFFSET(M))
+#define MIPI_TX_HS_IRQ_CLEAR				(0x024)
+#define   SET_MIPI_TX_HS_IRQ_CLEAR(dev, M, val)		\
+			kmb_set_bitmask_mipi(dev, \
+			MIPI_TX_HS_IRQ_CLEAR \
+			+ HS_OFFSET(M), val)
+
+/* MIPI Test Pattern Generation */
+#define MIPI_TX_HS_TEST_PAT_CTRL			(0x230)
+#define   MIPI_TXm_HS_TEST_PAT_CTRL(M)			\
+				(MIPI_TX_HS_TEST_PAT_CTRL + HS_OFFSET(M))
+#define   TP_EN_VCm(M)					(1 << ((M) * 0x04))
+#define   TP_SEL_VCm(M, N)				\
+				((N) << (((M) * 0x04) + 1))
+#define   TP_STRIPE_WIDTH(M)				((M) << 16)
+#define MIPI_TX_HS_TEST_PAT_COLOR0			(0x234)
+#define   MIPI_TXm_HS_TEST_PAT_COLOR0(M)		\
+				(MIPI_TX_HS_TEST_PAT_COLOR0 + HS_OFFSET(M))
+#define MIPI_TX_HS_TEST_PAT_COLOR1			(0x238)
+#define   MIPI_TXm_HS_TEST_PAT_COLOR1(M)		\
+				(MIPI_TX_HS_TEST_PAT_COLOR1 + HS_OFFSET(M))
+
+/* D-PHY regs */
+#define DPHY_ENABLE				(0x100)
+#define DPHY_INIT_CTRL0				(0x104)
+#define   SHUTDOWNZ				0
+#define   RESETZ				12
+#define DPHY_INIT_CTRL1				(0x108)
+#define   PLL_CLKSEL_0				18
+#define   PLL_SHADOW_CTRL			16
+#define DPHY_INIT_CTRL2				(0x10c)
+#define   SET_DPHY_INIT_CTRL0(dev, dphy, offset)	\
+			kmb_set_bit_mipi(dev, DPHY_INIT_CTRL0, \
+					((dphy) + (offset)))
+#define   CLR_DPHY_INIT_CTRL0(dev, dphy, offset)	\
+			kmb_clr_bit_mipi(dev, DPHY_INIT_CTRL0, \
+					((dphy) + (offset)))
+#define DPHY_INIT_CTRL2				(0x10c)
+#define DPHY_PLL_OBS0				(0x110)
+#define DPHY_PLL_OBS1				(0x114)
+#define DPHY_PLL_OBS2				(0x118)
+#define DPHY_FREQ_CTRL0_3			(0x11c)
+#define DPHY_FREQ_CTRL4_7			(0x120)
+#define   SET_DPHY_FREQ_CTRL0_3(dev, dphy, val)	\
+			kmb_write_bits_mipi(dev, DPHY_FREQ_CTRL0_3 \
+			+ (((dphy) / 4) * 4), (dphy % 4) * 8, 6, val)
+
+#define DPHY_FORCE_CTRL0			(0x128)
+#define DPHY_FORCE_CTRL1			(0x12C)
+#define MIPI_DPHY_STAT0_3			(0x134)
+#define MIPI_DPHY_STAT4_7			(0x138)
+#define	  GET_STOPSTATE_DATA(dev, dphy)		\
+			(((kmb_read_mipi(dev, MIPI_DPHY_STAT0_3 + \
+					 ((dphy) / 4) * 4)) >> \
+					 (((dphy % 4) * 8) + 4)) & 0x03)
+
+#define MIPI_DPHY_ERR_STAT6_7			(0x14C)
+
+#define DPHY_TEST_CTRL0				(0x154)
+#define   SET_DPHY_TEST_CTRL0(dev, dphy)		\
+			kmb_set_bit_mipi(dev, DPHY_TEST_CTRL0, (dphy))
+#define   CLR_DPHY_TEST_CTRL0(dev, dphy)		\
+			kmb_clr_bit_mipi(dev, DPHY_TEST_CTRL0, \
+						(dphy))
+#define DPHY_TEST_CTRL1				(0x158)
+#define   SET_DPHY_TEST_CTRL1_CLK(dev, dphy)	\
+			kmb_set_bit_mipi(dev, DPHY_TEST_CTRL1, (dphy))
+#define   CLR_DPHY_TEST_CTRL1_CLK(dev, dphy)	\
+			kmb_clr_bit_mipi(dev, DPHY_TEST_CTRL1, (dphy))
+#define   SET_DPHY_TEST_CTRL1_EN(dev, dphy)	\
+			kmb_set_bit_mipi(dev, DPHY_TEST_CTRL1, ((dphy) + 12))
+#define   CLR_DPHY_TEST_CTRL1_EN(dev, dphy)	\
+			kmb_clr_bit_mipi(dev, DPHY_TEST_CTRL1, ((dphy) + 12))
+#define DPHY_TEST_DIN0_3			(0x15c)
+#define   SET_TEST_DIN0_3(dev, dphy, val)		\
+			kmb_write_mipi(dev, DPHY_TEST_DIN0_3 + \
+			4, ((val) << (((dphy) % 4) * 8)))
+#define DPHY_TEST_DOUT0_3			(0x168)
+#define   GET_TEST_DOUT0_3(dev, dphy)		\
+			(kmb_read_mipi(dev, DPHY_TEST_DOUT0_3) \
+			>> (((dphy) % 4) * 8) & 0xff)
+#define DPHY_TEST_DOUT4_7			(0x16C)
+#define   GET_TEST_DOUT4_7(dev, dphy)		\
+			(kmb_read_mipi(dev, DPHY_TEST_DOUT4_7) \
+			>> (((dphy) % 4) * 8) & 0xff)
+#define DPHY_TEST_DOUT8_9			(0x170)
+#define DPHY_TEST_DIN4_7			(0x160)
+#define DPHY_TEST_DIN8_9			(0x164)
+#define DPHY_PLL_LOCK				(0x188)
+#define   GET_PLL_LOCK(dev, dphy)		\
+			(kmb_read_mipi(dev, DPHY_PLL_LOCK) \
+			& (1 << ((dphy) - MIPI_DPHY6)))
+#define DPHY_CFG_CLK_EN				(0x18c)
+
+#define MSS_MIPI_CIF_CFG			(0x00)
+#define MSS_LCD_MIPI_CFG			(0x04)
+#define MSS_CAM_CLK_CTRL			(0x10)
+#define MSS_LOOPBACK_CFG			(0x0C)
+#define   LCD					BIT(1)
+#define   MIPI_COMMON				BIT(2)
+#define   MIPI_TX0				BIT(9)
+#define MSS_CAM_RSTN_CTRL			(0x14)
+#define MSS_CAM_RSTN_SET			(0x20)
+#define MSS_CAM_RSTN_CLR			(0x24)
+
+#define MSSCPU_CPR_CLK_EN			(0x0)
+#define MSSCPU_CPR_RST_EN			(0x10)
+#define BIT_MASK_16				(0xffff)
+/*icam lcd qos */
+#define LCD_QOS_PRIORITY			(0x8)
+#define LCD_QOS_MODE				(0xC)
+#define LCD_QOS_BW				(0x10)
+#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#2 lore raw

PATCH v7 2/4 drm/kmb: Add support for KeemBay Display

In reply to Anitha Chrisanthus

This is a basic KMS atomic modesetting display driver for KeemBay family of SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.(Sam)

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam) use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state (Sam)

---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676 ++++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480 ++++++++++++++++++++++++++++
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
drivers/gpu/drm/kmb/kmb_crtc.c new file +224 -0
new file mode 100644
index 0000000..a684331
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+	u32 vfront_porch;
+	u32 vback_porch;
+	u32 vsync_len;
+	u32 hfront_porch;
+	u32 hback_porch;
+	u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Set which interval to generate vertical interrupt */
+	kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+		      LCD_VSTATUS_COMPARE_VSYNC);
+	/* Enable vertical interrupt */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+	return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Disable vertical interrupt */
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+	.destroy = drm_crtc_cleanup,
+	.set_config = drm_atomic_helper_set_config,
+	.page_flip = drm_atomic_helper_page_flip,
+	.reset = drm_atomic_helper_crtc_reset,
+	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
+	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+	.enable_vblank = kmb_crtc_enable_vblank,
+	.disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_display_mode *m = &crtc->state->adjusted_mode;
+	struct kmb_crtc_timing vm;
+	int vsync_start_offset;
+	int vsync_end_offset;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+	unsigned int val = 0;
+
+	/* Initialize mipi */
+	kmb_dsi_hw_init(dev, m);
+	drm_info(dev,
+		 "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d hsync_len=%d\n",
+		 m->crtc_vsync_start - m->crtc_vdisplay,
+		 m->crtc_vtotal - m->crtc_vsync_end,
+		 m->crtc_vsync_end - m->crtc_vsync_start,
+		 m->crtc_hsync_start - m->crtc_hdisplay,
+		 m->crtc_htotal - m->crtc_hsync_end,
+		 m->crtc_hsync_end - m->crtc_hsync_start);
+	val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+	vm.vfront_porch = 2;
+	vm.vback_porch = 2;
+	vm.vsync_len = 8;
+	vm.hfront_porch = 0;
+	vm.hback_porch = 0;
+	vm.hsync_len = 28;
+
+	vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+	vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+	drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",
+		__func__, __LINE__,
+			m->crtc_vdisplay, vm.vback_porch, vm.vfront_porch,
+			vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+			vm.hfront_porch, vm.hsync_len);
+	kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+		      m->crtc_vdisplay - 1);
+	kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+	kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+	kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+	kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+		      m->crtc_hdisplay - 1);
+	kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+	kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+	kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+	/* This is hardcoded as 0 in the Myriadx code */
+	kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+	kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+	/* Back ground color */
+	kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+	if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+		kmb_write_lcd(kmb,
+			      LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+		kmb_write_lcd(kmb,
+			      LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+		kmb_write_lcd(kmb,
+			      LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+		kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+			      m->crtc_vdisplay - 1);
+		/* This is hardcoded as 10 in the Myriadx code */
+		kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+		kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+	}
+	kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+				   struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	clk_prepare_enable(lcd->clk);
+	kmb_crtc_set_mode(crtc);
+	drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+				    struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	/* due to hw limitations, planes need to be off when crtc is off */
+	drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+	drm_crtc_vblank_off(crtc);
+	clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+
+	spin_lock_irq(&crtc->dev->event_lock);
+	if (crtc->state->event)
+		drm_crtc_send_vblank_event(crtc, crtc->state->event);
+	crtc->state->event = NULL;
+	spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {
+	.atomic_begin = kmb_crtc_atomic_begin,
+	.atomic_enable = kmb_crtc_atomic_enable,
+	.atomic_disable = kmb_crtc_atomic_disable,
+	.atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *primary;
+	int ret;
+
+	primary = kmb_plane_init(drm);
+	if (IS_ERR(primary))
+		return PTR_ERR(primary);
+
+	ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary->base_plane,
+					NULL, &kmb_crtc_funcs, NULL);
+	if (ret) {
+		kmb_plane_destroy(&primary->base_plane);
+		return ret;
+	}
+
+	drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+	return 0;
+}
drivers/gpu/drm/kmb/kmb_drv.c new file +676 -0

676 lines not on this page · raw message

drivers/gpu/drm/kmb/kmb_drv.h new file +170 -0

170 lines not on this page · raw message

drivers/gpu/drm/kmb/kmb_plane.c new file +480 -0

480 lines not on this page · raw message

drivers/gpu/drm/kmb/kmb_plane.h new file +110 -0

110 lines not on this page · raw message

Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 34 lines · Anitha Chrisanthus

This is a basic KMS atomic modesetting display driver for KeemBay family of SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.(Sam)

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam) use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state (Sam)

Quoted 3 lines

Sam asked me to take a look at this too, looks reasonable overall. I've spotted a few small things plus a potential functional issue around vblank/event handling. I strongly recommend running the igt test suite over the driver to see whether it all works reasonably ok. See below for details.

Quoted 202 lines
---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676 ++++++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480 ++++++++++++++++++++++++++++
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
drivers/gpu/drm/kmb/kmb_crtc.c new file +183 -0
new file mode 100644
index 0000000..a684331
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+	u32 vfront_porch;
+	u32 vback_porch;
+	u32 vsync_len;
+	u32 hfront_porch;
+	u32 hback_porch;
+	u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Set which interval to generate vertical interrupt */
+	kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+		      LCD_VSTATUS_COMPARE_VSYNC);
+	/* Enable vertical interrupt */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+	return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Disable vertical interrupt */
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+	.destroy = drm_crtc_cleanup,
+	.set_config = drm_atomic_helper_set_config,
+	.page_flip = drm_atomic_helper_page_flip,
+	.reset = drm_atomic_helper_crtc_reset,
+	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
+	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+	.enable_vblank = kmb_crtc_enable_vblank,
+	.disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_display_mode *m = &crtc->state->adjusted_mode;
+	struct kmb_crtc_timing vm;
+	int vsync_start_offset;
+	int vsync_end_offset;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+	unsigned int val = 0;
+
+	/* Initialize mipi */
+	kmb_dsi_hw_init(dev, m);
+	drm_info(dev,
+		 "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d hsync_len=%d\n",
+		 m->crtc_vsync_start - m->crtc_vdisplay,
+		 m->crtc_vtotal - m->crtc_vsync_end,
+		 m->crtc_vsync_end - m->crtc_vsync_start,
+		 m->crtc_hsync_start - m->crtc_hdisplay,
+		 m->crtc_htotal - m->crtc_hsync_end,
+		 m->crtc_hsync_end - m->crtc_hsync_start);
+	val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+	vm.vfront_porch = 2;
+	vm.vback_porch = 2;
+	vm.vsync_len = 8;
+	vm.hfront_porch = 0;
+	vm.hback_porch = 0;
+	vm.hsync_len = 28;
+
+	vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+	vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+	drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",
+		__func__, __LINE__,
+			m->crtc_vdisplay, vm.vback_porch, vm.vfront_porch,
+			vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+			vm.hfront_porch, vm.hsync_len);
+	kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+		      m->crtc_vdisplay - 1);
+	kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+	kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+	kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+	kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+		      m->crtc_hdisplay - 1);
+	kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+	kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+	kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+	/* This is hardcoded as 0 in the Myriadx code */
+	kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+	kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+	/* Back ground color */
+	kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+	if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+		kmb_write_lcd(kmb,
+			      LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+		kmb_write_lcd(kmb,
+			      LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+		kmb_write_lcd(kmb,
+			      LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+		kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+			      m->crtc_vdisplay - 1);
+		/* This is hardcoded as 10 in the Myriadx code */
+		kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+		kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+	}
+	kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+				   struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	clk_prepare_enable(lcd->clk);
+	kmb_crtc_set_mode(crtc);
+	drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+				    struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	/* due to hw limitations, planes need to be off when crtc is off */
+	drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+	drm_crtc_vblank_off(crtc);
+	clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)

drivers/gpu/drm/kmb/kmb_crtc.c line 193

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+
+	spin_lock_irq(&crtc->dev->event_lock);
+	if (crtc->state->event)
+		drm_crtc_send_vblank_event(crtc, crtc->state->event);

Uh, you have vblank event support, but you immediately send out the vblank event. That breaks userspace assumptions. You probably want to use drm_crtc_arm_vblank_event here. Also there's tons of races that can possibly happen, so please read the kerneldoc comment for that function carefully - you probably need to validate that the vblank event arming, vblank process and re-enabling of LCD_INT_ENABLE cannot race against each another in bad ways.

Also we have igt testcases for this, so please run them:

https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#validating-changes-with-igt

Quoted 321 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +31 -0
+	crtc->state->event = NULL;
+	spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {
+	.atomic_begin = kmb_crtc_atomic_begin,
+	.atomic_enable = kmb_crtc_atomic_enable,
+	.atomic_disable = kmb_crtc_atomic_disable,
+	.atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *primary;
+	int ret;
+
+	primary = kmb_plane_init(drm);
+	if (IS_ERR(primary))
+		return PTR_ERR(primary);
+
+	ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary->base_plane,
+					NULL, &kmb_crtc_funcs, NULL);
+	if (ret) {
+		kmb_plane_destroy(&primary->base_plane);
+		return ret;
+	}
+
+	drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+	return 0;
+}
drivers/gpu/drm/kmb/kmb_drv.c new file +284 -0
new file mode 100644
index 0000000..e413099
@@ -0,0 +1,676 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/console.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
+
+#include <drm/drm.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_regs.h"
+
+int kmb_under_flow = 0, kmb_flush_done = 0, layer_no = 0;
+static struct kmb_clock kmb_clk;
+
+static struct drm_bridge *adv_bridge;
+
+int kmb_display_clk_enable(struct kmb_drm_private *kmb)
+{
+	int ret = 0;
+
+	ret = clk_prepare_enable(kmb_clk.clk_lcd);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_ecfg);
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_ECFG clock: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_cfg);
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_CFG clock: %d\n", ret);
+		return ret;
+	}
+	DRM_INFO("SUCCESS : enabled LCD MIPI clocks\n");
+	return 0;
+}
+
+int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct device *dev)
+{
+	struct device_node *vpu_dev;
+	unsigned long clk;
+	int ret = 0;
+
+	kmb_clk.clk_lcd = clk_get(dev, "clk_lcd");
+	if (IS_ERR(kmb_clk.clk_lcd)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_lcd\n");
+		return PTR_ERR(kmb_clk.clk_lcd);
+	}
+
+	kmb_clk.clk_mipi = clk_get(dev, "clk_mipi");
+	if (IS_ERR(kmb_clk.clk_mipi)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi\n");
+		return PTR_ERR(kmb_clk.clk_mipi);
+	}
+
+	kmb_clk.clk_mipi_ecfg = clk_get(dev, "clk_mipi_ecfg");
+	if (IS_ERR(kmb_clk.clk_mipi_ecfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_ecfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_ecfg);
+	}
+
+	kmb_clk.clk_mipi_cfg = clk_get(dev, "clk_mipi_cfg");
+	if (IS_ERR(kmb_clk.clk_mipi_cfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_cfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_cfg);
+	}
+	vpu_dev = of_find_node_by_path("/soc/vpu-ipc");
+	kmb_clk.clk_pll0 = of_clk_get_by_name(vpu_dev, "pll_0_out_0");
+	if (IS_ERR(kmb_clk.clk_pll0)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_pll0 ");
+		return PTR_ERR(kmb_clk.clk_pll0);
+	}
+	kmb->sys_clk_mhz = clk_get_rate(kmb_clk.clk_pll0) / 1000000;
+	drm_info(&kmb->drm, "system clk = %d Mhz", kmb->sys_clk_mhz);
+
+	/* Set LCD clock to 200 Mhz */
+	clk_set_rate(kmb_clk.clk_lcd, KMB_LCD_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_lcd) != KMB_LCD_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_lcd to %d\n",
+			KMB_LCD_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_lcd = %ld\n", clk_get_rate(kmb_clk.clk_lcd));
+
+	/* Set MIPI clock to 24 Mhz */
+	clk_set_rate(kmb_clk.clk_mipi, KMB_MIPI_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_mipi) != KMB_MIPI_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_mipi to %d\n",
+			KMB_MIPI_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_mipi = %ld\n", clk_get_rate(kmb_clk.clk_mipi));
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_ECFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_ecfg, KMB_MIPI_DEFAULT_CFG_CLK);
+		clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set to clk_mipi_ecfg to %d\n",
+				 KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_CFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_cfg, 24000000);
+		clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set clk_mipi_cfg to %d\n",
+				  KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	ret = kmb_display_clk_enable(kmb);
+	if (ret)
+		return ret;
+
+	/* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_CLK_CTRL, 0x1fff);
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_RSTN_CTRL, 0xffffffff);
+	return 0;
+}
+
+static int kmb_display_clk_disable(void)
+{
+	if (kmb_clk.clk_lcd)
+		clk_disable_unprepare(kmb_clk.clk_lcd);
+	if (kmb_clk.clk_mipi)
+		clk_disable_unprepare(kmb_clk.clk_mipi);
+	if (kmb_clk.clk_mipi_ecfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_ecfg);
+	if (kmb_clk.clk_mipi_cfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_cfg);
+	return 0;
+}
+
+static void __iomem *kmb_map_mmio(struct drm_device *drm, char *name)
+{
+	struct resource *res;
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	void __iomem *mem;
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
+	if (!res) {
+		drm_err(drm, "failed to get resource for %s", name);
+		return ERR_PTR(-ENOMEM);
+	}
+	mem = devm_ioremap_resource(drm->dev, res);
+	if (IS_ERR(mem))
+		drm_err(drm, "failed to ioremap %s registers", name);
+	return mem;
+}
+
+static int kmb_hw_init(struct drm_device *drm, unsigned long flags)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	int irq_lcd;
+	int ret = 0;
+
+	/* Map LCD MMIO registers */
+	kmb->lcd_mmio = kmb_map_mmio(drm, "lcd_regs");
+	if (IS_ERR(kmb->lcd_mmio)) {
+		drm_err(&kmb->drm, "failed to map LCD registers\n");
+		return -ENOMEM;
+	}
+
+	/* Map MIPI MMIO registers */
+	kmb->mipi_mmio = kmb_map_mmio(drm, "mipi_regs");
+	if (IS_ERR(kmb->mipi_mmio)) {
+		drm_err(&kmb->drm, "failed to map MIPI registers\n");
+		iounmap(kmb->lcd_mmio);
+		return -ENOMEM;
+	}
+
+	/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and
+	 * MSS_CAM_CLK_CTRL register
+	 */
+	kmb->msscam_mmio = kmb_map_mmio(drm, "msscam_regs");
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM registers\n");
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM registers\n");
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+	/* Enable display clocks */
+	kmb_initialize_clocks(kmb, &pdev->dev);
+
+	/* Register irqs here - section 17.3 in databook
+	 * lists LCD at 79 and 82 for MIPI under MSS CPU -
+	 * firmware has redirected 79 to A53 IRQ 33
+	 */
+
+	/* Allocate LCD interrupt resources */
+	irq_lcd = platform_get_irq_byname(pdev, "irq_lcd");
+	if (irq_lcd < 0) {
+		drm_err(&kmb->drm, "irq_lcd not found");
+		goto setup_fail;
+	}
+
+	/* Get the optional framebuffer memory resource */
+	ret = of_reserved_mem_device_init(drm->dev);
+	if (ret && ret != -ENODEV)
+		return ret;
+
+	spin_lock_init(&kmb->irq_lock);
+
+	kmb->irq_lcd = irq_lcd;
+
+	return 0;
+
+ setup_fail:
+	of_reserved_mem_device_release(drm->dev);
+
+	return ret;
+}
+
+static const struct drm_mode_config_funcs kmb_mode_config_funcs = {
+	.fb_create = drm_gem_fb_create,
+	.atomic_check = drm_atomic_helper_check,
+	.atomic_commit = drm_atomic_helper_commit,
+};
+
+static int kmb_setup_mode_config(struct drm_device *drm)
+{
+	int ret;
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	ret = drmm_mode_config_init(drm);
+	if (ret)
+		return ret;
+	drm->mode_config.min_width = KMB_MIN_WIDTH;
+	drm->mode_config.min_height = KMB_MIN_HEIGHT;
+	drm->mode_config.max_width = KMB_MAX_WIDTH;
+	drm->mode_config.max_height = KMB_MAX_HEIGHT;

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	drm->mode_config.funcs = &kmb_mode_config_funcs;
+
+	ret = kmb_setup_crtc(drm);
+	if (ret < 0) {
+		drm_err(drm, "failed to create crtc\n");
+		return ret;
+	}
+
+	/* Initialize MIPI DSI */
+	ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 83 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +83 -0
+	if (ret) {
+		drm_err(drm, "failed to initialize DSI\n");
+		return ret;
+	}
+
+	/* Set the CRTC's port so that the encoder component can find it */
+	kmb->crtc.port = of_graph_get_port_by_id(drm->dev->of_node, 0);
+	ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+	if (ret < 0) {
+		drm_err(drm, "failed to initialize vblank\n");
+		pm_runtime_disable(drm->dev);
+		return ret;
+	}
+
+	drm_mode_config_reset(drm);
+	return 0;
+}
+
+static irqreturn_t handle_lcd_irq(struct drm_device *dev)
+{
+	unsigned long status, val, val1;
+	int plane_id, dma0_state, dma1_state;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	status = kmb_read_lcd(kmb, LCD_INT_STATUS);
+
+	if (status & LCD_INT_EOF) {
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF);
+
+		/* When disabling/enabling LCD layers, the change takes effect
+		 * immediately and does not wait for EOF (end of frame).
+		 * When kmb_plane_atomic_disable is called, mark the plane as
+		 * disabled but actually disable the plane when EOF irq is
+		 * being handled.
+		 */
+		for (plane_id = LAYER_0;
+				plane_id < KMB_MAX_PLANES; plane_id++) {
+			if (kmb->plane_status[plane_id].disable) {
+				kmb_clr_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (plane_id),
+						    LCD_DMA_LAYER_ENABLE);
+
+				kmb_clr_bitmask_lcd(kmb, LCD_CONTROL,
+						    kmb->plane_status[plane_id].ctrl);
+
+				kmb->plane_status[plane_id].disable = false;
+			}
+		}
+		if (kmb_under_flow) {
+			/* DMA Recovery after underflow */
+			dma0_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA0_STATE : LCD_VIDEO1_DMA0_STATE;
+			dma1_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA1_STATE : LCD_VIDEO1_DMA1_STATE;
+
+			do {
+				kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+				val = kmb_read_lcd(kmb, dma0_state)
+				    & LCD_DMA_STATE_ACTIVE;
+				val1 = kmb_read_lcd(kmb, dma1_state)
+				    & LCD_DMA_STATE_ACTIVE;
+			} while ((val || val1));
+			/* disable dma */
+			kmb_clr_bitmask_lcd(kmb, LCD_LAYERn_DMA_CFG(layer_no),
+					    LCD_DMA_LAYER_ENABLE);
+			kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+			kmb_flush_done = 1;
+			kmb_under_flow = 0;
+		}
+	}
+
+	if (status & LCD_INT_LINE_CMP) {
+		/* clear line compare interrupt */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LINE_CMP);
+	}
+
+	if (status & LCD_INT_VERT_COMP) {
+		/* Read VSTATUS */
+		val = kmb_read_lcd(kmb, LCD_VSTATUS);
+		val = (val & LCD_VSTATUS_VERTICAL_STATUS_MASK);
+		switch (val) {
+		case LCD_VSTATUS_COMPARE_VSYNC:

drivers/gpu/drm/kmb/kmb_drv.c line 387

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+			/* Clear vertical compare interrupt */
+			kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+			if (kmb_flush_done) {
+				kmb_set_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (layer_no),
+						    LCD_DMA_LAYER_ENABLE);
+				kmb_flush_done = 0;
+			}
+			drm_handle_vblank(dev, 0);

Would be nice to use the new-style drm_crtc_handle_vblank here.

Quoted 1,048 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +289 -0
+			break;
+		case LCD_VSTATUS_COMPARE_BACKPORCH:
+		case LCD_VSTATUS_COMPARE_ACTIVE:
+		case LCD_VSTATUS_COMPARE_FRONT_PORCH:
+			kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+			break;
+		}
+	}
+	if (status & LCD_INT_DMA_ERR) {
+		val =
+		    (status & LCD_INT_DMA_ERR &
+		     kmb_read_lcd(kmb, LCD_INT_ENABLE));
+		/* LAYER0 - VL0 */
+		if (val & (LAYER0_DMA_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER0:VL0 DMA UNDERFLOW val = 0x%lx,under_flow=%d",
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER0_DMA_FIFO_UNDERFLOW |
+					    LAYER0_DMA_CB_FIFO_UNDERFLOW |
+					    LAYER0_DMA_CR_FIFO_UNDERFLOW);
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+					    LAYER0_DMA_CB_FIFO_UNDERFLOW |
+					    LAYER0_DMA_FIFO_UNDERFLOW |
+					    LAYER0_DMA_CR_FIFO_UNDERFLOW);
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb, LCD_LAYERn_DMA_CFG(0),
+					    LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);
+			layer_no = 0;
+		}
+
+		if (val & LAYER0_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA OVERFLOW val = 0x%lx", val);
+		if (val & LAYER0_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CB OVERFLOW val = 0x%lx", val);
+		if (val & LAYER0_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CR OVERFLOW val = 0x%lx", val);
+
+		/* LAYER1 - VL1 */
+		if (val & (LAYER1_DMA_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER1:VL1 DMA UNDERFLOW val = 0x%lx, under_flow=%d",
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER1_DMA_FIFO_UNDERFLOW |
+					    LAYER1_DMA_CB_FIFO_UNDERFLOW |
+					    LAYER1_DMA_CR_FIFO_UNDERFLOW);
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+					    LAYER1_DMA_CB_FIFO_UNDERFLOW |
+					    LAYER1_DMA_FIFO_UNDERFLOW |
+					    LAYER1_DMA_CR_FIFO_UNDERFLOW);
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb, LCD_LAYERn_DMA_CFG(1),
+					    LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);
+			layer_no = 1;
+		}
+
+		/* LAYER1 - VL1 */
+		if (val & LAYER1_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA OVERFLOW val = 0x%lx", val);
+		if (val & LAYER1_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CB OVERFLOW val = 0x%lx", val);
+		if (val & LAYER1_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CR OVERFLOW val = 0x%lx", val);
+
+		/* LAYER2 - GL0 */
+		if (val & LAYER2_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA UNDERFLOW val = 0x%lx", val);
+		if (val & LAYER2_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA OVERFLOW val = 0x%lx", val);
+
+		/* LAYER3 - GL1 */
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA UNDERFLOW val = 0x%lx", val);
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA OVERFLOW val = 0x%lx", val);
+	}
+
+	if (status & LCD_INT_LAYER) {
+		/* Clear layer interrupts */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LAYER);
+	}
+
+	/* Clear all interrupts */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, 1);
+	return IRQ_HANDLED;
+}
+
+/* IRQ handler */
+static irqreturn_t kmb_isr(int irq, void *arg)
+{
+	struct drm_device *dev = (struct drm_device *)arg;
+
+	handle_lcd_irq(dev);
+	return IRQ_HANDLED;
+}
+
+static void kmb_irq_reset(struct drm_device *drm)
+{
+	kmb_write_lcd(to_kmb(drm), LCD_INT_CLEAR, 0xFFFF);
+	kmb_write_lcd(to_kmb(drm), LCD_INT_ENABLE, 0);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(fops);
+
+static struct drm_driver kmb_driver = {
+	.driver_features = DRIVER_GEM |
+	    DRIVER_MODESET | DRIVER_ATOMIC,
+	.irq_handler = kmb_isr,
+	.irq_preinstall = kmb_irq_reset,
+	.irq_uninstall = kmb_irq_reset,
+	/* GEM Operations */
+	.fops = &fops,
+	DRM_GEM_CMA_DRIVER_OPS_VMAP,
+	.name = "kmb-drm",
+	.desc = "KEEMBAY DISPLAY DRIVER ",
+	.date = "20190122",
+	.major = 1,
+	.minor = 0,
+};
+
+static int kmb_remove(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	drm_dev_unregister(drm);
+	drm_kms_helper_poll_fini(drm);
+	of_node_put(kmb->crtc.port);
+	kmb->crtc.port = NULL;
+	pm_runtime_get_sync(drm->dev);
+	drm_irq_uninstall(drm);
+	pm_runtime_put_sync(drm->dev);
+	pm_runtime_disable(drm->dev);
+
+	of_reserved_mem_device_release(drm->dev);
+
+	/* Release clks */
+	kmb_display_clk_disable();
+	clk_put(kmb_clk.clk_lcd);
+	clk_put(kmb_clk.clk_mipi);
+
+	dev_set_drvdata(dev, NULL);
+
+	/* Unregister DSI host */
+	kmb_dsi_host_unregister();
+	return 0;
+}
+
+static int kmb_probe(struct platform_device *pdev)
+{
+	struct device *dev = get_device(&pdev->dev);
+	struct kmb_drm_private *kmb;
+	int ret = 0;
+
+	/* The bridge (ADV 7535) will return -EPROBE_DEFER until it
+	 * has a mipi_dsi_host to register its device to. So, we
+	 * first register the DSI host during probe time, and then return
+	 * -EPROBE_DEFER until the bridge is loaded. Probe will be called again
+	 *  and then the rest of the driver initialization can proceed
+	 *  afterwards and the bridge can be successfully attached.
+	 */
+	adv_bridge = kmb_dsi_host_bridge_init(dev);
+
+	if (adv_bridge == ERR_PTR(-EPROBE_DEFER)) {
+		return -EPROBE_DEFER;
+	} else if (IS_ERR(adv_bridge)) {
+		DRM_ERROR("probe failed to initialize DSI host bridge\n");
+		return PTR_ERR(adv_bridge);
+	}
+
+	/* Create DRM device */
+	kmb = devm_drm_dev_alloc(dev, &kmb_driver,
+				 struct kmb_drm_private, drm);
+	if (IS_ERR(kmb))
+		return PTR_ERR(kmb);
+
+	dev_set_drvdata(dev, &kmb->drm);
+
+	ret = kmb_hw_init(&kmb->drm, 0);
+	if (ret)
+		goto err_free1;
+
+	ret = kmb_setup_mode_config(&kmb->drm);
+	if (ret)
+		goto err_free;
+
+	ret = drm_irq_install(&kmb->drm, kmb->irq_lcd);
+	if (ret < 0) {
+		drm_err(&kmb->drm, "failed to install IRQ handler\n");
+		goto err_irq;
+	}
+
+	drm_kms_helper_poll_init(&kmb->drm);
+
+	/* Register graphics device with the kernel */
+	ret = drm_dev_register(&kmb->drm, 0);
+	if (ret)
+		goto err_register;
+
+	return 0;
+
+ err_register:
+	drm_kms_helper_poll_fini(&kmb->drm);
+ err_irq:
+	pm_runtime_disable(kmb->drm.dev);
+ err_free:
+	drm_crtc_cleanup(&kmb->crtc);
+	drm_mode_config_cleanup(&kmb->drm);
+ err_free1:
+	dev_set_drvdata(dev, NULL);
+	kmb_dsi_host_unregister();
+
+	return ret;
+}
+
+static const struct of_device_id kmb_of_match[] = {
+	{.compatible = "intel,kmb_display"},
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, kmb_of_match);
+
+static int __maybe_unused kmb_pm_suspend(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+	drm_kms_helper_poll_disable(drm);
+
+	kmb->state = drm_atomic_helper_suspend(drm);
+	if (IS_ERR(kmb->state)) {
+		drm_kms_helper_poll_enable(drm);
+		return PTR_ERR(kmb->state);
+	}
+
+	return 0;
+}
+
+static int __maybe_unused kmb_pm_resume(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+	if (!kmb)
+		return 0;
+
+	drm_atomic_helper_resume(drm, kmb->state);
+	drm_kms_helper_poll_enable(drm);
+
+	return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend, kmb_pm_resume);
+
+static struct platform_driver kmb_platform_driver = {
+	.probe = kmb_probe,
+	.remove = kmb_remove,
+	.driver = {
+		.name = "kmb-drm",
+		.pm = &kmb_pm_ops,
+		.of_match_table = kmb_of_match,
+	},
+};
+
+module_platform_driver(kmb_platform_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_DESCRIPTION("Keembay Display driver");
+MODULE_LICENSE("GPL v2");
drivers/gpu/drm/kmb/kmb_drv.h new file +170 -0
new file mode 100644
index 0000000..352f2d2
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_DRV_H__
+#define __KMB_DRV_H__
+
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+#define KMB_MAX_WIDTH			1920 /*max width in pixels */
+#define KMB_MAX_HEIGHT			1080 /*max height in pixels */
+#define KMB_MIN_WIDTH                   1920 /*max width in pixels */
+#define KMB_MIN_HEIGHT                  1080 /*max height in pixels */
+#define KMB_LCD_DEFAULT_CLK		200000000
+#define KMB_MIPI_DEFAULT_CLK		24000000
+#define KMB_MIPI_DEFAULT_CFG_CLK	24000000
+#define KMB_SYS_CLK_MHZ			500
+
+#define ICAM_MMIO		0x3b100000
+#define ICAM_LCD_OFFSET		0x1080
+#define ICAM_MMIO_SIZE		0x2000
+
+struct kmb_drm_private {
+	struct drm_device		drm;
+	void __iomem			*lcd_mmio;
+	void __iomem			*mipi_mmio;
+	void __iomem			*msscam_mmio;
+	struct clk			*clk;
+	struct drm_crtc			crtc;
+	struct kmb_plane		*plane;
+	struct drm_atomic_state		*state;
+	spinlock_t			irq_lock;
+	int				irq_lcd;
+	int				irq_mipi;
+	int				sys_clk_mhz;
+	dma_addr_t			fb_addr;
+	struct layer_status		plane_status[KMB_MAX_PLANES];
+};
+
+struct kmb_clock {
+	struct clk *clk_lcd;
+	struct clk *clk_mipi;
+	struct clk *clk_mipi_ecfg;
+	struct clk *clk_mipi_cfg;
+	struct clk *clk_pll0;
+};
+
+static inline struct kmb_drm_private *to_kmb(const struct drm_device *dev)
+{
+	return container_of(dev, struct kmb_drm_private, drm);
+}
+
+static inline struct kmb_drm_private *crtc_to_kmb_priv(const struct drm_crtc *x)
+{
+	return container_of(x, struct kmb_drm_private, crtc);
+}
+
+struct blt_layer_config {
+	unsigned char layer_format;
+};
+
+static inline void kmb_write_lcd(struct kmb_drm_private *dev_p,
+				 unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->lcd_mmio + reg));
+}
+
+static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
+				  unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->mipi_mmio + reg));
+}
+
+static inline void kmb_write_msscam(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->msscam_mmio + reg));
+}
+
+static inline u32 kmb_read_msscam(struct kmb_drm_private *dev_p,
+				  unsigned int reg)
+{
+	return readl(dev_p->msscam_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_msscam(struct kmb_drm_private *dev_p,
+					  unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_msscam(dev_p, reg);
+
+	kmb_write_msscam(dev_p, reg, (reg_val | mask));
+}
+
+static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p, unsigned int reg)
+{
+	return readl(dev_p->lcd_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_lcd(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_lcd(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val & (~mask)));
+}
+
+static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p, unsigned int reg)
+{
+	return readl(dev_p->mipi_mmio + reg);
+}
+
+static inline void kmb_write_bits_mipi(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 offset,
+				       u32 num_bits, u32 value)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+	u32 mask = (1 << num_bits) - 1;
+
+	value &= mask;
+	mask <<= offset;
+	reg_val &= (~mask);
+	reg_val |= (value << offset);
+	kmb_write_mipi(dev_p, reg, reg_val);
+}
+
+static inline void kmb_set_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val | (1 << offset));
+}
+
+static inline void kmb_clr_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val & (~(1 << offset)));
+}
+
+static inline void kmb_set_bitmask_mipi(struct kmb_drm_private *dev_p,
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private *dev_p,
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val & (~mask)));
+}
+
+int kmb_setup_crtc(struct drm_device *dev);
+void kmb_set_scanout(struct kmb_drm_private *lcd);
+#endif /* __KMB_DRV_H__ */
drivers/gpu/drm/kmb/kmb_plane.c new file +480 -0
new file mode 100644
index 0000000..d1e7786
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_plane_helper.h>
+
+#include "kmb_drv.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+const u32 layer_irqs[] = {
+	LCD_INT_VL0,
+	LCD_INT_VL1,
+	LCD_INT_GL0,
+	LCD_INT_GL1
+};
+
+static unsigned int check_pixel_format(struct drm_plane *plane, u32 format)
+{
+	int i;
+
+	for (i = 0; i < plane->format_count; i++) {
+		if (plane->format_types[i] == format)
+			return 0;
+	}
+	return -EINVAL;
+}
+
+static int kmb_plane_atomic_check(struct drm_plane *plane,
+				  struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	int ret;
+	struct drm_crtc_state *crtc_state;
+	bool can_position;
+
+	fb = state->fb;
+	if (!fb || !state->crtc)
+		return 0;
+
+	ret = check_pixel_format(plane, fb->format->format);
+	if (ret)
+		return ret;
+
+	if (state->crtc_w > KMB_MAX_WIDTH || state->crtc_h > KMB_MAX_HEIGHT)
+		return -EINVAL;
+	if (state->crtc_w < KMB_MIN_WIDTH || state->crtc_h < KMB_MIN_HEIGHT)
+		return -EINVAL;
+	can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
+	crtc_state =
+		drm_atomic_get_existing_crtc_state(state->state, state->crtc);
+	return drm_atomic_helper_check_plane_state(state, crtc_state,
+						 DRM_PLANE_HELPER_NO_SCALING,
+						 DRM_PLANE_HELPER_NO_SCALING,
+						 can_position, true);
+}
+
+static void kmb_plane_atomic_disable(struct drm_plane *plane,
+				     struct drm_plane_state *state)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+	int plane_id = kmb_plane->id;
+	struct kmb_drm_private *kmb;
+
+	kmb = to_kmb(plane->dev);
+
+	switch (plane_id) {
+	case LAYER_0:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	kmb->plane_status[plane_id].disable = true;
+}
+
+unsigned int get_pixel_format(u32 format)
+{
+	unsigned int val = 0;
+
+	switch (format) {
+		/* planar formats */
+	case DRM_FORMAT_YUV444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN | LCD_LAYER_PLANAR_STORAGE;
+		break;
+	case DRM_FORMAT_YVU444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN | LCD_LAYER_PLANAR_STORAGE
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN | LCD_LAYER_PLANAR_STORAGE;
+		break;
+	case DRM_FORMAT_YVU422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN | LCD_LAYER_PLANAR_STORAGE
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN | LCD_LAYER_PLANAR_STORAGE;
+		break;
+	case DRM_FORMAT_YVU420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN | LCD_LAYER_PLANAR_STORAGE
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_NV12:
+		val = LCD_LAYER_FORMAT_NV12 | LCD_LAYER_PLANAR_STORAGE;
+		break;
+	case DRM_FORMAT_NV21:
+		val = LCD_LAYER_FORMAT_NV12 | LCD_LAYER_PLANAR_STORAGE
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+		/* packed formats */
+		/* looks hw requires B & G to be swapped when RGB */
+	case DRM_FORMAT_RGB332:
+		val = LCD_LAYER_FORMAT_RGB332 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_XBGR4444:
+		val = LCD_LAYER_FORMAT_RGBX4444;
+		break;
+	case DRM_FORMAT_ARGB4444:
+		val = LCD_LAYER_FORMAT_RGBA4444 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_ABGR4444:
+		val = LCD_LAYER_FORMAT_RGBA4444;
+		break;
+	case DRM_FORMAT_XRGB1555:
+		val = LCD_LAYER_FORMAT_XRGB1555 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_XBGR1555:
+		val = LCD_LAYER_FORMAT_XRGB1555;
+		break;
+	case DRM_FORMAT_ARGB1555:
+		val = LCD_LAYER_FORMAT_RGBA1555 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_ABGR1555:
+		val = LCD_LAYER_FORMAT_RGBA1555;
+		break;
+	case DRM_FORMAT_RGB565:
+		val = LCD_LAYER_FORMAT_RGB565 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_BGR565:
+		val = LCD_LAYER_FORMAT_RGB565;
+		break;
+	case DRM_FORMAT_RGB888:
+		val = LCD_LAYER_FORMAT_RGB888 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_BGR888:
+		val = LCD_LAYER_FORMAT_RGB888;
+		break;
+	case DRM_FORMAT_XRGB8888:
+		val = LCD_LAYER_FORMAT_RGBX8888 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_XBGR8888:
+		val = LCD_LAYER_FORMAT_RGBX8888;
+		break;
+	case DRM_FORMAT_ARGB8888:
+		val = LCD_LAYER_FORMAT_RGBA8888 | LCD_LAYER_BGR_ORDER;
+		break;
+	case DRM_FORMAT_ABGR8888:
+		val = LCD_LAYER_FORMAT_RGBA8888;
+		break;
+	}
+	DRM_INFO_ONCE("%s : %d format=0x%x val=0x%x\n",
+		      __func__, __LINE__, format, val);
+	return val;
+}
+
+unsigned int get_bits_per_pixel(const struct drm_format_info *format)
+{
+	u32 bpp = 0;
+	unsigned int val = 0;
+
+	if (format->num_planes > 1) {
+		val = LCD_LAYER_8BPP;
+		return val;
+	}
+
+	bpp += 8 * format->cpp[0];
+
+	switch (bpp) {
+	case 8:
+		val = LCD_LAYER_8BPP;
+		break;
+	case 16:
+		val = LCD_LAYER_16BPP;
+		break;
+	case 24:
+		val = LCD_LAYER_24BPP;
+		break;
+	case 32:
+		val = LCD_LAYER_32BPP;
+		break;
+	}
+
+	DRM_DEBUG("bpp=%d val=0x%x\n", bpp, val);
+	return val;
+}
+
+static void config_csc(struct kmb_drm_private *kmb, int plane_id)
+{
+	/* YUV to RGB conversion using the fixed matrix csc_coef_lcd */
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id), csc_coef_lcd[0]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id), csc_coef_lcd[1]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id), csc_coef_lcd[2]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id), csc_coef_lcd[3]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id), csc_coef_lcd[4]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id), csc_coef_lcd[5]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id), csc_coef_lcd[6]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id), csc_coef_lcd[7]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id), csc_coef_lcd[8]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id), csc_coef_lcd[9]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id), csc_coef_lcd[10]);
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id), csc_coef_lcd[11]);
+}
+
+static void kmb_plane_atomic_update(struct drm_plane *plane,
+				    struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	struct kmb_drm_private *kmb;
+	unsigned int width;
+	unsigned int height;
+	unsigned int dma_len;
+	struct kmb_plane *kmb_plane;
+	unsigned int dma_cfg;
+	unsigned int ctrl = 0, val = 0, out_format = 0;
+	unsigned int src_w, src_h, crtc_x, crtc_y;
+	unsigned char plane_id;
+	int num_planes;
+	static dma_addr_t addr[MAX_SUB_PLANES];
+
+	if (!plane || !plane->state || !state)
+		return;
+
+	fb = plane->state->fb;
+	if (!fb)
+		return;
+	num_planes = fb->format->num_planes;
+	kmb_plane = to_kmb_plane(plane);
+	plane_id = kmb_plane->id;
+
+	kmb = to_kmb(plane->dev);
+
+	if (kmb_under_flow || kmb_flush_done) {
+		drm_dbg(&kmb->drm, "plane_update:underflow!!!! returning");
+		return;
+	}
+
+	src_w = (plane->state->src_w >> 16);
+	src_h = plane->state->src_h >> 16;
+	crtc_x = plane->state->crtc_x;
+	crtc_y = plane->state->crtc_y;
+
+	drm_dbg(&kmb->drm,
+		"src_w=%d src_h=%d, fb->format->format=0x%x fb->flags=0x%x\n",
+		  src_w, src_h, fb->format->format, fb->flags);
+
+	width = fb->width;
+	height = fb->height;
+	dma_len = (width * height * fb->format->cpp[0]);
+	drm_dbg(&kmb->drm, "dma_len=%d ", dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id), dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
+		      fb->pitches[0]);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
+		      (width * fb->format->cpp[0]));
+
+	addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
+	kmb->fb_addr = addr[Y_PLANE];
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
+		      addr[Y_PLANE] + fb->offsets[0]);
+	val = get_pixel_format(fb->format->format);
+	val |= get_bits_per_pixel(fb->format);
+	/* Program Cb/Cr for planar formats */
+	if (num_planes > 1) {
+		kmb_write_lcd(kmb, LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),
+			      width * fb->format->cpp[0]);
+		kmb_write_lcd(kmb, LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),
+			      (width * fb->format->cpp[0]));
+
+		addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state,
+							U_PLANE);
+		/* check if Cb/Cr is swapped*/
+		if (num_planes == 3 && (val & LCD_LAYER_CRCB_ORDER))
+			kmb_write_lcd(kmb,
+				      LCD_LAYERn_DMA_START_CR_ADR(plane_id),
+					addr[U_PLANE]);
+		else
+			kmb_write_lcd(kmb,
+				      LCD_LAYERn_DMA_START_CB_ADR(plane_id),
+					addr[U_PLANE]);
+
+		if (num_planes == 3) {
+			kmb_write_lcd(kmb,
+				      LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),
+				      ((width) * fb->format->cpp[0]));
+
+			kmb_write_lcd(kmb,
+				      LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),
+				      ((width) * fb->format->cpp[0]));
+
+			addr[V_PLANE] = drm_fb_cma_get_gem_addr(fb,
+								plane->state,
+								V_PLANE);
+
+			/* check if Cb/Cr is swapped*/
+			if (val & LCD_LAYER_CRCB_ORDER)
+				kmb_write_lcd(kmb,
+					      LCD_LAYERn_DMA_START_CB_ADR(plane_id),
+					      addr[V_PLANE]);
+			else
+				kmb_write_lcd(kmb,
+					      LCD_LAYERn_DMA_START_CR_ADR(plane_id),
+					      addr[V_PLANE]);
+		}
+	}
+
+	kmb_write_lcd(kmb, LCD_LAYERn_WIDTH(plane_id), src_w - 1);
+	kmb_write_lcd(kmb, LCD_LAYERn_HEIGHT(plane_id), src_h - 1);
+	kmb_write_lcd(kmb, LCD_LAYERn_COL_START(plane_id), crtc_x);
+	kmb_write_lcd(kmb, LCD_LAYERn_ROW_START(plane_id), crtc_y);
+
+	val |= LCD_LAYER_FIFO_100;
+
+	if (val & LCD_LAYER_PLANAR_STORAGE) {
+		val |= LCD_LAYER_CSC_EN;
+
+		/* Enable CSC if input is planar and output is RGB */
+		config_csc(kmb, plane_id);
+	}
+
+	kmb_write_lcd(kmb, LCD_LAYERn_CFG(plane_id), val);
+
+	switch (plane_id) {
+	case LAYER_0:
+		ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE
+	    | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED;
+
+	/* LCD is connected to MIPI on kmb
+	 * Therefore this bit is required for DSI Tx
+	 */
+	ctrl |= LCD_CTRL_VHSYNC_IDLE_LVL;
+
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, ctrl);
+
+	/* FIXME no doc on how to set output format,these values are
+	 * taken from the Myriadx tests
+	 */
+	out_format |= LCD_OUTF_FORMAT_RGB888;
+
+	/* Leave RGB order,conversion mode and clip mode to default */
+	/* do not interleave RGB channels for mipi Tx compatibility */
+	out_format |= LCD_OUTF_MIPI_RGB_MODE;
+	kmb_write_lcd(kmb, LCD_OUT_FORMAT_CFG, out_format);
+
+	dma_cfg = LCD_DMA_LAYER_ENABLE | LCD_DMA_LAYER_VSTRIDE_EN |
+	    LCD_DMA_LAYER_CONT_UPDATE | LCD_DMA_LAYER_AXI_BURST_16;
+
+	/* Enable DMA */
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id), dma_cfg);
+	drm_dbg(&kmb->drm, "dma_cfg=0x%x LCD_DMA_CFG=0x%x\n", dma_cfg,
+		kmb_read_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id)));
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF |
+			LCD_INT_DMA_ERR);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, LCD_INT_EOF |
+			LCD_INT_DMA_ERR);
+}
+
+static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
+	.atomic_check = kmb_plane_atomic_check,
+	.atomic_update = kmb_plane_atomic_update,
+	.atomic_disable = kmb_plane_atomic_disable
+};
+
+void kmb_plane_destroy(struct drm_plane *plane)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+
+	drm_plane_cleanup(plane);
+	kfree(kmb_plane);
+}
+
+static const struct drm_plane_funcs kmb_plane_funcs = {
+	.update_plane = drm_atomic_helper_update_plane,
+	.disable_plane = drm_atomic_helper_disable_plane,
+	.destroy = kmb_plane_destroy,
+	.reset = drm_atomic_helper_plane_reset,
+	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+};
+
+struct kmb_plane *kmb_plane_init(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *plane = NULL;
+	struct kmb_plane *primary = NULL;
+	int i = 0;
+	int ret = 0;
+	enum drm_plane_type plane_type;
+	const u32 *plane_formats;
+	int num_plane_formats;
+
+	for (i = 0; i < KMB_MAX_PLANES; i++) {
+		plane = drmm_kzalloc(drm, sizeof(*plane), GFP_KERNEL);
+
+		if (!plane) {
+			drm_err(drm, "Failed to allocate plane\n");
+			return ERR_PTR(-ENOMEM);
+		}
+
+		plane_type = (i == 0) ? DRM_PLANE_TYPE_PRIMARY :
+		    DRM_PLANE_TYPE_OVERLAY;
+		if (i < 2) {
+			plane_formats = kmb_formats_v;
+			num_plane_formats = ARRAY_SIZE(kmb_formats_v);
+		} else {
+			plane_formats = kmb_formats_g;
+			num_plane_formats = ARRAY_SIZE(kmb_formats_g);
+		}
+
+		ret = drm_universal_plane_init(drm, &plane->base_plane,
+					       POSSIBLE_CRTCS, &kmb_plane_funcs,
+					       plane_formats, num_plane_formats,
+					       NULL, plane_type, "plane %d", i);
+		if (ret < 0) {
+			drm_err(drm, "drm_universal_plane_init failed (ret=%d)",
+				ret);
+			goto cleanup;
+		}
+		drm_dbg(drm, "%s : %d i=%d type=%d",
+			__func__, __LINE__,
+			  i, plane_type);
+		drm_plane_helper_add(&plane->base_plane,
+				     &kmb_plane_helper_funcs);
+		if (plane_type == DRM_PLANE_TYPE_PRIMARY) {
+			primary = plane;
+			kmb->plane = plane;
+		}
+		drm_dbg(drm, "%s : %d primary=%p\n", __func__, __LINE__,
+			&primary->base_plane);
+		plane->id = i;
+	}
+
+	return primary;
+cleanup:
+	drmm_kfree(drm, plane);
+	return ERR_PTR(ret);
+}
drivers/gpu/drm/kmb/kmb_plane.h new file +91 -0
new file mode 100644
index 0000000..141cdaa
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright © 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_PLANE_H__
+#define __KMB_PLANE_H__
+
+extern int kmb_under_flow;
+extern int kmb_flush_done;
+
+#define LCD_INT_VL0_ERR ((LAYER0_DMA_FIFO_UNDERFLOW) | \
+			(LAYER0_DMA_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CB_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CB_FIFO_UNDERFLOW) | \
+			(LAYER0_DMA_CR_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_VL1_ERR ((LAYER1_DMA_FIFO_UNDERFLOW) | \
+			(LAYER1_DMA_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CB_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CB_FIFO_UNDERFLOW) | \
+			(LAYER1_DMA_CR_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_GL0_ERR (LAYER2_DMA_FIFO_OVERFLOW | LAYER2_DMA_FIFO_UNDERFLOW)
+#define LCD_INT_GL1_ERR (LAYER3_DMA_FIFO_OVERFLOW | LAYER3_DMA_FIFO_UNDERFLOW)
+#define LCD_INT_VL0 (LAYER0_DMA_DONE | LAYER0_DMA_IDLE | LCD_INT_VL0_ERR)
+#define LCD_INT_VL1 (LAYER1_DMA_DONE | LAYER1_DMA_IDLE | LCD_INT_VL1_ERR)
+#define LCD_INT_GL0 (LAYER2_DMA_DONE | LAYER2_DMA_IDLE | LCD_INT_GL0_ERR)
+#define LCD_INT_GL1 (LAYER3_DMA_DONE | LAYER3_DMA_IDLE | LCD_INT_GL1_ERR)
+#define LCD_INT_DMA_ERR (LCD_INT_VL0_ERR | LCD_INT_VL1_ERR \
+		| LCD_INT_GL0_ERR | LCD_INT_GL1_ERR)
+
+#define POSSIBLE_CRTCS 1
+#define to_kmb_plane(x) container_of(x, struct kmb_plane, base_plane)
+
+enum layer_id {
+	LAYER_0,
+	LAYER_1,
+	LAYER_2,
+	LAYER_3,
+	/* KMB_MAX_PLANES */
+};
+
+#define KMB_MAX_PLANES 1
+
+enum sub_plane_id {
+	Y_PLANE,
+	U_PLANE,
+	V_PLANE,
+	MAX_SUB_PLANES,
+};
+
+struct kmb_plane {
+	struct drm_plane base_plane;
+	unsigned char id;
+};
+
+/* Graphics layer (layers 2 & 3) formats, only packed formats  are supported */
+static const u32 kmb_formats_g[] = {
+	DRM_FORMAT_RGB332,
+	DRM_FORMAT_XRGB4444, DRM_FORMAT_XBGR4444,
+	DRM_FORMAT_ARGB4444, DRM_FORMAT_ABGR4444,
+	DRM_FORMAT_XRGB1555, DRM_FORMAT_XBGR1555,
+	DRM_FORMAT_ARGB1555, DRM_FORMAT_ABGR1555,
+	DRM_FORMAT_RGB565, DRM_FORMAT_BGR565,
+	DRM_FORMAT_RGB888, DRM_FORMAT_BGR888,
+	DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888,
+	DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888,
+};
+
+#define MAX_FORMAT_G	(ARRAY_SIZE(kmb_formats_g))
+#define MAX_FORMAT_V	(ARRAY_SIZE(kmb_formats_v))
+
+/* Video layer ( 0 & 1) formats, packed and planar formats are supported */
+static const u32 kmb_formats_v[] = {
+	/* packed formats */
+	DRM_FORMAT_RGB332,
+	DRM_FORMAT_XRGB4444, DRM_FORMAT_XBGR4444,
+	DRM_FORMAT_ARGB4444, DRM_FORMAT_ABGR4444,
+	DRM_FORMAT_XRGB1555, DRM_FORMAT_XBGR1555,
+	DRM_FORMAT_ARGB1555, DRM_FORMAT_ABGR1555,
+	DRM_FORMAT_RGB565, DRM_FORMAT_BGR565,
+	DRM_FORMAT_RGB888, DRM_FORMAT_BGR888,
+	DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888,
+	DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888,
+	/*planar formats */
+	DRM_FORMAT_YUV420, DRM_FORMAT_YVU420,
+	DRM_FORMAT_YUV422, DRM_FORMAT_YVU422,
+	DRM_FORMAT_YUV444, DRM_FORMAT_YVU444,

drivers/gpu/drm/kmb/kmb_plane.h line 101

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+	DRM_FORMAT_NV12, DRM_FORMAT_NV21,
+};
+
+/* Conversion (yuv->rgb) matrix from myriadx */
+static const u32 csc_coef_lcd[] = {
+	1024, 0, 1436,
+	1024, -352, -731,
+	1024, 1814, 0,
+	-179, 125, -226
+};

The static const arrays above look a bit strange in a header file (and could result in duplication in the driver .ko), please move to .c files. Headers should only contain definitions, not declarations of actual storage.

Cheers, Daniel

Quoted 16 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9 -0
+
+struct layer_status {
+	bool disable;
+	u32 ctrl;
+};
+
+struct kmb_plane *kmb_plane_init(struct drm_device *drm);
+void kmb_plane_destroy(struct drm_plane *plane);
+#endif /* __KMB_PLANE_H__ */
Signature · 6 lines
2.7.4

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#4 lore raw

Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Hi Daniel.

Quoted 7 lines

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+	}
+
+	/* Initialize MIPI DSI */
+	ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

I have explicit asked for a simple file split as done here and told Anitha this was fine.

As the kbuild/kconfig bits are the last patch then no build breakage. The file based split was IMO fine to ease review.

If this is not OK then blame me :-)

Sam
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw

Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 10 lines · Sam Ravnborg

Hi Daniel.

Quoted 7 lines

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+	}
+
+	/* Initialize MIPI DSI */
+	ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 7 lines

I have explicit asked for a simple file split as done here and told Anitha this was fine.

As the kbuild/kconfig bits are the last patch then no build breakage. The file based split was IMO fine to ease review.

If this is not OK then blame me :-)

Ah I missed that, sounds ok for me too then :-)
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author maintainer
#6 lore raw

RE: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

In reply to Daniel Vetter

Hi Daniel,
Thank you for your review. Keem Bay is developed on kernel 5.45 (Yocto) and I am working with the program to get a working 5.9 kernel for Keem Bay and will test this driver when that becomes available.

Thanks,
Anitha

Quoted 1,931 lines

-----Original Message-----
From: Daniel Vetter <[email protected]>
Sent: Thursday, September 10, 2020 1:31 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>
Subject: Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 1 line · Anitha Chrisanthus

This is a basic KMS atomic modesetting display driver for KeemBay family

of

Quoted 18 lines

SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.(Sam)

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

Quoted 14 lines

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam) use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state

(Sam)

Quoted 4 lines

Sam asked me to take a look at this too, looks reasonable overall. I've spotted a few small things plus a potential functional issue around vblank/event handling. I strongly recommend running the igt test suite over the driver to see whether it all works reasonably ok. See below for details.

Quoted 3 lines
---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676

++++++++++++++++++++++++++++++++++++++++

Quoted 2 lines
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480

++++++++++++++++++++++++++++

Review

Quoted 9 lines
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 68 lines

new file mode 100644
index 0000000..a684331

drivers/gpu/drm/kmb/kmb_crtc.c new file +63 -0
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+	u32 vfront_porch;
+	u32 vback_porch;
+	u32 vsync_len;
+	u32 hfront_porch;
+	u32 hback_porch;
+	u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Set which interval to generate vertical interrupt */
+	kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+		      LCD_VSTATUS_COMPARE_VSYNC);
+	/* Enable vertical interrupt */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+	return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Disable vertical interrupt */

drivers/gpu/drm/kmb/kmb_crtc.c line 73

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+	.destroy = drm_crtc_cleanup,
+	.set_config = drm_atomic_helper_set_config,
+	.page_flip = drm_atomic_helper_page_flip,
+	.reset = drm_atomic_helper_crtc_reset,
+	.atomic_duplicate_state =

drm_atomic_helper_crtc_duplicate_state,

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+	.enable_vblank = kmb_crtc_enable_vblank,
+	.disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_display_mode *m = &crtc->state->adjusted_mode;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	struct kmb_crtc_timing vm;
+	int vsync_start_offset;
+	int vsync_end_offset;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+	unsigned int val = 0;
+
+	/* Initialize mipi */
+	kmb_dsi_hw_init(dev, m);
+	drm_info(dev,
+		 "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d

hsync_len=%d\n",

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+		 m->crtc_vsync_start - m->crtc_vdisplay,
+		 m->crtc_vtotal - m->crtc_vsync_end,
+		 m->crtc_vsync_end - m->crtc_vsync_start,
+		 m->crtc_hsync_start - m->crtc_hdisplay,
+		 m->crtc_htotal - m->crtc_hsync_end,
+		 m->crtc_hsync_end - m->crtc_hsync_start);
+	val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+	vm.vfront_porch = 2;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	vm.vback_porch = 2;
+	vm.vsync_len = 8;
+	vm.hfront_porch = 0;
+	vm.hback_porch = 0;
+	vm.hsync_len = 28;
+
+	vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+	vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+	drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-

w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",

drivers/gpu/drm/kmb/kmb_crtc.c line 114

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2 -0
+		__func__, __LINE__,
+			m->crtc_vdisplay, vm.vback_porch,

vm.vfront_porch,

Quoted 69 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +69 -0
+			vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+			vm.hfront_porch, vm.hsync_len);
+	kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+		      m->crtc_vdisplay - 1);
+	kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+	kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+	kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+	kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+		      m->crtc_hdisplay - 1);
+	kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+	kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+	kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+	/* This is hardcoded as 0 in the Myriadx code */
+	kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+	kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+	/* Back ground color */
+	kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+	if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+		kmb_write_lcd(kmb,
+			      LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+		kmb_write_lcd(kmb,
+			      LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+		kmb_write_lcd(kmb,
+			      LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+		kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+			      m->crtc_vdisplay - 1);
+		/* This is hardcoded as 10 in the Myriadx code */
+		kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+		kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+	}
+	kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+				   struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	clk_prepare_enable(lcd->clk);
+	kmb_crtc_set_mode(crtc);
+	drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+				    struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	/* due to hw limitations, planes need to be off when crtc is off */
+	drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+	drm_crtc_vblank_off(crtc);
+	clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)

drivers/gpu/drm/kmb/kmb_crtc.c line 193

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+
+	spin_lock_irq(&crtc->dev->event_lock);
+	if (crtc->state->event)
+		drm_crtc_send_vblank_event(crtc, crtc->state->event);

Uh, you have vblank event support, but you immediately send out the vblank
event. That breaks userspace assumptions. You probably want to use drm_crtc_arm_vblank_event here. Also there's tons of races that can possibly happen, so please read the kerneldoc comment for that function carefully - you probably need to validate that the vblank event arming, vblank process and re-enabling of LCD_INT_ENABLE cannot race against each
another in bad ways.

Also we have igt testcases for this, so please run them:

https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#validating-
changes-with-igt

Review

Quoted 33 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +22 -0
+	crtc->state->event = NULL;
+	spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {
+	.atomic_begin = kmb_crtc_atomic_begin,
+	.atomic_enable = kmb_crtc_atomic_enable,
+	.atomic_disable = kmb_crtc_atomic_disable,
+	.atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *primary;
+	int ret;
+
+	primary = kmb_plane_init(drm);
+	if (IS_ERR(primary))
+		return PTR_ERR(primary);
+
+	ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary-

base_plane,

drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+					NULL, &kmb_crtc_funcs, NULL);
+	if (ret) {
+		kmb_plane_destroy(&primary->base_plane);
+		return ret;
+	}
+
+	drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+	return 0;
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.c

Quoted 42 lines

new file mode 100644
index 0000000..e413099

drivers/gpu/drm/kmb/kmb_drv.c new file +37 -0
@@ -0,0 +1,676 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/console.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
+
+#include <drm/drm.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_regs.h"
+
+int kmb_under_flow = 0, kmb_flush_done = 0, layer_no = 0;
+static struct kmb_clock kmb_clk;

drivers/gpu/drm/kmb/kmb_drv.c line 47

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+static struct drm_bridge *adv_bridge;
+
+int kmb_display_clk_enable(struct kmb_drm_private *kmb)
+{
+	int ret = 0;
+
+	ret = clk_prepare_enable(kmb_clk.clk_lcd);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n",

ret);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n",

ret);

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11 -0
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_ecfg);
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_ECFG clock: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_cfg);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_CFG clock: %d\n", ret);
+		return ret;
+	}
+	DRM_INFO("SUCCESS : enabled LCD MIPI clocks\n");
+	return 0;
+}
+
+int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct device

*dev)

Quoted 37 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+{
+	struct device_node *vpu_dev;
+	unsigned long clk;
+	int ret = 0;
+
+	kmb_clk.clk_lcd = clk_get(dev, "clk_lcd");
+	if (IS_ERR(kmb_clk.clk_lcd)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_lcd\n");
+		return PTR_ERR(kmb_clk.clk_lcd);
+	}
+
+	kmb_clk.clk_mipi = clk_get(dev, "clk_mipi");
+	if (IS_ERR(kmb_clk.clk_mipi)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi\n");
+		return PTR_ERR(kmb_clk.clk_mipi);
+	}
+
+	kmb_clk.clk_mipi_ecfg = clk_get(dev, "clk_mipi_ecfg");
+	if (IS_ERR(kmb_clk.clk_mipi_ecfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_ecfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_ecfg);
+	}
+
+	kmb_clk.clk_mipi_cfg = clk_get(dev, "clk_mipi_cfg");
+	if (IS_ERR(kmb_clk.clk_mipi_cfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_cfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_cfg);
+	}
+	vpu_dev = of_find_node_by_path("/soc/vpu-ipc");
+	kmb_clk.clk_pll0 = of_clk_get_by_name(vpu_dev, "pll_0_out_0");
+	if (IS_ERR(kmb_clk.clk_pll0)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_pll0 ");
+		return PTR_ERR(kmb_clk.clk_pll0);
+	}
+	kmb->sys_clk_mhz = clk_get_rate(kmb_clk.clk_pll0) / 1000000;
+	drm_info(&kmb->drm, "system clk = %d Mhz", kmb-

sys_clk_mhz);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+	/* Set LCD clock to 200 Mhz */
+	clk_set_rate(kmb_clk.clk_lcd, KMB_LCD_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_lcd) != KMB_LCD_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_lcd to %d\n",
+			KMB_LCD_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_lcd = %ld\n",

clk_get_rate(kmb_clk.clk_lcd));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+	/* Set MIPI clock to 24 Mhz */
+	clk_set_rate(kmb_clk.clk_mipi, KMB_MIPI_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_mipi) != KMB_MIPI_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_mipi to %d\n",
+			KMB_MIPI_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_mipi = %ld\n",

clk_get_rate(kmb_clk.clk_mipi));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_ECFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_ecfg,

KMB_MIPI_DEFAULT_CFG_CLK);

Quoted 36 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+		clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set to clk_mipi_ecfg to %d\n",
+				 KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_CFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_cfg, 24000000);
+		clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set clk_mipi_cfg to %d\n",
+				  KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	ret = kmb_display_clk_enable(kmb);
+	if (ret)
+		return ret;
+
+	/* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_CLK_CTRL, 0x1fff);
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_RSTN_CTRL, 0xffffffff);
+	return 0;
+}
+
+static int kmb_display_clk_disable(void)
+{
+	if (kmb_clk.clk_lcd)
+		clk_disable_unprepare(kmb_clk.clk_lcd);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (kmb_clk.clk_mipi)
+		clk_disable_unprepare(kmb_clk.clk_mipi);
+	if (kmb_clk.clk_mipi_ecfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_ecfg);
+	if (kmb_clk.clk_mipi_cfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_cfg);
+	return 0;
+}
+
+static void __iomem *kmb_map_mmio(struct drm_device *drm, char

*name)

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+{
+	struct resource *res;
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	void __iomem *mem;
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

name);

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +28 -0
+	if (!res) {
+		drm_err(drm, "failed to get resource for %s", name);
+		return ERR_PTR(-ENOMEM);
+	}
+	mem = devm_ioremap_resource(drm->dev, res);
+	if (IS_ERR(mem))
+		drm_err(drm, "failed to ioremap %s registers", name);
+	return mem;
+}
+
+static int kmb_hw_init(struct drm_device *drm, unsigned long flags)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	int irq_lcd;
+	int ret = 0;
+
+	/* Map LCD MMIO registers */
+	kmb->lcd_mmio = kmb_map_mmio(drm, "lcd_regs");
+	if (IS_ERR(kmb->lcd_mmio)) {
+		drm_err(&kmb->drm, "failed to map LCD registers\n");
+		return -ENOMEM;
+	}
+
+	/* Map MIPI MMIO registers */
+	kmb->mipi_mmio = kmb_map_mmio(drm, "mipi_regs");
+	if (IS_ERR(kmb->mipi_mmio)) {
+		drm_err(&kmb->drm, "failed to map MIPI registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+		iounmap(kmb->lcd_mmio);
+		return -ENOMEM;
+	}
+
+	/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and
+	 * MSS_CAM_CLK_CTRL register
+	 */
+	kmb->msscam_mmio = kmb_map_mmio(drm, "msscam_regs");
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

Quoted 54 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +54 -0
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+	/* Enable display clocks */
+	kmb_initialize_clocks(kmb, &pdev->dev);
+
+	/* Register irqs here - section 17.3 in databook
+	 * lists LCD at 79 and 82 for MIPI under MSS CPU -
+	 * firmware has redirected 79 to A53 IRQ 33
+	 */
+
+	/* Allocate LCD interrupt resources */
+	irq_lcd = platform_get_irq_byname(pdev, "irq_lcd");
+	if (irq_lcd < 0) {
+		drm_err(&kmb->drm, "irq_lcd not found");
+		goto setup_fail;
+	}
+
+	/* Get the optional framebuffer memory resource */
+	ret = of_reserved_mem_device_init(drm->dev);
+	if (ret && ret != -ENODEV)
+		return ret;
+
+	spin_lock_init(&kmb->irq_lock);
+
+	kmb->irq_lcd = irq_lcd;
+
+	return 0;
+
+ setup_fail:
+	of_reserved_mem_device_release(drm->dev);
+
+	return ret;
+}
+
+static const struct drm_mode_config_funcs kmb_mode_config_funcs = {
+	.fb_create = drm_gem_fb_create,
+	.atomic_check = drm_atomic_helper_check,
+	.atomic_commit = drm_atomic_helper_commit,
+};
+
+static int kmb_setup_mode_config(struct drm_device *drm)
+{
+	int ret;
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	ret = drmm_mode_config_init(drm);
+	if (ret)
+		return ret;
+	drm->mode_config.min_width = KMB_MIN_WIDTH;
+	drm->mode_config.min_height = KMB_MIN_HEIGHT;
+	drm->mode_config.max_width = KMB_MAX_WIDTH;
+	drm->mode_config.max_height = KMB_MAX_HEIGHT;

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	drm->mode_config.funcs = &kmb_mode_config_funcs;
+
+	ret = kmb_setup_crtc(drm);
+	if (ret < 0) {
+		drm_err(drm, "failed to create crtc\n");
+		return ret;
+	}
+
+	/* Initialize MIPI DSI */
+	ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 20 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +20 -0
+	if (ret) {
+		drm_err(drm, "failed to initialize DSI\n");
+		return ret;
+	}
+
+	/* Set the CRTC's port so that the encoder component can find it */
+	kmb->crtc.port = of_graph_get_port_by_id(drm->dev->of_node, 0);
+	ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+	if (ret < 0) {
+		drm_err(drm, "failed to initialize vblank\n");
+		pm_runtime_disable(drm->dev);
+		return ret;
+	}
+
+	drm_mode_config_reset(drm);
+	return 0;
+}
+
+static irqreturn_t handle_lcd_irq(struct drm_device *dev)
+{

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	unsigned long status, val, val1;
+	int plane_id, dma0_state, dma1_state;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	status = kmb_read_lcd(kmb, LCD_INT_STATUS);
+
+	if (status & LCD_INT_EOF) {
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF);
+
+		/* When disabling/enabling LCD layers, the change takes

effect

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+		 * immediately and does not wait for EOF (end of frame).
+		 * When kmb_plane_atomic_disable is called, mark the

plane as

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+		 * disabled but actually disable the plane when EOF irq is
+		 * being handled.
+		 */
+		for (plane_id = LAYER_0;
+				plane_id < KMB_MAX_PLANES; plane_id++)

{

drivers/gpu/drm/kmb/kmb_drv.c line 337

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			if (kmb->plane_status[plane_id].disable) {
+				kmb_clr_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (plane_id),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+
+				kmb_clr_bitmask_lcd(kmb, LCD_CONTROL,
+						    kmb-

plane_status[plane_id].ctrl);

drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+				kmb->plane_status[plane_id].disable = false;
+			}
+		}
+		if (kmb_under_flow) {
+			/* DMA Recovery after underflow */
+			dma0_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA0_STATE :

LCD_VIDEO1_DMA0_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			dma1_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA1_STATE :

LCD_VIDEO1_DMA1_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+			do {
+				kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+				val = kmb_read_lcd(kmb, dma0_state)
+				    & LCD_DMA_STATE_ACTIVE;
+				val1 = kmb_read_lcd(kmb, dma1_state)
+				    & LCD_DMA_STATE_ACTIVE;
+			} while ((val || val1));
+			/* disable dma */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(layer_no),

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+					    LCD_DMA_LAYER_ENABLE);
+			kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+			kmb_flush_done = 1;
+			kmb_under_flow = 0;
+		}
+	}
+
+	if (status & LCD_INT_LINE_CMP) {
+		/* clear line compare interrupt */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LINE_CMP);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	}
+
+	if (status & LCD_INT_VERT_COMP) {
+		/* Read VSTATUS */
+		val = kmb_read_lcd(kmb, LCD_VSTATUS);
+		val = (val & LCD_VSTATUS_VERTICAL_STATUS_MASK);
+		switch (val) {
+		case LCD_VSTATUS_COMPARE_VSYNC:
+			/* Clear vertical compare interrupt */
+			kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

drivers/gpu/drm/kmb/kmb_drv.c line 422

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			if (kmb_flush_done) {
+				kmb_set_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (layer_no),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c line 387

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+				kmb_flush_done = 0;
+			}
+			drm_handle_vblank(dev, 0);

Would be nice to use the new-style drm_crtc_handle_vblank here.

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			break;
+		case LCD_VSTATUS_COMPARE_BACKPORCH:
+		case LCD_VSTATUS_COMPARE_ACTIVE:
+		case LCD_VSTATUS_COMPARE_FRONT_PORCH:
+			kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			break;
+		}
+	}
+	if (status & LCD_INT_DMA_ERR) {

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+		val =
+		    (status & LCD_INT_DMA_ERR &
+		     kmb_read_lcd(kmb, LCD_INT_ENABLE));
+		/* LAYER0 - VL0 */
+		if (val & (LAYER0_DMA_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER0:VL0 DMA UNDERFLOW val =

0x%lx,under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1 -0
+					    LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(0),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+			layer_no = 0;
+		}
+
+		if (val & LAYER0_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER0_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER0_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+		/* LAYER1 - VL1 */
+		if (val & (LAYER1_DMA_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER1:VL1 DMA UNDERFLOW val =

0x%lx, under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1 -0
+					    LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(1),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+			layer_no = 1;
+		}
+
+		/* LAYER1 - VL1 */
+		if (val & LAYER1_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER1_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER1_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+		/* LAYER2 - GL0 */
+		if (val & LAYER2_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER2_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+		/* LAYER3 - GL1 */
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA OVERFLOW val = 0x%lx",

val);

Quoted 74 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +74 -0
+	}
+
+	if (status & LCD_INT_LAYER) {
+		/* Clear layer interrupts */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LAYER);
+	}
+
+	/* Clear all interrupts */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, 1);
+	return IRQ_HANDLED;
+}
+
+/* IRQ handler */
+static irqreturn_t kmb_isr(int irq, void *arg)
+{
+	struct drm_device *dev = (struct drm_device *)arg;
+
+	handle_lcd_irq(dev);
+	return IRQ_HANDLED;
+}
+
+static void kmb_irq_reset(struct drm_device *drm)
+{
+	kmb_write_lcd(to_kmb(drm), LCD_INT_CLEAR, 0xFFFF);
+	kmb_write_lcd(to_kmb(drm), LCD_INT_ENABLE, 0);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(fops);
+
+static struct drm_driver kmb_driver = {
+	.driver_features = DRIVER_GEM |
+	    DRIVER_MODESET | DRIVER_ATOMIC,
+	.irq_handler = kmb_isr,
+	.irq_preinstall = kmb_irq_reset,
+	.irq_uninstall = kmb_irq_reset,
+	/* GEM Operations */
+	.fops = &fops,
+	DRM_GEM_CMA_DRIVER_OPS_VMAP,
+	.name = "kmb-drm",
+	.desc = "KEEMBAY DISPLAY DRIVER ",
+	.date = "20190122",
+	.major = 1,
+	.minor = 0,
+};
+
+static int kmb_remove(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	drm_dev_unregister(drm);
+	drm_kms_helper_poll_fini(drm);
+	of_node_put(kmb->crtc.port);
+	kmb->crtc.port = NULL;
+	pm_runtime_get_sync(drm->dev);
+	drm_irq_uninstall(drm);
+	pm_runtime_put_sync(drm->dev);
+	pm_runtime_disable(drm->dev);
+
+	of_reserved_mem_device_release(drm->dev);
+
+	/* Release clks */
+	kmb_display_clk_disable();
+	clk_put(kmb_clk.clk_lcd);
+	clk_put(kmb_clk.clk_mipi);
+
+	dev_set_drvdata(dev, NULL);
+
+	/* Unregister DSI host */
+	kmb_dsi_host_unregister();
+	return 0;
+}
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+static int kmb_probe(struct platform_device *pdev)
+{
+	struct device *dev = get_device(&pdev->dev);
+	struct kmb_drm_private *kmb;
+	int ret = 0;
+
+	/* The bridge (ADV 7535) will return -EPROBE_DEFER until it
+	 * has a mipi_dsi_host to register its device to. So, we
+	 * first register the DSI host during probe time, and then return
+	 * -EPROBE_DEFER until the bridge is loaded. Probe will be called

again

Quoted 85 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +85 -0
+	 *  and then the rest of the driver initialization can proceed
+	 *  afterwards and the bridge can be successfully attached.
+	 */
+	adv_bridge = kmb_dsi_host_bridge_init(dev);
+
+	if (adv_bridge == ERR_PTR(-EPROBE_DEFER)) {
+		return -EPROBE_DEFER;
+	} else if (IS_ERR(adv_bridge)) {
+		DRM_ERROR("probe failed to initialize DSI host bridge\n");
+		return PTR_ERR(adv_bridge);
+	}
+
+	/* Create DRM device */
+	kmb = devm_drm_dev_alloc(dev, &kmb_driver,
+				 struct kmb_drm_private, drm);
+	if (IS_ERR(kmb))
+		return PTR_ERR(kmb);
+
+	dev_set_drvdata(dev, &kmb->drm);
+
+	ret = kmb_hw_init(&kmb->drm, 0);
+	if (ret)
+		goto err_free1;
+
+	ret = kmb_setup_mode_config(&kmb->drm);
+	if (ret)
+		goto err_free;
+
+	ret = drm_irq_install(&kmb->drm, kmb->irq_lcd);
+	if (ret < 0) {
+		drm_err(&kmb->drm, "failed to install IRQ handler\n");
+		goto err_irq;
+	}
+
+	drm_kms_helper_poll_init(&kmb->drm);
+
+	/* Register graphics device with the kernel */
+	ret = drm_dev_register(&kmb->drm, 0);
+	if (ret)
+		goto err_register;
+
+	return 0;
+
+ err_register:
+	drm_kms_helper_poll_fini(&kmb->drm);
+ err_irq:
+	pm_runtime_disable(kmb->drm.dev);
+ err_free:
+	drm_crtc_cleanup(&kmb->crtc);
+	drm_mode_config_cleanup(&kmb->drm);
+ err_free1:
+	dev_set_drvdata(dev, NULL);
+	kmb_dsi_host_unregister();
+
+	return ret;
+}
+
+static const struct of_device_id kmb_of_match[] = {
+	{.compatible = "intel,kmb_display"},
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, kmb_of_match);
+
+static int __maybe_unused kmb_pm_suspend(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+	drm_kms_helper_poll_disable(drm);
+
+	kmb->state = drm_atomic_helper_suspend(drm);
+	if (IS_ERR(kmb->state)) {
+		drm_kms_helper_poll_enable(drm);
+		return PTR_ERR(kmb->state);
+	}
+
+	return 0;
+}
+
+static int __maybe_unused kmb_pm_resume(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (!kmb)
+		return 0;
+
+	drm_atomic_helper_resume(drm, kmb->state);
+	drm_kms_helper_poll_enable(drm);
+
+	return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend,

kmb_pm_resume);

Review

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +16 -0
+
+static struct platform_driver kmb_platform_driver = {
+	.probe = kmb_probe,
+	.remove = kmb_remove,
+	.driver = {
+		.name = "kmb-drm",
+		.pm = &kmb_pm_ops,
+		.of_match_table = kmb_of_match,
+	},
+};
+
+module_platform_driver(kmb_platform_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_DESCRIPTION("Keembay Display driver");
+MODULE_LICENSE("GPL v2");
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.h

Quoted 7 lines

new file mode 100644
index 0000000..352f2d2

drivers/gpu/drm/kmb/kmb_drv.h new file +2 -0
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *

drivers/gpu/drm/kmb/kmb_drv.h line 12

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_DRV_H__
+#define __KMB_DRV_H__
+
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+#define KMB_MAX_WIDTH			1920 /*max width in pixels

*/

drivers/gpu/drm/kmb/kmb_drv.h line 13

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.h new file +1 -0
+#define KMB_MAX_HEIGHT			1080 /*max height in

pixels */

Quoted 27 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +27 -0
+#define KMB_MIN_WIDTH                   1920 /*max width in pixels */
+#define KMB_MIN_HEIGHT                  1080 /*max height in pixels */
+#define KMB_LCD_DEFAULT_CLK		200000000
+#define KMB_MIPI_DEFAULT_CLK		24000000
+#define KMB_MIPI_DEFAULT_CFG_CLK	24000000
+#define KMB_SYS_CLK_MHZ			500
+
+#define ICAM_MMIO		0x3b100000
+#define ICAM_LCD_OFFSET		0x1080
+#define ICAM_MMIO_SIZE		0x2000
+
+struct kmb_drm_private {
+	struct drm_device		drm;
+	void __iomem			*lcd_mmio;
+	void __iomem			*mipi_mmio;
+	void __iomem			*msscam_mmio;
+	struct clk			*clk;
+	struct drm_crtc			crtc;
+	struct kmb_plane		*plane;
+	struct drm_atomic_state		*state;
+	spinlock_t			irq_lock;
+	int				irq_lcd;
+	int				irq_mipi;
+	int				sys_clk_mhz;
+	dma_addr_t			fb_addr;
+	struct layer_status		plane_status[KMB_MAX_PLANES];
+};

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+struct kmb_clock {
+	struct clk *clk_lcd;
+	struct clk *clk_mipi;
+	struct clk *clk_mipi_ecfg;
+	struct clk *clk_mipi_cfg;
+	struct clk *clk_pll0;
+};
+
+static inline struct kmb_drm_private *to_kmb(const struct drm_device

*dev)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+	return container_of(dev, struct kmb_drm_private, drm);
+}
+
+static inline struct kmb_drm_private *crtc_to_kmb_priv(const struct

drm_crtc *x)

Quoted 23 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +23 -0
+{
+	return container_of(x, struct kmb_drm_private, crtc);
+}
+
+struct blt_layer_config {
+	unsigned char layer_format;
+};
+
+static inline void kmb_write_lcd(struct kmb_drm_private *dev_p,
+				 unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->lcd_mmio + reg));
+}
+
+static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
+				  unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->mipi_mmio + reg));
+}
+
+static inline void kmb_write_msscam(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 value)
+{

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+	writel(value, (dev_p->msscam_mmio + reg));
+}
+
+static inline u32 kmb_read_msscam(struct kmb_drm_private *dev_p,
+				  unsigned int reg)
+{
+	return readl(dev_p->msscam_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_msscam(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+					  unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_msscam(dev_p, reg);
+
+	kmb_write_msscam(dev_p, reg, (reg_val | mask));
+}
+
+static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p,

unsigned int reg)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+	return readl(dev_p->lcd_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_lcd(struct kmb_drm_private

*dev_p,

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val | mask));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bitmask_lcd(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val & (~mask)));
+}
+
+static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p,

unsigned int reg)

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +25 -0
+{
+	return readl(dev_p->mipi_mmio + reg);
+}
+
+static inline void kmb_write_bits_mipi(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 offset,
+				       u32 num_bits, u32 value)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+	u32 mask = (1 << num_bits) - 1;
+
+	value &= mask;
+	mask <<= offset;
+	reg_val &= (~mask);
+	reg_val |= (value << offset);
+	kmb_write_mipi(dev_p, reg, reg_val);
+}
+
+static inline void kmb_set_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val | (1 << offset));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val & (~(1 << offset)));
+}
+
+static inline void kmb_set_bitmask_mipi(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private

*dev_p,

Review

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val & (~mask)));
+}
+
+int kmb_setup_crtc(struct drm_device *dev);
+void kmb_set_scanout(struct kmb_drm_private *lcd);
+#endif /* __KMB_DRV_H__ */
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.c

Quoted 23 lines

new file mode 100644
index 0000000..d1e7786

drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_plane_helper.h>
+
+#include "kmb_drv.h"
+#include "kmb_plane.h"

drivers/gpu/drm/kmb/kmb_plane.c line 28

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+#include "kmb_regs.h"
+
+const u32 layer_irqs[] = {
+	LCD_INT_VL0,
+	LCD_INT_VL1,
+	LCD_INT_GL0,
+	LCD_INT_GL1
+};
+
+static unsigned int check_pixel_format(struct drm_plane *plane, u32

format)

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+{
+	int i;
+
+	for (i = 0; i < plane->format_count; i++) {
+		if (plane->format_types[i] == format)
+			return 0;
+	}
+	return -EINVAL;
+}
+
+static int kmb_plane_atomic_check(struct drm_plane *plane,
+				  struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	int ret;
+	struct drm_crtc_state *crtc_state;
+	bool can_position;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+	fb = state->fb;
+	if (!fb || !state->crtc)
+		return 0;
+
+	ret = check_pixel_format(plane, fb->format->format);
+	if (ret)
+		return ret;
+
+	if (state->crtc_w > KMB_MAX_WIDTH || state->crtc_h >

KMB_MAX_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 57

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+		return -EINVAL;
+	if (state->crtc_w < KMB_MIN_WIDTH || state->crtc_h <

KMB_MIN_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 67

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		return -EINVAL;
+	can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
+	crtc_state =
+		drm_atomic_get_existing_crtc_state(state->state, state-

crtc);

drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+	return drm_atomic_helper_check_plane_state(state, crtc_state,
+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 1 line

+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +28 -0
+						 can_position, true);
+}
+
+static void kmb_plane_atomic_disable(struct drm_plane *plane,
+				     struct drm_plane_state *state)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+	int plane_id = kmb_plane->id;
+	struct kmb_drm_private *kmb;
+
+	kmb = to_kmb(plane->dev);
+
+	switch (plane_id) {
+	case LAYER_0:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	kmb->plane_status[plane_id].disable = true;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+}
+
+unsigned int get_pixel_format(u32 format)
+{
+	unsigned int val = 0;
+
+	switch (format) {
+		/* planar formats */
+	case DRM_FORMAT_YUV444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_NV12:
+		val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_NV21:
+		val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+		/* packed formats */
+		/* looks hw requires B & G to be swapped when RGB */
+	case DRM_FORMAT_RGB332:
+		val = LCD_LAYER_FORMAT_RGB332 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR4444:
+		val = LCD_LAYER_FORMAT_RGBX4444;
+		break;
+	case DRM_FORMAT_ARGB4444:
+		val = LCD_LAYER_FORMAT_RGBA4444 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_ABGR4444:
+		val = LCD_LAYER_FORMAT_RGBA4444;
+		break;
+	case DRM_FORMAT_XRGB1555:
+		val = LCD_LAYER_FORMAT_XRGB1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR1555:
+		val = LCD_LAYER_FORMAT_XRGB1555;
+		break;
+	case DRM_FORMAT_ARGB1555:
+		val = LCD_LAYER_FORMAT_RGBA1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_ABGR1555:
+		val = LCD_LAYER_FORMAT_RGBA1555;
+		break;
+	case DRM_FORMAT_RGB565:
+		val = LCD_LAYER_FORMAT_RGB565 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_BGR565:
+		val = LCD_LAYER_FORMAT_RGB565;
+		break;
+	case DRM_FORMAT_RGB888:
+		val = LCD_LAYER_FORMAT_RGB888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_BGR888:
+		val = LCD_LAYER_FORMAT_RGB888;
+		break;
+	case DRM_FORMAT_XRGB8888:
+		val = LCD_LAYER_FORMAT_RGBX8888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR8888:
+		val = LCD_LAYER_FORMAT_RGBX8888;
+		break;
+	case DRM_FORMAT_ARGB8888:
+		val = LCD_LAYER_FORMAT_RGBA8888 |

LCD_LAYER_BGR_ORDER;

Quoted 35 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +35 -0
+		break;
+	case DRM_FORMAT_ABGR8888:
+		val = LCD_LAYER_FORMAT_RGBA8888;
+		break;
+	}
+	DRM_INFO_ONCE("%s : %d format=0x%x val=0x%x\n",
+		      __func__, __LINE__, format, val);
+	return val;
+}
+
+unsigned int get_bits_per_pixel(const struct drm_format_info *format)
+{
+	u32 bpp = 0;
+	unsigned int val = 0;
+
+	if (format->num_planes > 1) {
+		val = LCD_LAYER_8BPP;
+		return val;
+	}
+
+	bpp += 8 * format->cpp[0];
+
+	switch (bpp) {
+	case 8:
+		val = LCD_LAYER_8BPP;
+		break;
+	case 16:
+		val = LCD_LAYER_16BPP;
+		break;
+	case 24:
+		val = LCD_LAYER_24BPP;
+		break;
+	case 32:
+		val = LCD_LAYER_32BPP;
+		break;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	}
+
+	DRM_DEBUG("bpp=%d val=0x%x\n", bpp, val);
+	return val;
+}
+
+static void config_csc(struct kmb_drm_private *kmb, int plane_id)
+{
+	/* YUV to RGB conversion using the fixed matrix csc_coef_lcd */
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id),

csc_coef_lcd[0]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id),

csc_coef_lcd[1]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id),

csc_coef_lcd[2]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id),

csc_coef_lcd[3]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id),

csc_coef_lcd[4]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id),

csc_coef_lcd[5]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id),

csc_coef_lcd[6]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id),

csc_coef_lcd[7]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id),

csc_coef_lcd[8]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id),

csc_coef_lcd[9]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id),

csc_coef_lcd[10]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id),

csc_coef_lcd[11]);

Quoted 22 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +22 -0
+}
+
+static void kmb_plane_atomic_update(struct drm_plane *plane,
+				    struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	struct kmb_drm_private *kmb;
+	unsigned int width;
+	unsigned int height;
+	unsigned int dma_len;
+	struct kmb_plane *kmb_plane;
+	unsigned int dma_cfg;
+	unsigned int ctrl = 0, val = 0, out_format = 0;
+	unsigned int src_w, src_h, crtc_x, crtc_y;
+	unsigned char plane_id;
+	int num_planes;
+	static dma_addr_t addr[MAX_SUB_PLANES];
+
+	if (!plane || !plane->state || !state)
+		return;
+
+	fb = plane->state->fb;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	if (!fb)
+		return;
+	num_planes = fb->format->num_planes;
+	kmb_plane = to_kmb_plane(plane);
+	plane_id = kmb_plane->id;
+
+	kmb = to_kmb(plane->dev);
+
+	if (kmb_under_flow || kmb_flush_done) {
+		drm_dbg(&kmb->drm, "plane_update:underflow!!!!

returning");

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+		return;
+	}
+
+	src_w = (plane->state->src_w >> 16);
+	src_h = plane->state->src_h >> 16;
+	crtc_x = plane->state->crtc_x;
+	crtc_y = plane->state->crtc_y;
+
+	drm_dbg(&kmb->drm,
+		"src_w=%d src_h=%d, fb->format->format=0x%x fb-

flags=0x%x\n",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8 -0
+		  src_w, src_h, fb->format->format, fb->flags);
+
+	width = fb->width;
+	height = fb->height;
+	dma_len = (width * height * fb->format->cpp[0]);
+	drm_dbg(&kmb->drm, "dma_len=%d ", dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id),

dma_len);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
+		      fb->pitches[0]);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
+		      (width * fb->format->cpp[0]));

drivers/gpu/drm/kmb/kmb_plane.c line 303

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+	addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
+	kmb->fb_addr = addr[Y_PLANE];
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
+		      addr[Y_PLANE] + fb->offsets[0]);
+	val = get_pixel_format(fb->format->format);
+	val |= get_bits_per_pixel(fb->format);
+	/* Program Cb/Cr for planar formats */
+	if (num_planes > 1) {
+		kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+			      width * fb->format->cpp[0]);
+		kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+			      (width * fb->format->cpp[0]));
+
+		addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane-

state,

drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+							U_PLANE);
+		/* check if Cb/Cr is swapped*/
+		if (num_planes == 3 && (val & LCD_LAYER_CRCB_ORDER))
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+					addr[U_PLANE]);
+		else
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 315

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+					addr[U_PLANE]);
+
+		if (num_planes == 3) {
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 319

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+				      ((width) * fb->format->cpp[0]));
+
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+				      ((width) * fb->format->cpp[0]));
+
+			addr[V_PLANE] = drm_fb_cma_get_gem_addr(fb,
+								plane->state,
+								V_PLANE);
+
+			/* check if Cb/Cr is swapped*/
+			if (val & LCD_LAYER_CRCB_ORDER)
+				kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+					      addr[V_PLANE]);
+			else
+				kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

Quoted 46 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +46 -0
+					      addr[V_PLANE]);
+		}
+	}
+
+	kmb_write_lcd(kmb, LCD_LAYERn_WIDTH(plane_id), src_w - 1);
+	kmb_write_lcd(kmb, LCD_LAYERn_HEIGHT(plane_id), src_h - 1);
+	kmb_write_lcd(kmb, LCD_LAYERn_COL_START(plane_id), crtc_x);
+	kmb_write_lcd(kmb, LCD_LAYERn_ROW_START(plane_id), crtc_y);
+
+	val |= LCD_LAYER_FIFO_100;
+
+	if (val & LCD_LAYER_PLANAR_STORAGE) {
+		val |= LCD_LAYER_CSC_EN;
+
+		/* Enable CSC if input is planar and output is RGB */
+		config_csc(kmb, plane_id);
+	}
+
+	kmb_write_lcd(kmb, LCD_LAYERn_CFG(plane_id), val);
+
+	switch (plane_id) {
+	case LAYER_0:
+		ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE
+	    | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED;
+
+	/* LCD is connected to MIPI on kmb
+	 * Therefore this bit is required for DSI Tx
+	 */
+	ctrl |= LCD_CTRL_VHSYNC_IDLE_LVL;
+
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, ctrl);
+
+	/* FIXME no doc on how to set output format,these values are

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	 * taken from the Myriadx tests
+	 */
+	out_format |= LCD_OUTF_FORMAT_RGB888;
+
+	/* Leave RGB order,conversion mode and clip mode to default */
+	/* do not interleave RGB channels for mipi Tx compatibility */
+	out_format |= LCD_OUTF_MIPI_RGB_MODE;
+	kmb_write_lcd(kmb, LCD_OUT_FORMAT_CFG, out_format);
+
+	dma_cfg = LCD_DMA_LAYER_ENABLE |

LCD_DMA_LAYER_VSTRIDE_EN |

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	    LCD_DMA_LAYER_CONT_UPDATE |

LCD_DMA_LAYER_AXI_BURST_16;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+
+	/* Enable DMA */
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id), dma_cfg);
+	drm_dbg(&kmb->drm, "dma_cfg=0x%x LCD_DMA_CFG=0x%x\n",

dma_cfg,

Quoted 18 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
+		kmb_read_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id)));
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF |
+			LCD_INT_DMA_ERR);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, LCD_INT_EOF |
+			LCD_INT_DMA_ERR);
+}
+
+static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
+	.atomic_check = kmb_plane_atomic_check,
+	.atomic_update = kmb_plane_atomic_update,
+	.atomic_disable = kmb_plane_atomic_disable
+};
+
+void kmb_plane_destroy(struct drm_plane *plane)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	drm_plane_cleanup(plane);
+	kfree(kmb_plane);
+}
+
+static const struct drm_plane_funcs kmb_plane_funcs = {
+	.update_plane = drm_atomic_helper_update_plane,
+	.disable_plane = drm_atomic_helper_disable_plane,
+	.destroy = kmb_plane_destroy,
+	.reset = drm_atomic_helper_plane_reset,
+	.atomic_duplicate_state =

drm_atomic_helper_plane_duplicate_state,

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+};
+
+struct kmb_plane *kmb_plane_init(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *plane = NULL;
+	struct kmb_plane *primary = NULL;
+	int i = 0;
+	int ret = 0;
+	enum drm_plane_type plane_type;
+	const u32 *plane_formats;
+	int num_plane_formats;
+
+	for (i = 0; i < KMB_MAX_PLANES; i++) {
+		plane = drmm_kzalloc(drm, sizeof(*plane), GFP_KERNEL);
+

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+		if (!plane) {
+			drm_err(drm, "Failed to allocate plane\n");
+			return ERR_PTR(-ENOMEM);
+		}
+
+		plane_type = (i == 0) ? DRM_PLANE_TYPE_PRIMARY :
+		    DRM_PLANE_TYPE_OVERLAY;
+		if (i < 2) {
+			plane_formats = kmb_formats_v;
+			num_plane_formats =

ARRAY_SIZE(kmb_formats_v);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		} else {
+			plane_formats = kmb_formats_g;
+			num_plane_formats =

ARRAY_SIZE(kmb_formats_g);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		}
+
+		ret = drm_universal_plane_init(drm, &plane->base_plane,
+					       POSSIBLE_CRTCS,

&kmb_plane_funcs,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+					       plane_formats,

num_plane_formats,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+					       NULL, plane_type, "plane %d", i);
+		if (ret < 0) {
+			drm_err(drm, "drm_universal_plane_init failed

(ret=%d)",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +13 -0
+				ret);
+			goto cleanup;
+		}
+		drm_dbg(drm, "%s : %d i=%d type=%d",
+			__func__, __LINE__,
+			  i, plane_type);
+		drm_plane_helper_add(&plane->base_plane,
+				     &kmb_plane_helper_funcs);
+		if (plane_type == DRM_PLANE_TYPE_PRIMARY) {
+			primary = plane;
+			kmb->plane = plane;
+		}
+		drm_dbg(drm, "%s : %d primary=%p\n", __func__,

__LINE__,

Review

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0
+			&primary->base_plane);
+		plane->id = i;
+	}
+
+	return primary;
+cleanup:
+	drmm_kfree(drm, plane);
+	return ERR_PTR(ret);
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.h

Quoted 21 lines

new file mode 100644
index 0000000..141cdaa

drivers/gpu/drm/kmb/kmb_plane.h new file +16 -0
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_PLANE_H__
+#define __KMB_PLANE_H__
+
+extern int kmb_under_flow;
+extern int kmb_flush_done;
+
+#define LCD_INT_VL0_ERR ((LAYER0_DMA_FIFO_UNDERFLOW) | \
+			(LAYER0_DMA_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CB_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CB_FIFO_UNDERFLOW) | \
+			(LAYER0_DMA_CR_FIFO_OVERFLOW) | \

drivers/gpu/drm/kmb/kmb_plane.h line 26

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+			(LAYER0_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_VL1_ERR ((LAYER1_DMA_FIFO_UNDERFLOW) | \
+			(LAYER1_DMA_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CB_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CB_FIFO_UNDERFLOW) | \
+			(LAYER1_DMA_CR_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_GL0_ERR (LAYER2_DMA_FIFO_OVERFLOW |

LAYER2_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h line 27

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL1_ERR (LAYER3_DMA_FIFO_OVERFLOW |

LAYER3_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h line 28

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_VL0 (LAYER0_DMA_DONE | LAYER0_DMA_IDLE |

LCD_INT_VL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 29

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_VL1 (LAYER1_DMA_DONE | LAYER1_DMA_IDLE |

LCD_INT_VL1_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 30

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL0 (LAYER2_DMA_DONE | LAYER2_DMA_IDLE |

LCD_INT_GL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 31

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL1 (LAYER3_DMA_DONE | LAYER3_DMA_IDLE |

LCD_INT_GL1_ERR)

Quoted 19 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +19 -0
+#define LCD_INT_DMA_ERR (LCD_INT_VL0_ERR | LCD_INT_VL1_ERR \
+		| LCD_INT_GL0_ERR | LCD_INT_GL1_ERR)
+
+#define POSSIBLE_CRTCS 1
+#define to_kmb_plane(x) container_of(x, struct kmb_plane, base_plane)
+
+enum layer_id {
+	LAYER_0,
+	LAYER_1,
+	LAYER_2,
+	LAYER_3,
+	/* KMB_MAX_PLANES */
+};
+
+#define KMB_MAX_PLANES 1
+
+enum sub_plane_id {
+	Y_PLANE,
+	U_PLANE,

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+	V_PLANE,
+	MAX_SUB_PLANES,
+};
+
+struct kmb_plane {
+	struct drm_plane base_plane;
+	unsigned char id;
+};
+
+/* Graphics layer (layers 2 & 3) formats, only packed formats  are

supported */

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +6 -0
+static const u32 kmb_formats_g[] = {
+	DRM_FORMAT_RGB332,
+	DRM_FORMAT_XRGB4444, DRM_FORMAT_XBGR4444,
+	DRM_FORMAT_ARGB4444, DRM_FORMAT_ABGR4444,
+	DRM_FORMAT_XRGB1555, DRM_FORMAT_XBGR1555,
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

drivers/gpu/drm/kmb/kmb_plane.h line 75

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+	DRM_FORMAT_ARGB1555, DRM_FORMAT_ABGR1555,
+	DRM_FORMAT_RGB565, DRM_FORMAT_BGR565,
+	DRM_FORMAT_RGB888, DRM_FORMAT_BGR888,
+	DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888,
+	DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888,
+};
+
+#define MAX_FORMAT_G	(ARRAY_SIZE(kmb_formats_g))
+#define MAX_FORMAT_V	(ARRAY_SIZE(kmb_formats_v))
+
[… more lines in the raw message]

supported */

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +25 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

The static const arrays above look a bit strange in a header file (and could result in duplication in the driver .ko), please move to .c files. Headers should only contain definitions, not declarations of actual storage.

Cheers, Daniel

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2.7.4

Quoted 9 lines
Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 lines not shown · raw message

4 lines not shown · raw message

Parts of this message are not shown here. View the raw message.

#7 lore raw

Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 4 lines · Anitha

Hi Daniel,
Thank you for your review. Keem Bay is developed on kernel 5.45 (Yocto) and I am working with the program to get a working 5.9 kernel for Keem Bay and will test this driver when that becomes available.

Yeah 5.4 is a bit old for upstreaming since a bunch of drm changes aren't available there. Having an upstream kernel to test your submission is indeed needed first.
-Daniel

Quoted 1,946 lines

Thanks,
Anitha

Quoted 1,940 lines

-----Original Message-----
From: Daniel Vetter <[email protected]>
Sent: Thursday, September 10, 2020 1:31 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>
Subject: Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 1 line · Anitha Chrisanthus

This is a basic KMS atomic modesetting display driver for KeemBay family

of

Quoted 18 lines

SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.(Sam)

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

Quoted 14 lines

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam) use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state

(Sam)

Quoted 4 lines

Sam asked me to take a look at this too, looks reasonable overall. I've spotted a few small things plus a potential functional issue around vblank/event handling. I strongly recommend running the igt test suite over the driver to see whether it all works reasonably ok. See below for details.

Quoted 3 lines
---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676

++++++++++++++++++++++++++++++++++++++++

Quoted 2 lines
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480

++++++++++++++++++++++++++++

Review

Quoted 9 lines
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 68 lines

new file mode 100644
index 0000000..a684331

drivers/gpu/drm/kmb/kmb_crtc.c new file +63 -0
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+	u32 vfront_porch;
+	u32 vback_porch;
+	u32 vsync_len;
+	u32 hfront_porch;
+	u32 hback_porch;
+	u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Set which interval to generate vertical interrupt */
+	kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+		      LCD_VSTATUS_COMPARE_VSYNC);
+	/* Enable vertical interrupt */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+	return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Disable vertical interrupt */

drivers/gpu/drm/kmb/kmb_crtc.c line 73

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+	.destroy = drm_crtc_cleanup,
+	.set_config = drm_atomic_helper_set_config,
+	.page_flip = drm_atomic_helper_page_flip,
+	.reset = drm_atomic_helper_crtc_reset,
+	.atomic_duplicate_state =

drm_atomic_helper_crtc_duplicate_state,

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+	.enable_vblank = kmb_crtc_enable_vblank,
+	.disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_display_mode *m = &crtc->state->adjusted_mode;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	struct kmb_crtc_timing vm;
+	int vsync_start_offset;
+	int vsync_end_offset;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+	unsigned int val = 0;
+
+	/* Initialize mipi */
+	kmb_dsi_hw_init(dev, m);
+	drm_info(dev,
+		 "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d

hsync_len=%d\n",

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+		 m->crtc_vsync_start - m->crtc_vdisplay,
+		 m->crtc_vtotal - m->crtc_vsync_end,
+		 m->crtc_vsync_end - m->crtc_vsync_start,
+		 m->crtc_hsync_start - m->crtc_hdisplay,
+		 m->crtc_htotal - m->crtc_hsync_end,
+		 m->crtc_hsync_end - m->crtc_hsync_start);
+	val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+	vm.vfront_porch = 2;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	vm.vback_porch = 2;
+	vm.vsync_len = 8;
+	vm.hfront_porch = 0;
+	vm.hback_porch = 0;
+	vm.hsync_len = 28;
+
+	vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+	vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+	drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-

w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",

drivers/gpu/drm/kmb/kmb_crtc.c line 114

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2 -0
+		__func__, __LINE__,
+			m->crtc_vdisplay, vm.vback_porch,

vm.vfront_porch,

Quoted 69 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +69 -0
+			vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+			vm.hfront_porch, vm.hsync_len);
+	kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+		      m->crtc_vdisplay - 1);
+	kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+	kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+	kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+	kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+		      m->crtc_hdisplay - 1);
+	kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+	kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+	kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+	/* This is hardcoded as 0 in the Myriadx code */
+	kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+	kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+	/* Back ground color */
+	kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+	if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+		kmb_write_lcd(kmb,
+			      LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+		kmb_write_lcd(kmb,
+			      LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+		kmb_write_lcd(kmb,
+			      LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+		kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+			      m->crtc_vdisplay - 1);
+		/* This is hardcoded as 10 in the Myriadx code */
+		kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+		kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+	}
+	kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+				   struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	clk_prepare_enable(lcd->clk);
+	kmb_crtc_set_mode(crtc);
+	drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+				    struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	/* due to hw limitations, planes need to be off when crtc is off */
+	drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+	drm_crtc_vblank_off(crtc);
+	clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)

drivers/gpu/drm/kmb/kmb_crtc.c line 193

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+
+	spin_lock_irq(&crtc->dev->event_lock);
+	if (crtc->state->event)
+		drm_crtc_send_vblank_event(crtc, crtc->state->event);

Uh, you have vblank event support, but you immediately send out the vblank
event. That breaks userspace assumptions. You probably want to use drm_crtc_arm_vblank_event here. Also there's tons of races that can possibly happen, so please read the kerneldoc comment for that function carefully - you probably need to validate that the vblank event arming, vblank process and re-enabling of LCD_INT_ENABLE cannot race against each
another in bad ways.

Also we have igt testcases for this, so please run them:

https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#validating-
changes-with-igt

Review

Quoted 33 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +22 -0
+	crtc->state->event = NULL;
+	spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {
+	.atomic_begin = kmb_crtc_atomic_begin,
+	.atomic_enable = kmb_crtc_atomic_enable,
+	.atomic_disable = kmb_crtc_atomic_disable,
+	.atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *primary;
+	int ret;
+
+	primary = kmb_plane_init(drm);
+	if (IS_ERR(primary))
+		return PTR_ERR(primary);
+
+	ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary-

base_plane,

drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+					NULL, &kmb_crtc_funcs, NULL);
+	if (ret) {
+		kmb_plane_destroy(&primary->base_plane);
+		return ret;
+	}
+
+	drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+	return 0;
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.c

Quoted 42 lines

new file mode 100644
index 0000000..e413099

drivers/gpu/drm/kmb/kmb_drv.c new file +37 -0
@@ -0,0 +1,676 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/console.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
+
+#include <drm/drm.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_regs.h"
+
+int kmb_under_flow = 0, kmb_flush_done = 0, layer_no = 0;
+static struct kmb_clock kmb_clk;

drivers/gpu/drm/kmb/kmb_drv.c line 47

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+static struct drm_bridge *adv_bridge;
+
+int kmb_display_clk_enable(struct kmb_drm_private *kmb)
+{
+	int ret = 0;
+
+	ret = clk_prepare_enable(kmb_clk.clk_lcd);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n",

ret);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n",

ret);

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11 -0
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_ecfg);
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_ECFG clock: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_cfg);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_CFG clock: %d\n", ret);
+		return ret;
+	}
+	DRM_INFO("SUCCESS : enabled LCD MIPI clocks\n");
+	return 0;
+}
+
+int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct device

*dev)

Quoted 37 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+{
+	struct device_node *vpu_dev;
+	unsigned long clk;
+	int ret = 0;
+
+	kmb_clk.clk_lcd = clk_get(dev, "clk_lcd");
+	if (IS_ERR(kmb_clk.clk_lcd)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_lcd\n");
+		return PTR_ERR(kmb_clk.clk_lcd);
+	}
+
+	kmb_clk.clk_mipi = clk_get(dev, "clk_mipi");
+	if (IS_ERR(kmb_clk.clk_mipi)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi\n");
+		return PTR_ERR(kmb_clk.clk_mipi);
+	}
+
+	kmb_clk.clk_mipi_ecfg = clk_get(dev, "clk_mipi_ecfg");
+	if (IS_ERR(kmb_clk.clk_mipi_ecfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_ecfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_ecfg);
+	}
+
+	kmb_clk.clk_mipi_cfg = clk_get(dev, "clk_mipi_cfg");
+	if (IS_ERR(kmb_clk.clk_mipi_cfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_cfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_cfg);
+	}
+	vpu_dev = of_find_node_by_path("/soc/vpu-ipc");
+	kmb_clk.clk_pll0 = of_clk_get_by_name(vpu_dev, "pll_0_out_0");
+	if (IS_ERR(kmb_clk.clk_pll0)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_pll0 ");
+		return PTR_ERR(kmb_clk.clk_pll0);
+	}
+	kmb->sys_clk_mhz = clk_get_rate(kmb_clk.clk_pll0) / 1000000;
+	drm_info(&kmb->drm, "system clk = %d Mhz", kmb-

sys_clk_mhz);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+	/* Set LCD clock to 200 Mhz */
+	clk_set_rate(kmb_clk.clk_lcd, KMB_LCD_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_lcd) != KMB_LCD_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_lcd to %d\n",
+			KMB_LCD_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_lcd = %ld\n",

clk_get_rate(kmb_clk.clk_lcd));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+	/* Set MIPI clock to 24 Mhz */
+	clk_set_rate(kmb_clk.clk_mipi, KMB_MIPI_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_mipi) != KMB_MIPI_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_mipi to %d\n",
+			KMB_MIPI_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_mipi = %ld\n",

clk_get_rate(kmb_clk.clk_mipi));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_ECFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_ecfg,

KMB_MIPI_DEFAULT_CFG_CLK);

Quoted 36 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+		clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set to clk_mipi_ecfg to %d\n",
+				 KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_CFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_cfg, 24000000);
+		clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set clk_mipi_cfg to %d\n",
+				  KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	ret = kmb_display_clk_enable(kmb);
+	if (ret)
+		return ret;
+
+	/* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_CLK_CTRL, 0x1fff);
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_RSTN_CTRL, 0xffffffff);
+	return 0;
+}
+
+static int kmb_display_clk_disable(void)
+{
+	if (kmb_clk.clk_lcd)
+		clk_disable_unprepare(kmb_clk.clk_lcd);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (kmb_clk.clk_mipi)
+		clk_disable_unprepare(kmb_clk.clk_mipi);
+	if (kmb_clk.clk_mipi_ecfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_ecfg);
+	if (kmb_clk.clk_mipi_cfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_cfg);
+	return 0;
+}
+
+static void __iomem *kmb_map_mmio(struct drm_device *drm, char

*name)

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+{
+	struct resource *res;
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	void __iomem *mem;
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

name);

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +28 -0
+	if (!res) {
+		drm_err(drm, "failed to get resource for %s", name);
+		return ERR_PTR(-ENOMEM);
+	}
+	mem = devm_ioremap_resource(drm->dev, res);
+	if (IS_ERR(mem))
+		drm_err(drm, "failed to ioremap %s registers", name);
+	return mem;
+}
+
+static int kmb_hw_init(struct drm_device *drm, unsigned long flags)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	int irq_lcd;
+	int ret = 0;
+
+	/* Map LCD MMIO registers */
+	kmb->lcd_mmio = kmb_map_mmio(drm, "lcd_regs");
+	if (IS_ERR(kmb->lcd_mmio)) {
+		drm_err(&kmb->drm, "failed to map LCD registers\n");
+		return -ENOMEM;
+	}
+
+	/* Map MIPI MMIO registers */
+	kmb->mipi_mmio = kmb_map_mmio(drm, "mipi_regs");
+	if (IS_ERR(kmb->mipi_mmio)) {
+		drm_err(&kmb->drm, "failed to map MIPI registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+		iounmap(kmb->lcd_mmio);
+		return -ENOMEM;
+	}
+
+	/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and
+	 * MSS_CAM_CLK_CTRL register
+	 */
+	kmb->msscam_mmio = kmb_map_mmio(drm, "msscam_regs");
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

Quoted 54 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +54 -0
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+	/* Enable display clocks */
+	kmb_initialize_clocks(kmb, &pdev->dev);
+
+	/* Register irqs here - section 17.3 in databook
+	 * lists LCD at 79 and 82 for MIPI under MSS CPU -
+	 * firmware has redirected 79 to A53 IRQ 33
+	 */
+
+	/* Allocate LCD interrupt resources */
+	irq_lcd = platform_get_irq_byname(pdev, "irq_lcd");
+	if (irq_lcd < 0) {
+		drm_err(&kmb->drm, "irq_lcd not found");
+		goto setup_fail;
+	}
+
+	/* Get the optional framebuffer memory resource */
+	ret = of_reserved_mem_device_init(drm->dev);
+	if (ret && ret != -ENODEV)
+		return ret;
+
+	spin_lock_init(&kmb->irq_lock);
+
+	kmb->irq_lcd = irq_lcd;
+
+	return 0;
+
+ setup_fail:
+	of_reserved_mem_device_release(drm->dev);
+
+	return ret;
+}
+
+static const struct drm_mode_config_funcs kmb_mode_config_funcs = {
+	.fb_create = drm_gem_fb_create,
+	.atomic_check = drm_atomic_helper_check,
+	.atomic_commit = drm_atomic_helper_commit,
+};
+
+static int kmb_setup_mode_config(struct drm_device *drm)
+{
+	int ret;
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	ret = drmm_mode_config_init(drm);
+	if (ret)
+		return ret;
+	drm->mode_config.min_width = KMB_MIN_WIDTH;
+	drm->mode_config.min_height = KMB_MIN_HEIGHT;
+	drm->mode_config.max_width = KMB_MAX_WIDTH;
+	drm->mode_config.max_height = KMB_MAX_HEIGHT;

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	drm->mode_config.funcs = &kmb_mode_config_funcs;
+
+	ret = kmb_setup_crtc(drm);
+	if (ret < 0) {
+		drm_err(drm, "failed to create crtc\n");
+		return ret;
+	}
+
+	/* Initialize MIPI DSI */
+	ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 20 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +20 -0
+	if (ret) {
+		drm_err(drm, "failed to initialize DSI\n");
+		return ret;
+	}
+
+	/* Set the CRTC's port so that the encoder component can find it */
+	kmb->crtc.port = of_graph_get_port_by_id(drm->dev->of_node, 0);
+	ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+	if (ret < 0) {
+		drm_err(drm, "failed to initialize vblank\n");
+		pm_runtime_disable(drm->dev);
+		return ret;
+	}
+
+	drm_mode_config_reset(drm);
+	return 0;
+}
+
+static irqreturn_t handle_lcd_irq(struct drm_device *dev)
+{

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	unsigned long status, val, val1;
+	int plane_id, dma0_state, dma1_state;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	status = kmb_read_lcd(kmb, LCD_INT_STATUS);
+
+	if (status & LCD_INT_EOF) {
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF);
+
+		/* When disabling/enabling LCD layers, the change takes

effect

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+		 * immediately and does not wait for EOF (end of frame).
+		 * When kmb_plane_atomic_disable is called, mark the

plane as

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+		 * disabled but actually disable the plane when EOF irq is
+		 * being handled.
+		 */
+		for (plane_id = LAYER_0;
+				plane_id < KMB_MAX_PLANES; plane_id++)

{

drivers/gpu/drm/kmb/kmb_drv.c line 337

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			if (kmb->plane_status[plane_id].disable) {
+				kmb_clr_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (plane_id),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+
+				kmb_clr_bitmask_lcd(kmb, LCD_CONTROL,
+						    kmb-

plane_status[plane_id].ctrl);

drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+				kmb->plane_status[plane_id].disable = false;
+			}
+		}
+		if (kmb_under_flow) {
+			/* DMA Recovery after underflow */
+			dma0_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA0_STATE :

LCD_VIDEO1_DMA0_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			dma1_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA1_STATE :

LCD_VIDEO1_DMA1_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+			do {
+				kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+				val = kmb_read_lcd(kmb, dma0_state)
+				    & LCD_DMA_STATE_ACTIVE;
+				val1 = kmb_read_lcd(kmb, dma1_state)
+				    & LCD_DMA_STATE_ACTIVE;
+			} while ((val || val1));
+			/* disable dma */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(layer_no),

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+					    LCD_DMA_LAYER_ENABLE);
+			kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+			kmb_flush_done = 1;
+			kmb_under_flow = 0;
+		}
+	}
+
+	if (status & LCD_INT_LINE_CMP) {
+		/* clear line compare interrupt */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LINE_CMP);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	}
+
+	if (status & LCD_INT_VERT_COMP) {
+		/* Read VSTATUS */
+		val = kmb_read_lcd(kmb, LCD_VSTATUS);
+		val = (val & LCD_VSTATUS_VERTICAL_STATUS_MASK);
+		switch (val) {
+		case LCD_VSTATUS_COMPARE_VSYNC:
+			/* Clear vertical compare interrupt */
+			kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

drivers/gpu/drm/kmb/kmb_drv.c line 422

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			if (kmb_flush_done) {
+				kmb_set_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (layer_no),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c line 387

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+				kmb_flush_done = 0;
+			}
+			drm_handle_vblank(dev, 0);

Would be nice to use the new-style drm_crtc_handle_vblank here.

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			break;
+		case LCD_VSTATUS_COMPARE_BACKPORCH:
+		case LCD_VSTATUS_COMPARE_ACTIVE:
+		case LCD_VSTATUS_COMPARE_FRONT_PORCH:
+			kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			break;
+		}
+	}
+	if (status & LCD_INT_DMA_ERR) {

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+		val =
+		    (status & LCD_INT_DMA_ERR &
+		     kmb_read_lcd(kmb, LCD_INT_ENABLE));
+		/* LAYER0 - VL0 */
+		if (val & (LAYER0_DMA_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER0:VL0 DMA UNDERFLOW val =

0x%lx,under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1 -0
+					    LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(0),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+			layer_no = 0;
+		}
+
+		if (val & LAYER0_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER0_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER0_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+		/* LAYER1 - VL1 */
+		if (val & (LAYER1_DMA_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER1:VL1 DMA UNDERFLOW val =

0x%lx, under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1 -0
+					    LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(1),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+			layer_no = 1;
+		}
+
+		/* LAYER1 - VL1 */
+		if (val & LAYER1_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER1_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER1_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+		/* LAYER2 - GL0 */
+		if (val & LAYER2_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER2_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+		/* LAYER3 - GL1 */
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA OVERFLOW val = 0x%lx",

val);

Quoted 74 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +74 -0
+	}
+
+	if (status & LCD_INT_LAYER) {
+		/* Clear layer interrupts */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LAYER);
+	}
+
+	/* Clear all interrupts */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, 1);
+	return IRQ_HANDLED;
+}
+
+/* IRQ handler */
+static irqreturn_t kmb_isr(int irq, void *arg)
+{
+	struct drm_device *dev = (struct drm_device *)arg;
+
+	handle_lcd_irq(dev);
+	return IRQ_HANDLED;
+}
+
+static void kmb_irq_reset(struct drm_device *drm)
+{
+	kmb_write_lcd(to_kmb(drm), LCD_INT_CLEAR, 0xFFFF);
+	kmb_write_lcd(to_kmb(drm), LCD_INT_ENABLE, 0);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(fops);
+
+static struct drm_driver kmb_driver = {
+	.driver_features = DRIVER_GEM |
+	    DRIVER_MODESET | DRIVER_ATOMIC,
+	.irq_handler = kmb_isr,
+	.irq_preinstall = kmb_irq_reset,
+	.irq_uninstall = kmb_irq_reset,
+	/* GEM Operations */
+	.fops = &fops,
+	DRM_GEM_CMA_DRIVER_OPS_VMAP,
+	.name = "kmb-drm",
+	.desc = "KEEMBAY DISPLAY DRIVER ",
+	.date = "20190122",
+	.major = 1,
+	.minor = 0,
+};
+
+static int kmb_remove(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	drm_dev_unregister(drm);
+	drm_kms_helper_poll_fini(drm);
+	of_node_put(kmb->crtc.port);
+	kmb->crtc.port = NULL;
+	pm_runtime_get_sync(drm->dev);
+	drm_irq_uninstall(drm);
+	pm_runtime_put_sync(drm->dev);
+	pm_runtime_disable(drm->dev);
+
+	of_reserved_mem_device_release(drm->dev);
+
+	/* Release clks */
+	kmb_display_clk_disable();
+	clk_put(kmb_clk.clk_lcd);
+	clk_put(kmb_clk.clk_mipi);
+
+	dev_set_drvdata(dev, NULL);
+
+	/* Unregister DSI host */
+	kmb_dsi_host_unregister();
+	return 0;
+}
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+static int kmb_probe(struct platform_device *pdev)
+{
+	struct device *dev = get_device(&pdev->dev);
+	struct kmb_drm_private *kmb;
+	int ret = 0;
+
+	/* The bridge (ADV 7535) will return -EPROBE_DEFER until it
+	 * has a mipi_dsi_host to register its device to. So, we
+	 * first register the DSI host during probe time, and then return
+	 * -EPROBE_DEFER until the bridge is loaded. Probe will be called

again

Quoted 85 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +85 -0
+	 *  and then the rest of the driver initialization can proceed
+	 *  afterwards and the bridge can be successfully attached.
+	 */
+	adv_bridge = kmb_dsi_host_bridge_init(dev);
+
+	if (adv_bridge == ERR_PTR(-EPROBE_DEFER)) {
+		return -EPROBE_DEFER;
+	} else if (IS_ERR(adv_bridge)) {
+		DRM_ERROR("probe failed to initialize DSI host bridge\n");
+		return PTR_ERR(adv_bridge);
+	}
+
+	/* Create DRM device */
+	kmb = devm_drm_dev_alloc(dev, &kmb_driver,
+				 struct kmb_drm_private, drm);
+	if (IS_ERR(kmb))
+		return PTR_ERR(kmb);
+
+	dev_set_drvdata(dev, &kmb->drm);
+
+	ret = kmb_hw_init(&kmb->drm, 0);
+	if (ret)
+		goto err_free1;
+
+	ret = kmb_setup_mode_config(&kmb->drm);
+	if (ret)
+		goto err_free;
+
+	ret = drm_irq_install(&kmb->drm, kmb->irq_lcd);
+	if (ret < 0) {
+		drm_err(&kmb->drm, "failed to install IRQ handler\n");
+		goto err_irq;
+	}
+
+	drm_kms_helper_poll_init(&kmb->drm);
+
+	/* Register graphics device with the kernel */
+	ret = drm_dev_register(&kmb->drm, 0);
+	if (ret)
+		goto err_register;
+
+	return 0;
+
+ err_register:
+	drm_kms_helper_poll_fini(&kmb->drm);
+ err_irq:
+	pm_runtime_disable(kmb->drm.dev);
+ err_free:
+	drm_crtc_cleanup(&kmb->crtc);
+	drm_mode_config_cleanup(&kmb->drm);
+ err_free1:
+	dev_set_drvdata(dev, NULL);
+	kmb_dsi_host_unregister();
+
+	return ret;
+}
+
+static const struct of_device_id kmb_of_match[] = {
+	{.compatible = "intel,kmb_display"},
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, kmb_of_match);
+
+static int __maybe_unused kmb_pm_suspend(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+	drm_kms_helper_poll_disable(drm);
+
+	kmb->state = drm_atomic_helper_suspend(drm);
+	if (IS_ERR(kmb->state)) {
+		drm_kms_helper_poll_enable(drm);
+		return PTR_ERR(kmb->state);
+	}
+
+	return 0;
+}
+
+static int __maybe_unused kmb_pm_resume(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (!kmb)
+		return 0;
+
+	drm_atomic_helper_resume(drm, kmb->state);
+	drm_kms_helper_poll_enable(drm);
+
+	return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend,

kmb_pm_resume);

Review

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +16 -0
+
+static struct platform_driver kmb_platform_driver = {
+	.probe = kmb_probe,
+	.remove = kmb_remove,
+	.driver = {
+		.name = "kmb-drm",
+		.pm = &kmb_pm_ops,
+		.of_match_table = kmb_of_match,
+	},
+};
+
+module_platform_driver(kmb_platform_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_DESCRIPTION("Keembay Display driver");
+MODULE_LICENSE("GPL v2");
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.h

Quoted 7 lines

new file mode 100644
index 0000000..352f2d2

drivers/gpu/drm/kmb/kmb_drv.h new file +2 -0
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *

drivers/gpu/drm/kmb/kmb_drv.h line 12

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_DRV_H__
+#define __KMB_DRV_H__
+
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+#define KMB_MAX_WIDTH			1920 /*max width in pixels

*/

drivers/gpu/drm/kmb/kmb_drv.h line 13

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.h new file +1 -0
+#define KMB_MAX_HEIGHT			1080 /*max height in

pixels */

Quoted 27 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +27 -0
+#define KMB_MIN_WIDTH                   1920 /*max width in pixels */
+#define KMB_MIN_HEIGHT                  1080 /*max height in pixels */
+#define KMB_LCD_DEFAULT_CLK		200000000
+#define KMB_MIPI_DEFAULT_CLK		24000000
+#define KMB_MIPI_DEFAULT_CFG_CLK	24000000
+#define KMB_SYS_CLK_MHZ			500
+
+#define ICAM_MMIO		0x3b100000
+#define ICAM_LCD_OFFSET		0x1080
+#define ICAM_MMIO_SIZE		0x2000
+
+struct kmb_drm_private {
+	struct drm_device		drm;
+	void __iomem			*lcd_mmio;
+	void __iomem			*mipi_mmio;
+	void __iomem			*msscam_mmio;
+	struct clk			*clk;
+	struct drm_crtc			crtc;
+	struct kmb_plane		*plane;
+	struct drm_atomic_state		*state;
+	spinlock_t			irq_lock;
+	int				irq_lcd;
+	int				irq_mipi;
+	int				sys_clk_mhz;
+	dma_addr_t			fb_addr;
+	struct layer_status		plane_status[KMB_MAX_PLANES];
+};

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+struct kmb_clock {
+	struct clk *clk_lcd;
+	struct clk *clk_mipi;
+	struct clk *clk_mipi_ecfg;
+	struct clk *clk_mipi_cfg;
+	struct clk *clk_pll0;
+};
+
+static inline struct kmb_drm_private *to_kmb(const struct drm_device

*dev)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+	return container_of(dev, struct kmb_drm_private, drm);
+}
+
+static inline struct kmb_drm_private *crtc_to_kmb_priv(const struct

drm_crtc *x)

Quoted 23 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +23 -0
+{
+	return container_of(x, struct kmb_drm_private, crtc);
+}
+
+struct blt_layer_config {
+	unsigned char layer_format;
+};
+
+static inline void kmb_write_lcd(struct kmb_drm_private *dev_p,
+				 unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->lcd_mmio + reg));
+}
+
+static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
+				  unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->mipi_mmio + reg));
+}
+
+static inline void kmb_write_msscam(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 value)
+{

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+	writel(value, (dev_p->msscam_mmio + reg));
+}
+
+static inline u32 kmb_read_msscam(struct kmb_drm_private *dev_p,
+				  unsigned int reg)
+{
+	return readl(dev_p->msscam_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_msscam(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+					  unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_msscam(dev_p, reg);
+
+	kmb_write_msscam(dev_p, reg, (reg_val | mask));
+}
+
+static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p,

unsigned int reg)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+	return readl(dev_p->lcd_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_lcd(struct kmb_drm_private

*dev_p,

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val | mask));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bitmask_lcd(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val & (~mask)));
+}
+
+static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p,

unsigned int reg)

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +25 -0
+{
+	return readl(dev_p->mipi_mmio + reg);
+}
+
+static inline void kmb_write_bits_mipi(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 offset,
+				       u32 num_bits, u32 value)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+	u32 mask = (1 << num_bits) - 1;
+
+	value &= mask;
+	mask <<= offset;
+	reg_val &= (~mask);
+	reg_val |= (value << offset);
+	kmb_write_mipi(dev_p, reg, reg_val);
+}
+
+static inline void kmb_set_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val | (1 << offset));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val & (~(1 << offset)));
+}
+
+static inline void kmb_set_bitmask_mipi(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private

*dev_p,

Review

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val & (~mask)));
+}
+
+int kmb_setup_crtc(struct drm_device *dev);
+void kmb_set_scanout(struct kmb_drm_private *lcd);
+#endif /* __KMB_DRV_H__ */
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.c

Quoted 23 lines

new file mode 100644
index 0000000..d1e7786

drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_plane_helper.h>
+
+#include "kmb_drv.h"
+#include "kmb_plane.h"

drivers/gpu/drm/kmb/kmb_plane.c line 28

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+#include "kmb_regs.h"
+
+const u32 layer_irqs[] = {
+	LCD_INT_VL0,
+	LCD_INT_VL1,
+	LCD_INT_GL0,
+	LCD_INT_GL1
+};
+
+static unsigned int check_pixel_format(struct drm_plane *plane, u32

format)

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+{
+	int i;
+
+	for (i = 0; i < plane->format_count; i++) {
+		if (plane->format_types[i] == format)
+			return 0;
+	}
+	return -EINVAL;
+}
+
+static int kmb_plane_atomic_check(struct drm_plane *plane,
+				  struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	int ret;
+	struct drm_crtc_state *crtc_state;
+	bool can_position;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+	fb = state->fb;
+	if (!fb || !state->crtc)
+		return 0;
+
+	ret = check_pixel_format(plane, fb->format->format);
+	if (ret)
+		return ret;
+
+	if (state->crtc_w > KMB_MAX_WIDTH || state->crtc_h >

KMB_MAX_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 57

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+		return -EINVAL;
+	if (state->crtc_w < KMB_MIN_WIDTH || state->crtc_h <

KMB_MIN_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 67

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		return -EINVAL;
+	can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
+	crtc_state =
+		drm_atomic_get_existing_crtc_state(state->state, state-

crtc);

drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+	return drm_atomic_helper_check_plane_state(state, crtc_state,
+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 1 line

+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +28 -0
+						 can_position, true);
+}
+
+static void kmb_plane_atomic_disable(struct drm_plane *plane,
+				     struct drm_plane_state *state)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+	int plane_id = kmb_plane->id;
+	struct kmb_drm_private *kmb;
+
+	kmb = to_kmb(plane->dev);
+
+	switch (plane_id) {
+	case LAYER_0:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	kmb->plane_status[plane_id].disable = true;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+}
+
+unsigned int get_pixel_format(u32 format)
+{
+	unsigned int val = 0;
+
+	switch (format) {
+		/* planar formats */
+	case DRM_FORMAT_YUV444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_NV12:
+		val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_NV21:
+		val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+		/* packed formats */
+		/* looks hw requires B & G to be swapped when RGB */
+	case DRM_FORMAT_RGB332:
+		val = LCD_LAYER_FORMAT_RGB332 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR4444:
+		val = LCD_LAYER_FORMAT_RGBX4444;
+		break;
+	case DRM_FORMAT_ARGB4444:
+		val = LCD_LAYER_FORMAT_RGBA4444 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_ABGR4444:
+		val = LCD_LAYER_FORMAT_RGBA4444;
+		break;
+	case DRM_FORMAT_XRGB1555:
+		val = LCD_LAYER_FORMAT_XRGB1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR1555:
+		val = LCD_LAYER_FORMAT_XRGB1555;
+		break;
+	case DRM_FORMAT_ARGB1555:
+		val = LCD_LAYER_FORMAT_RGBA1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_ABGR1555:
+		val = LCD_LAYER_FORMAT_RGBA1555;
+		break;
+	case DRM_FORMAT_RGB565:
+		val = LCD_LAYER_FORMAT_RGB565 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_BGR565:
+		val = LCD_LAYER_FORMAT_RGB565;
+		break;
+	case DRM_FORMAT_RGB888:
+		val = LCD_LAYER_FORMAT_RGB888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_BGR888:
+		val = LCD_LAYER_FORMAT_RGB888;
+		break;
+	case DRM_FORMAT_XRGB8888:
+		val = LCD_LAYER_FORMAT_RGBX8888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR8888:
+		val = LCD_LAYER_FORMAT_RGBX8888;
+		break;
+	case DRM_FORMAT_ARGB8888:
+		val = LCD_LAYER_FORMAT_RGBA8888 |

LCD_LAYER_BGR_ORDER;

Quoted 35 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +35 -0
+		break;
+	case DRM_FORMAT_ABGR8888:
+		val = LCD_LAYER_FORMAT_RGBA8888;
+		break;
+	}
+	DRM_INFO_ONCE("%s : %d format=0x%x val=0x%x\n",
+		      __func__, __LINE__, format, val);
+	return val;
+}
+
+unsigned int get_bits_per_pixel(const struct drm_format_info *format)
+{
+	u32 bpp = 0;
+	unsigned int val = 0;
+
+	if (format->num_planes > 1) {
+		val = LCD_LAYER_8BPP;
+		return val;
+	}
+
+	bpp += 8 * format->cpp[0];
+
+	switch (bpp) {
+	case 8:
+		val = LCD_LAYER_8BPP;
+		break;
+	case 16:
+		val = LCD_LAYER_16BPP;
+		break;
+	case 24:
+		val = LCD_LAYER_24BPP;
+		break;
+	case 32:
+		val = LCD_LAYER_32BPP;
+		break;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	}
+
+	DRM_DEBUG("bpp=%d val=0x%x\n", bpp, val);
+	return val;
+}
+
+static void config_csc(struct kmb_drm_private *kmb, int plane_id)
+{
+	/* YUV to RGB conversion using the fixed matrix csc_coef_lcd */
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id),

csc_coef_lcd[0]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id),

csc_coef_lcd[1]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id),

csc_coef_lcd[2]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id),

csc_coef_lcd[3]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id),

csc_coef_lcd[4]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id),

csc_coef_lcd[5]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id),

csc_coef_lcd[6]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id),

csc_coef_lcd[7]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id),

csc_coef_lcd[8]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id),

csc_coef_lcd[9]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id),

csc_coef_lcd[10]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id),

csc_coef_lcd[11]);

Quoted 22 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +22 -0
+}
+
+static void kmb_plane_atomic_update(struct drm_plane *plane,
+				    struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	struct kmb_drm_private *kmb;
+	unsigned int width;
+	unsigned int height;
+	unsigned int dma_len;
+	struct kmb_plane *kmb_plane;
+	unsigned int dma_cfg;
+	unsigned int ctrl = 0, val = 0, out_format = 0;
+	unsigned int src_w, src_h, crtc_x, crtc_y;
+	unsigned char plane_id;
+	int num_planes;
+	static dma_addr_t addr[MAX_SUB_PLANES];
+
+	if (!plane || !plane->state || !state)
+		return;
+
+	fb = plane->state->fb;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	if (!fb)
+		return;
+	num_planes = fb->format->num_planes;
+	kmb_plane = to_kmb_plane(plane);
+	plane_id = kmb_plane->id;
+
+	kmb = to_kmb(plane->dev);
+
+	if (kmb_under_flow || kmb_flush_done) {
+		drm_dbg(&kmb->drm, "plane_update:underflow!!!!

returning");

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+		return;
+	}
+
+	src_w = (plane->state->src_w >> 16);
+	src_h = plane->state->src_h >> 16;
+	crtc_x = plane->state->crtc_x;
+	crtc_y = plane->state->crtc_y;
+
+	drm_dbg(&kmb->drm,
+		"src_w=%d src_h=%d, fb->format->format=0x%x fb-

flags=0x%x\n",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8 -0
+		  src_w, src_h, fb->format->format, fb->flags);
+
+	width = fb->width;
+	height = fb->height;
+	dma_len = (width * height * fb->format->cpp[0]);
+	drm_dbg(&kmb->drm, "dma_len=%d ", dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id),

dma_len);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
+		      fb->pitches[0]);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
+		      (width * fb->format->cpp[0]));

drivers/gpu/drm/kmb/kmb_plane.c line 303

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+	addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
+	kmb->fb_addr = addr[Y_PLANE];
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
+		      addr[Y_PLANE] + fb->offsets[0]);
+	val = get_pixel_format(fb->format->format);
+	val |= get_bits_per_pixel(fb->format);
+	/* Program Cb/Cr for planar formats */
+	if (num_planes > 1) {
+		kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+			      width * fb->format->cpp[0]);
+		kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+			      (width * fb->format->cpp[0]));
+
+		addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane-

state,

drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+							U_PLANE);
+		/* check if Cb/Cr is swapped*/
+		if (num_planes == 3 && (val & LCD_LAYER_CRCB_ORDER))
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+					addr[U_PLANE]);
+		else
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 315

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+					addr[U_PLANE]);
+
+		if (num_planes == 3) {
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 319

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+				      ((width) * fb->format->cpp[0]));
+
+			kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+				      ((width) * fb->format->cpp[0]));
+
+			addr[V_PLANE] = drm_fb_cma_get_gem_addr(fb,
+								plane->state,
+								V_PLANE);
+
+			/* check if Cb/Cr is swapped*/
+			if (val & LCD_LAYER_CRCB_ORDER)
+				kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+					      addr[V_PLANE]);
+			else
+				kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

Quoted 46 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +46 -0
+					      addr[V_PLANE]);
+		}
+	}
+
+	kmb_write_lcd(kmb, LCD_LAYERn_WIDTH(plane_id), src_w - 1);
+	kmb_write_lcd(kmb, LCD_LAYERn_HEIGHT(plane_id), src_h - 1);
+	kmb_write_lcd(kmb, LCD_LAYERn_COL_START(plane_id), crtc_x);
+	kmb_write_lcd(kmb, LCD_LAYERn_ROW_START(plane_id), crtc_y);
+
+	val |= LCD_LAYER_FIFO_100;
+
+	if (val & LCD_LAYER_PLANAR_STORAGE) {
+		val |= LCD_LAYER_CSC_EN;
+
+		/* Enable CSC if input is planar and output is RGB */
+		config_csc(kmb, plane_id);
+	}
+
+	kmb_write_lcd(kmb, LCD_LAYERn_CFG(plane_id), val);
+
+	switch (plane_id) {
+	case LAYER_0:
+		ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE
+	    | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED;
+
+	/* LCD is connected to MIPI on kmb
+	 * Therefore this bit is required for DSI Tx
+	 */
+	ctrl |= LCD_CTRL_VHSYNC_IDLE_LVL;
+
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, ctrl);
+
+	/* FIXME no doc on how to set output format,these values are

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	 * taken from the Myriadx tests
+	 */
+	out_format |= LCD_OUTF_FORMAT_RGB888;
+
+	/* Leave RGB order,conversion mode and clip mode to default */
+	/* do not interleave RGB channels for mipi Tx compatibility */
+	out_format |= LCD_OUTF_MIPI_RGB_MODE;
+	kmb_write_lcd(kmb, LCD_OUT_FORMAT_CFG, out_format);
+
+	dma_cfg = LCD_DMA_LAYER_ENABLE |

LCD_DMA_LAYER_VSTRIDE_EN |

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	    LCD_DMA_LAYER_CONT_UPDATE |

LCD_DMA_LAYER_AXI_BURST_16;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+
+	/* Enable DMA */
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id), dma_cfg);
+	drm_dbg(&kmb->drm, "dma_cfg=0x%x LCD_DMA_CFG=0x%x\n",

dma_cfg,

Quoted 18 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
+		kmb_read_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id)));
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF |
+			LCD_INT_DMA_ERR);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, LCD_INT_EOF |
+			LCD_INT_DMA_ERR);
+}
+
+static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
+	.atomic_check = kmb_plane_atomic_check,
+	.atomic_update = kmb_plane_atomic_update,
+	.atomic_disable = kmb_plane_atomic_disable
+};
+
+void kmb_plane_destroy(struct drm_plane *plane)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	drm_plane_cleanup(plane);
+	kfree(kmb_plane);
+}
+
+static const struct drm_plane_funcs kmb_plane_funcs = {
+	.update_plane = drm_atomic_helper_update_plane,
+	.disable_plane = drm_atomic_helper_disable_plane,
+	.destroy = kmb_plane_destroy,
+	.reset = drm_atomic_helper_plane_reset,
+	.atomic_duplicate_state =

drm_atomic_helper_plane_duplicate_state,

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+};
+
+struct kmb_plane *kmb_plane_init(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *plane = NULL;
+	struct kmb_plane *primary = NULL;
+	int i = 0;
+	int ret = 0;
+	enum drm_plane_type plane_type;
+	const u32 *plane_formats;
+	int num_plane_formats;
+
+	for (i = 0; i < KMB_MAX_PLANES; i++) {
+		plane = drmm_kzalloc(drm, sizeof(*plane), GFP_KERNEL);
+

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+		if (!plane) {
+			drm_err(drm, "Failed to allocate plane\n");
+			return ERR_PTR(-ENOMEM);
+		}
+
+		plane_type = (i == 0) ? DRM_PLANE_TYPE_PRIMARY :
+		    DRM_PLANE_TYPE_OVERLAY;
+		if (i < 2) {
+			plane_formats = kmb_formats_v;
+			num_plane_formats =

ARRAY_SIZE(kmb_formats_v);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		} else {
+			plane_formats = kmb_formats_g;
+			num_plane_formats =

ARRAY_SIZE(kmb_formats_g);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		}
+
+		ret = drm_universal_plane_init(drm, &plane->base_plane,
+					       POSSIBLE_CRTCS,

&kmb_plane_funcs,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+					       plane_formats,

num_plane_formats,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+					       NULL, plane_type, "plane %d", i);
+		if (ret < 0) {
+			drm_err(drm, "drm_universal_plane_init failed

(ret=%d)",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +13 -0
+				ret);
+			goto cleanup;
+		}
+		drm_dbg(drm, "%s : %d i=%d type=%d",
+			__func__, __LINE__,
+			  i, plane_type);
+		drm_plane_helper_add(&plane->base_plane,
+				     &kmb_plane_helper_funcs);
+		if (plane_type == DRM_PLANE_TYPE_PRIMARY) {
+			primary = plane;
+			kmb->plane = plane;
+		}
+		drm_dbg(drm, "%s : %d primary=%p\n", __func__,

__LINE__,

Review

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0
+			&primary->base_plane);
+		plane->id = i;
+	}
+
+	return primary;
+cleanup:
+	drmm_kfree(drm, plane);
+	return ERR_PTR(ret);
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.h

Quoted 21 lines

new file mode 100644
index 0000000..141cdaa

drivers/gpu/drm/kmb/kmb_plane.h new file +16 -0
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_PLANE_H__
+#define __KMB_PLANE_H__
+
+extern int kmb_under_flow;
+extern int kmb_flush_done;
+
+#define LCD_INT_VL0_ERR ((LAYER0_DMA_FIFO_UNDERFLOW) | \
+			(LAYER0_DMA_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CB_FIFO_OVERFLOW) | \
+			(LAYER0_DMA_CB_FIFO_UNDERFLOW) | \
+			(LAYER0_DMA_CR_FIFO_OVERFLOW) | \

drivers/gpu/drm/kmb/kmb_plane.h line 26

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+			(LAYER0_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_VL1_ERR ((LAYER1_DMA_FIFO_UNDERFLOW) | \
+			(LAYER1_DMA_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CB_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CB_FIFO_UNDERFLOW) | \
+			(LAYER1_DMA_CR_FIFO_OVERFLOW) | \
+			(LAYER1_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_GL0_ERR (LAYER2_DMA_FIFO_OVERFLOW |

LAYER2_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h line 27

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL1_ERR (LAYER3_DMA_FIFO_OVERFLOW |

LAYER3_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h line 28

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_VL0 (LAYER0_DMA_DONE | LAYER0_DMA_IDLE |

LCD_INT_VL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 29

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_VL1 (LAYER1_DMA_DONE | LAYER1_DMA_IDLE |

LCD_INT_VL1_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 30

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL0 (LAYER2_DMA_DONE | LAYER2_DMA_IDLE |

LCD_INT_GL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 31

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL1 (LAYER3_DMA_DONE | LAYER3_DMA_IDLE |

LCD_INT_GL1_ERR)

Quoted 19 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +19 -0
+#define LCD_INT_DMA_ERR (LCD_INT_VL0_ERR | LCD_INT_VL1_ERR \
+		| LCD_INT_GL0_ERR | LCD_INT_GL1_ERR)
+
+#define POSSIBLE_CRTCS 1
+#define to_kmb_plane(x) container_of(x, struct kmb_plane, base_plane)
+
+enum layer_id {
+	LAYER_0,
+	LAYER_1,
+	LAYER_2,
+	LAYER_3,
+	/* KMB_MAX_PLANES */
+};
+
+#define KMB_MAX_PLANES 1
+
+enum sub_plane_id {
+	Y_PLANE,
+	U_PLANE,

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+	V_PLANE,
+	MAX_SUB_PLANES,
+};
+
+struct kmb_plane {
+	struct drm_plane base_plane;
+	unsigned char id;
+};
+
+/* Graphics layer (layers 2 & 3) formats, only packed formats  are

supported */

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +6 -0
+static const u32 kmb_formats_g[] = {
+	DRM_FORMAT_RGB332,
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

drivers/gpu/drm/kmb/kmb_plane.h line 72

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+	DRM_FORMAT_XRGB4444, DRM_FORMAT_XBGR4444,
+	DRM_FORMAT_ARGB4444, DRM_FORMAT_ABGR4444,
+	DRM_FORMAT_XRGB1555, DRM_FORMAT_XBGR1555,
+	DRM_FORMAT_ARGB1555, DRM_FORMAT_ABGR1555,
+	DRM_FORMAT_RGB565, DRM_FORMAT_BGR565,
+	DRM_FORMAT_RGB888, DRM_FORMAT_BGR888,
+	DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888,
+	DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888,
+};
+
[… more lines in the raw message]

supported */

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +25 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

The static const arrays above look a bit strange in a header file (and could result in duplication in the driver .ko), please move to .c files. Headers should only contain definitions, not declarations of actual storage.

Cheers, Daniel

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2.7.4

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

7 lines not shown · raw message

Parts of this message are not shown here. View the raw message.

author maintainer
#8 lore raw

RE: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

In reply to Daniel Vetter

Hi Daniel,
I was finally able to test the driver with 5.9 kernel with minor changes in the driver.
Ran the igt_vblank test and it passed/skipped all the subtests except the pipe-A-accuracy-idle test.
Results are attached. Investigated the failing test and it seems like drm_handle_vblank() is taking too long sometimes. I can work on this after we merge.

Will send out V8 with the minor changes and device tree YAML binding file ASAP. Will work on the rest of the review comments after.

Thanks,
Anitha

Quoted 1,931 lines

From: Daniel Vetter <[email protected]>
Sent: Thursday, September 10, 2020 1:31 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>
Subject: Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 1 line · Anitha Chrisanthus

This is a basic KMS atomic modesetting display driver for KeemBay family

of

Quoted 18 lines

SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.(Sam)

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

Quoted 14 lines

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam) use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state

(Sam)

Quoted 4 lines

Sam asked me to take a look at this too, looks reasonable overall. I've spotted a few small things plus a potential functional issue around vblank/event handling. I strongly recommend running the igt test suite over the driver to see whether it all works reasonably ok. See below for details.

Quoted 3 lines
---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676

++++++++++++++++++++++++++++++++++++++++

Quoted 2 lines
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480

++++++++++++++++++++++++++++

Review

Quoted 9 lines
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 68 lines

new file mode 100644
index 0000000..a684331

drivers/gpu/drm/kmb/kmb_crtc.c new file +63 -0
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+	u32 vfront_porch;
+	u32 vback_porch;
+	u32 vsync_len;
+	u32 hfront_porch;
+	u32 hback_porch;
+	u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Set which interval to generate vertical interrupt */
+	kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+		      LCD_VSTATUS_COMPARE_VSYNC);
+	/* Enable vertical interrupt */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+	return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	/* Clear interrupt */
+	kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+	/* Disable vertical interrupt */

drivers/gpu/drm/kmb/kmb_crtc.c line 73

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+	.destroy = drm_crtc_cleanup,
+	.set_config = drm_atomic_helper_set_config,
+	.page_flip = drm_atomic_helper_page_flip,
+	.reset = drm_atomic_helper_crtc_reset,
+	.atomic_duplicate_state =

drm_atomic_helper_crtc_duplicate_state,

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+	.enable_vblank = kmb_crtc_enable_vblank,
+	.disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+	struct drm_device *dev = crtc->dev;
+	struct drm_display_mode *m = &crtc->state->adjusted_mode;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	struct kmb_crtc_timing vm;
+	int vsync_start_offset;
+	int vsync_end_offset;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+	unsigned int val = 0;
+
+	/* Initialize mipi */
+	kmb_dsi_hw_init(dev, m);
+	drm_info(dev,
+		 "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d

hsync_len=%d\n",

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+		 m->crtc_vsync_start - m->crtc_vdisplay,
+		 m->crtc_vtotal - m->crtc_vsync_end,
+		 m->crtc_vsync_end - m->crtc_vsync_start,
+		 m->crtc_hsync_start - m->crtc_hdisplay,
+		 m->crtc_htotal - m->crtc_hsync_end,
+		 m->crtc_hsync_end - m->crtc_hsync_start);
+	val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+	vm.vfront_porch = 2;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+	vm.vback_porch = 2;
+	vm.vsync_len = 8;
+	vm.hfront_porch = 0;
+	vm.hback_porch = 0;
+	vm.hsync_len = 28;
+
+	vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+	vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+	drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-

w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",

drivers/gpu/drm/kmb/kmb_crtc.c line 114

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2 -0
+		__func__, __LINE__,
+			m->crtc_vdisplay, vm.vback_porch,

vm.vfront_porch,

Quoted 69 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +69 -0
+			vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+			vm.hfront_porch, vm.hsync_len);
+	kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+		      m->crtc_vdisplay - 1);
+	kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+	kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+	kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+	kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+		      m->crtc_hdisplay - 1);
+	kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+	kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+	kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+	/* This is hardcoded as 0 in the Myriadx code */
+	kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+	kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+	/* Back ground color */
+	kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+	if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+		kmb_write_lcd(kmb,
+			      LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+		kmb_write_lcd(kmb,
+			      LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+		kmb_write_lcd(kmb,
+			      LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+		kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+			      m->crtc_vdisplay - 1);
+		/* This is hardcoded as 10 in the Myriadx code */
+		kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+		kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+	}
+	kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+				   struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	clk_prepare_enable(lcd->clk);
+	kmb_crtc_set_mode(crtc);
+	drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+				    struct drm_crtc_state *old_state)
+{
+	struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+	/* due to hw limitations, planes need to be off when crtc is off */
+	drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+	drm_crtc_vblank_off(crtc);
+	clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+				  struct drm_crtc_state *state)

drivers/gpu/drm/kmb/kmb_crtc.c line 193

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+{
+	struct drm_device *dev = crtc->dev;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+			    LCD_INT_VERT_COMP);
+
+	spin_lock_irq(&crtc->dev->event_lock);
+	if (crtc->state->event)
+		drm_crtc_send_vblank_event(crtc, crtc->state->event);

Uh, you have vblank event support, but you immediately send out the vblank
event. That breaks userspace assumptions. You probably want to use drm_crtc_arm_vblank_event here. Also there's tons of races that can possibly happen, so please read the kerneldoc comment for that function carefully - you probably need to validate that the vblank event arming, vblank process and re-enabling of LCD_INT_ENABLE cannot race against each
another in bad ways.

Also we have igt testcases for this, so please run them:

https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#validating-
changes-with-igt

Review

Quoted 33 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +22 -0
+	crtc->state->event = NULL;
+	spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {
+	.atomic_begin = kmb_crtc_atomic_begin,
+	.atomic_enable = kmb_crtc_atomic_enable,
+	.atomic_disable = kmb_crtc_atomic_disable,
+	.atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct kmb_plane *primary;
+	int ret;
+
+	primary = kmb_plane_init(drm);
+	if (IS_ERR(primary))
+		return PTR_ERR(primary);
+
+	ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary-

base_plane,

drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+					NULL, &kmb_crtc_funcs, NULL);
+	if (ret) {
+		kmb_plane_destroy(&primary->base_plane);
+		return ret;
+	}
+
+	drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+	return 0;
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.c

Quoted 42 lines

new file mode 100644
index 0000000..e413099

drivers/gpu/drm/kmb/kmb_drv.c new file +37 -0
@@ -0,0 +1,676 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/console.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
+
+#include <drm/drm.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_regs.h"
+
+int kmb_under_flow = 0, kmb_flush_done = 0, layer_no = 0;
+static struct kmb_clock kmb_clk;

drivers/gpu/drm/kmb/kmb_drv.c line 47

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+static struct drm_bridge *adv_bridge;
+
+int kmb_display_clk_enable(struct kmb_drm_private *kmb)
+{
+	int ret = 0;
+
+	ret = clk_prepare_enable(kmb_clk.clk_lcd);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n",

ret);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi);
+	if (ret) {
+		drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n",

ret);

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11 -0
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_ecfg);
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_ECFG clock: %d\n", ret);
+		return ret;
+	}
+
+	ret = clk_prepare_enable(kmb_clk.clk_mipi_cfg);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (ret) {
+		drm_err(&kmb->drm,
+			"Failed to enable MIPI_CFG clock: %d\n", ret);
+		return ret;
+	}
+	DRM_INFO("SUCCESS : enabled LCD MIPI clocks\n");
+	return 0;
+}
+
+int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct device

*dev)

Quoted 37 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+{
+	struct device_node *vpu_dev;
+	unsigned long clk;
+	int ret = 0;
+
+	kmb_clk.clk_lcd = clk_get(dev, "clk_lcd");
+	if (IS_ERR(kmb_clk.clk_lcd)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_lcd\n");
+		return PTR_ERR(kmb_clk.clk_lcd);
+	}
+
+	kmb_clk.clk_mipi = clk_get(dev, "clk_mipi");
+	if (IS_ERR(kmb_clk.clk_mipi)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi\n");
+		return PTR_ERR(kmb_clk.clk_mipi);
+	}
+
+	kmb_clk.clk_mipi_ecfg = clk_get(dev, "clk_mipi_ecfg");
+	if (IS_ERR(kmb_clk.clk_mipi_ecfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_ecfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_ecfg);
+	}
+
+	kmb_clk.clk_mipi_cfg = clk_get(dev, "clk_mipi_cfg");
+	if (IS_ERR(kmb_clk.clk_mipi_cfg)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_mipi_cfg\n");
+		return PTR_ERR(kmb_clk.clk_mipi_cfg);
+	}
+	vpu_dev = of_find_node_by_path("/soc/vpu-ipc");
+	kmb_clk.clk_pll0 = of_clk_get_by_name(vpu_dev, "pll_0_out_0");
+	if (IS_ERR(kmb_clk.clk_pll0)) {
+		drm_err(&kmb->drm, "clk_get() failed clk_pll0 ");
+		return PTR_ERR(kmb_clk.clk_pll0);
+	}
+	kmb->sys_clk_mhz = clk_get_rate(kmb_clk.clk_pll0) / 1000000;
+	drm_info(&kmb->drm, "system clk = %d Mhz", kmb-

sys_clk_mhz);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+	/* Set LCD clock to 200 Mhz */
+	clk_set_rate(kmb_clk.clk_lcd, KMB_LCD_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_lcd) != KMB_LCD_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_lcd to %d\n",
+			KMB_LCD_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_lcd = %ld\n",

clk_get_rate(kmb_clk.clk_lcd));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+	/* Set MIPI clock to 24 Mhz */
+	clk_set_rate(kmb_clk.clk_mipi, KMB_MIPI_DEFAULT_CLK);
+	if (clk_get_rate(kmb_clk.clk_mipi) != KMB_MIPI_DEFAULT_CLK) {
+		drm_err(&kmb->drm, "failed to set to clk_mipi to %d\n",
+			KMB_MIPI_DEFAULT_CLK);
+		return -1;
+	}
+	drm_dbg(&kmb->drm, "clk_mipi = %ld\n",

clk_get_rate(kmb_clk.clk_mipi));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_ECFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_ecfg,

KMB_MIPI_DEFAULT_CFG_CLK);

Quoted 36 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+		clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set to clk_mipi_ecfg to %d\n",
+				 KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+	if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+		/* Set MIPI_CFG clock to 24 Mhz */
+		clk_set_rate(kmb_clk.clk_mipi_cfg, 24000000);
+		clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+		if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+			drm_err(&kmb->drm,
+				"failed to set clk_mipi_cfg to %d\n",
+				  KMB_MIPI_DEFAULT_CFG_CLK);
+			return -1;
+		}
+	}
+
+	ret = kmb_display_clk_enable(kmb);
+	if (ret)
+		return ret;
+
+	/* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_CLK_CTRL, 0x1fff);
+	kmb_set_bitmask_msscam(kmb, MSS_CAM_RSTN_CTRL, 0xffffffff);
+	return 0;
+}
+
+static int kmb_display_clk_disable(void)
+{
+	if (kmb_clk.clk_lcd)
+		clk_disable_unprepare(kmb_clk.clk_lcd);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (kmb_clk.clk_mipi)
+		clk_disable_unprepare(kmb_clk.clk_mipi);
+	if (kmb_clk.clk_mipi_ecfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_ecfg);
+	if (kmb_clk.clk_mipi_cfg)
+		clk_disable_unprepare(kmb_clk.clk_mipi_cfg);
+	return 0;
+}
+
+static void __iomem *kmb_map_mmio(struct drm_device *drm, char

*name)

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+{
+	struct resource *res;
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	void __iomem *mem;
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

name);

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +28 -0
+	if (!res) {
+		drm_err(drm, "failed to get resource for %s", name);
+		return ERR_PTR(-ENOMEM);
+	}
+	mem = devm_ioremap_resource(drm->dev, res);
+	if (IS_ERR(mem))
+		drm_err(drm, "failed to ioremap %s registers", name);
+	return mem;
+}
+
+static int kmb_hw_init(struct drm_device *drm, unsigned long flags)
+{
+	struct kmb_drm_private *kmb = to_kmb(drm);
+	struct platform_device *pdev = to_platform_device(drm->dev);
+	int irq_lcd;
+	int ret = 0;
+
+	/* Map LCD MMIO registers */
+	kmb->lcd_mmio = kmb_map_mmio(drm, "lcd_regs");
+	if (IS_ERR(kmb->lcd_mmio)) {
+		drm_err(&kmb->drm, "failed to map LCD registers\n");
+		return -ENOMEM;
+	}
+
+	/* Map MIPI MMIO registers */
+	kmb->mipi_mmio = kmb_map_mmio(drm, "mipi_regs");
+	if (IS_ERR(kmb->mipi_mmio)) {
+		drm_err(&kmb->drm, "failed to map MIPI registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+		iounmap(kmb->lcd_mmio);
+		return -ENOMEM;
+	}
+
+	/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and
+	 * MSS_CAM_CLK_CTRL register
+	 */
+	kmb->msscam_mmio = kmb_map_mmio(drm, "msscam_regs");
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+
+	if (IS_ERR(kmb->msscam_mmio)) {
+		drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

Quoted 54 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +54 -0
+		iounmap(kmb->lcd_mmio);
+		iounmap(kmb->mipi_mmio);
+		return -ENOMEM;
+	}
+	/* Enable display clocks */
+	kmb_initialize_clocks(kmb, &pdev->dev);
+
+	/* Register irqs here - section 17.3 in databook
+	 * lists LCD at 79 and 82 for MIPI under MSS CPU -
+	 * firmware has redirected 79 to A53 IRQ 33
+	 */
+
+	/* Allocate LCD interrupt resources */
+	irq_lcd = platform_get_irq_byname(pdev, "irq_lcd");
+	if (irq_lcd < 0) {
+		drm_err(&kmb->drm, "irq_lcd not found");
+		goto setup_fail;
+	}
+
+	/* Get the optional framebuffer memory resource */
+	ret = of_reserved_mem_device_init(drm->dev);
+	if (ret && ret != -ENODEV)
+		return ret;
+
+	spin_lock_init(&kmb->irq_lock);
+
+	kmb->irq_lcd = irq_lcd;
+
+	return 0;
+
+ setup_fail:
+	of_reserved_mem_device_release(drm->dev);
+
+	return ret;
+}
+
+static const struct drm_mode_config_funcs kmb_mode_config_funcs = {
+	.fb_create = drm_gem_fb_create,
+	.atomic_check = drm_atomic_helper_check,
+	.atomic_commit = drm_atomic_helper_commit,
+};
+
+static int kmb_setup_mode_config(struct drm_device *drm)
+{
+	int ret;
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	ret = drmm_mode_config_init(drm);
+	if (ret)
+		return ret;
+	drm->mode_config.min_width = KMB_MIN_WIDTH;
+	drm->mode_config.min_height = KMB_MIN_HEIGHT;
+	drm->mode_config.max_width = KMB_MAX_WIDTH;
+	drm->mode_config.max_height = KMB_MAX_HEIGHT;

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	drm->mode_config.funcs = &kmb_mode_config_funcs;
+
+	ret = kmb_setup_crtc(drm);
+	if (ret < 0) {
+		drm_err(drm, "failed to create crtc\n");
+		return ret;
+	}
+
+	/* Initialize MIPI DSI */
+	ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 20 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +20 -0
+	if (ret) {
+		drm_err(drm, "failed to initialize DSI\n");
+		return ret;
+	}
+
+	/* Set the CRTC's port so that the encoder component can find it */
+	kmb->crtc.port = of_graph_get_port_by_id(drm->dev->of_node, 0);
+	ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+	if (ret < 0) {
+		drm_err(drm, "failed to initialize vblank\n");
+		pm_runtime_disable(drm->dev);
+		return ret;
+	}
+
+	drm_mode_config_reset(drm);
+	return 0;
+}
+
+static irqreturn_t handle_lcd_irq(struct drm_device *dev)
+{

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	unsigned long status, val, val1;
+	int plane_id, dma0_state, dma1_state;
+	struct kmb_drm_private *kmb = to_kmb(dev);
+
+	status = kmb_read_lcd(kmb, LCD_INT_STATUS);
+
+	if (status & LCD_INT_EOF) {
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF);
+
+		/* When disabling/enabling LCD layers, the change takes

effect

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+		 * immediately and does not wait for EOF (end of frame).
+		 * When kmb_plane_atomic_disable is called, mark the

plane as

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+		 * disabled but actually disable the plane when EOF irq is
+		 * being handled.
+		 */
+		for (plane_id = LAYER_0;
+				plane_id < KMB_MAX_PLANES; plane_id++)

{

drivers/gpu/drm/kmb/kmb_drv.c line 337

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			if (kmb->plane_status[plane_id].disable) {
+				kmb_clr_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (plane_id),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+
+				kmb_clr_bitmask_lcd(kmb, LCD_CONTROL,
+						    kmb-

plane_status[plane_id].ctrl);

drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+				kmb->plane_status[plane_id].disable = false;
+			}
+		}
+		if (kmb_under_flow) {
+			/* DMA Recovery after underflow */
+			dma0_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA0_STATE :

LCD_VIDEO1_DMA0_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			dma1_state = (layer_no == 0) ?
+			    LCD_VIDEO0_DMA1_STATE :

LCD_VIDEO1_DMA1_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+			do {
+				kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+				val = kmb_read_lcd(kmb, dma0_state)
+				    & LCD_DMA_STATE_ACTIVE;
+				val1 = kmb_read_lcd(kmb, dma1_state)
+				    & LCD_DMA_STATE_ACTIVE;
+			} while ((val || val1));
+			/* disable dma */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(layer_no),

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+					    LCD_DMA_LAYER_ENABLE);
+			kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+			kmb_flush_done = 1;
+			kmb_under_flow = 0;
+		}
+	}
+
+	if (status & LCD_INT_LINE_CMP) {
+		/* clear line compare interrupt */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LINE_CMP);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	}
+
+	if (status & LCD_INT_VERT_COMP) {
+		/* Read VSTATUS */
+		val = kmb_read_lcd(kmb, LCD_VSTATUS);
+		val = (val & LCD_VSTATUS_VERTICAL_STATUS_MASK);
+		switch (val) {
+		case LCD_VSTATUS_COMPARE_VSYNC:
+			/* Clear vertical compare interrupt */
+			kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

drivers/gpu/drm/kmb/kmb_drv.c line 422

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			if (kmb_flush_done) {
+				kmb_set_bitmask_lcd(kmb,
+						    LCD_LAYERn_DMA_CFG
+						    (layer_no),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c line 387

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+				kmb_flush_done = 0;
+			}
+			drm_handle_vblank(dev, 0);

Would be nice to use the new-style drm_crtc_handle_vblank here.

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+			break;
+		case LCD_VSTATUS_COMPARE_BACKPORCH:
+		case LCD_VSTATUS_COMPARE_ACTIVE:
+		case LCD_VSTATUS_COMPARE_FRONT_PORCH:
+			kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			break;
+		}
+	}
+	if (status & LCD_INT_DMA_ERR) {

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+		val =
+		    (status & LCD_INT_DMA_ERR &
+		     kmb_read_lcd(kmb, LCD_INT_ENABLE));
+		/* LAYER0 - VL0 */
+		if (val & (LAYER0_DMA_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER0_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER0:VL0 DMA UNDERFLOW val =

0x%lx,under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1 -0
+					    LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(0),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+			layer_no = 0;
+		}
+
+		if (val & LAYER0_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER0_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER0_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER0:VL0 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+		/* LAYER1 - VL1 */
+		if (val & (LAYER1_DMA_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CB_FIFO_UNDERFLOW |
+			   LAYER1_DMA_CR_FIFO_UNDERFLOW)) {
+			kmb_under_flow++;
+			drm_info(&kmb->drm,
+				 "!LAYER1:VL1 DMA UNDERFLOW val =

0x%lx, under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+			     val, kmb_under_flow);
+			/* disable underflow interrupt */
+			kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+					    LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1 -0
+					    LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+			/* disable auto restart mode */
+			kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(1),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+			layer_no = 1;
+		}
+
+		/* LAYER1 - VL1 */
+		if (val & LAYER1_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER1_DMA_CB_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER1_DMA_CR_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER1:VL1 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+		/* LAYER2 - GL0 */
+		if (val & LAYER2_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER2_DMA_FIFO_OVERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER2:GL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+		/* LAYER3 - GL1 */
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+		if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+			drm_dbg(&kmb->drm,
+				"LAYER3:GL1 DMA OVERFLOW val = 0x%lx",

val);

Quoted 74 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +74 -0
+	}
+
+	if (status & LCD_INT_LAYER) {
+		/* Clear layer interrupts */
+		kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LAYER);
+	}
+
+	/* Clear all interrupts */
+	kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, 1);
+	return IRQ_HANDLED;
+}
+
+/* IRQ handler */
+static irqreturn_t kmb_isr(int irq, void *arg)
+{
+	struct drm_device *dev = (struct drm_device *)arg;
+
+	handle_lcd_irq(dev);
+	return IRQ_HANDLED;
+}
+
+static void kmb_irq_reset(struct drm_device *drm)
+{
+	kmb_write_lcd(to_kmb(drm), LCD_INT_CLEAR, 0xFFFF);
+	kmb_write_lcd(to_kmb(drm), LCD_INT_ENABLE, 0);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(fops);
+
+static struct drm_driver kmb_driver = {
+	.driver_features = DRIVER_GEM |
+	    DRIVER_MODESET | DRIVER_ATOMIC,
+	.irq_handler = kmb_isr,
+	.irq_preinstall = kmb_irq_reset,
+	.irq_uninstall = kmb_irq_reset,
+	/* GEM Operations */
+	.fops = &fops,
+	DRM_GEM_CMA_DRIVER_OPS_VMAP,
+	.name = "kmb-drm",
+	.desc = "KEEMBAY DISPLAY DRIVER ",
+	.date = "20190122",
+	.major = 1,
+	.minor = 0,
+};
+
+static int kmb_remove(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = to_kmb(drm);
+
+	drm_dev_unregister(drm);
+	drm_kms_helper_poll_fini(drm);
+	of_node_put(kmb->crtc.port);
+	kmb->crtc.port = NULL;
+	pm_runtime_get_sync(drm->dev);
+	drm_irq_uninstall(drm);
+	pm_runtime_put_sync(drm->dev);
+	pm_runtime_disable(drm->dev);
+
+	of_reserved_mem_device_release(drm->dev);
+
+	/* Release clks */
+	kmb_display_clk_disable();
+	clk_put(kmb_clk.clk_lcd);
+	clk_put(kmb_clk.clk_mipi);
+
+	dev_set_drvdata(dev, NULL);
+
+	/* Unregister DSI host */
+	kmb_dsi_host_unregister();
+	return 0;
+}
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+static int kmb_probe(struct platform_device *pdev)
+{
+	struct device *dev = get_device(&pdev->dev);
+	struct kmb_drm_private *kmb;
+	int ret = 0;
+
+	/* The bridge (ADV 7535) will return -EPROBE_DEFER until it
+	 * has a mipi_dsi_host to register its device to. So, we
+	 * first register the DSI host during probe time, and then return
+	 * -EPROBE_DEFER until the bridge is loaded. Probe will be called

again

Quoted 85 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +85 -0
+	 *  and then the rest of the driver initialization can proceed
+	 *  afterwards and the bridge can be successfully attached.
+	 */
+	adv_bridge = kmb_dsi_host_bridge_init(dev);
+
+	if (adv_bridge == ERR_PTR(-EPROBE_DEFER)) {
+		return -EPROBE_DEFER;
+	} else if (IS_ERR(adv_bridge)) {
+		DRM_ERROR("probe failed to initialize DSI host bridge\n");
+		return PTR_ERR(adv_bridge);
+	}
+
+	/* Create DRM device */
+	kmb = devm_drm_dev_alloc(dev, &kmb_driver,
+				 struct kmb_drm_private, drm);
+	if (IS_ERR(kmb))
+		return PTR_ERR(kmb);
+
+	dev_set_drvdata(dev, &kmb->drm);
+
+	ret = kmb_hw_init(&kmb->drm, 0);
+	if (ret)
+		goto err_free1;
+
+	ret = kmb_setup_mode_config(&kmb->drm);
+	if (ret)
+		goto err_free;
+
+	ret = drm_irq_install(&kmb->drm, kmb->irq_lcd);
+	if (ret < 0) {
+		drm_err(&kmb->drm, "failed to install IRQ handler\n");
+		goto err_irq;
+	}
+
+	drm_kms_helper_poll_init(&kmb->drm);
+
+	/* Register graphics device with the kernel */
+	ret = drm_dev_register(&kmb->drm, 0);
+	if (ret)
+		goto err_register;
+
+	return 0;
+
+ err_register:
+	drm_kms_helper_poll_fini(&kmb->drm);
+ err_irq:
+	pm_runtime_disable(kmb->drm.dev);
+ err_free:
+	drm_crtc_cleanup(&kmb->crtc);
+	drm_mode_config_cleanup(&kmb->drm);
+ err_free1:
+	dev_set_drvdata(dev, NULL);
+	kmb_dsi_host_unregister();
+
+	return ret;
+}
+
+static const struct of_device_id kmb_of_match[] = {
+	{.compatible = "intel,kmb_display"},
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, kmb_of_match);
+
+static int __maybe_unused kmb_pm_suspend(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+	drm_kms_helper_poll_disable(drm);
+
+	kmb->state = drm_atomic_helper_suspend(drm);
+	if (IS_ERR(kmb->state)) {
+		drm_kms_helper_poll_enable(drm);
+		return PTR_ERR(kmb->state);
+	}
+
+	return 0;
+}
+
+static int __maybe_unused kmb_pm_resume(struct device *dev)
+{
+	struct drm_device *drm = dev_get_drvdata(dev);
+	struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+	if (!kmb)
+		return 0;
+
+	drm_atomic_helper_resume(drm, kmb->state);
+	drm_kms_helper_poll_enable(drm);
+
+	return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend,

kmb_pm_resume);

Review

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +16 -0
+
+static struct platform_driver kmb_platform_driver = {
+	.probe = kmb_probe,
+	.remove = kmb_remove,
+	.driver = {
+		.name = "kmb-drm",
+		.pm = &kmb_pm_ops,
+		.of_match_table = kmb_of_match,
+	},
+};
+
+module_platform_driver(kmb_platform_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_DESCRIPTION("Keembay Display driver");
+MODULE_LICENSE("GPL v2");
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.h

Quoted 7 lines

new file mode 100644
index 0000000..352f2d2

drivers/gpu/drm/kmb/kmb_drv.h new file +2 -0
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *

drivers/gpu/drm/kmb/kmb_drv.h line 12

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_DRV_H__
+#define __KMB_DRV_H__
+
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+#define KMB_MAX_WIDTH			1920 /*max width in pixels

*/

drivers/gpu/drm/kmb/kmb_drv.h line 13

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.h new file +1 -0
+#define KMB_MAX_HEIGHT			1080 /*max height in

pixels */

Quoted 27 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +27 -0
+#define KMB_MIN_WIDTH                   1920 /*max width in pixels */
+#define KMB_MIN_HEIGHT                  1080 /*max height in pixels */
+#define KMB_LCD_DEFAULT_CLK		200000000
+#define KMB_MIPI_DEFAULT_CLK		24000000
+#define KMB_MIPI_DEFAULT_CFG_CLK	24000000
+#define KMB_SYS_CLK_MHZ			500
+
+#define ICAM_MMIO		0x3b100000
+#define ICAM_LCD_OFFSET		0x1080
+#define ICAM_MMIO_SIZE		0x2000
+
+struct kmb_drm_private {
+	struct drm_device		drm;
+	void __iomem			*lcd_mmio;
+	void __iomem			*mipi_mmio;
+	void __iomem			*msscam_mmio;
+	struct clk			*clk;
+	struct drm_crtc			crtc;
+	struct kmb_plane		*plane;
+	struct drm_atomic_state		*state;
+	spinlock_t			irq_lock;
+	int				irq_lcd;
+	int				irq_mipi;
+	int				sys_clk_mhz;
+	dma_addr_t			fb_addr;
+	struct layer_status		plane_status[KMB_MAX_PLANES];
+};

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+struct kmb_clock {
+	struct clk *clk_lcd;
+	struct clk *clk_mipi;
+	struct clk *clk_mipi_ecfg;
+	struct clk *clk_mipi_cfg;
+	struct clk *clk_pll0;
+};
+
+static inline struct kmb_drm_private *to_kmb(const struct drm_device

*dev)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+	return container_of(dev, struct kmb_drm_private, drm);
+}
+
+static inline struct kmb_drm_private *crtc_to_kmb_priv(const struct

drm_crtc *x)

Quoted 23 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +23 -0
+{
+	return container_of(x, struct kmb_drm_private, crtc);
+}
+
+struct blt_layer_config {
+	unsigned char layer_format;
+};
+
+static inline void kmb_write_lcd(struct kmb_drm_private *dev_p,
+				 unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->lcd_mmio + reg));
+}
+
+static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
+				  unsigned int reg, u32 value)
+{
+	writel(value, (dev_p->mipi_mmio + reg));
+}
+
+static inline void kmb_write_msscam(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 value)
+{

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+	writel(value, (dev_p->msscam_mmio + reg));
+}
+
+static inline u32 kmb_read_msscam(struct kmb_drm_private *dev_p,
+				  unsigned int reg)
+{
+	return readl(dev_p->msscam_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_msscam(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+					  unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_msscam(dev_p, reg);
+
+	kmb_write_msscam(dev_p, reg, (reg_val | mask));
+}
+
+static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p,

unsigned int reg)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+	return readl(dev_p->lcd_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_lcd(struct kmb_drm_private

*dev_p,

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val | mask));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bitmask_lcd(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+	kmb_write_lcd(dev_p, reg, (reg_val & (~mask)));
+}
+
+static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p,

unsigned int reg)

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +25 -0
+{
+	return readl(dev_p->mipi_mmio + reg);
+}
+
+static inline void kmb_write_bits_mipi(struct kmb_drm_private *dev_p,
+				       unsigned int reg, u32 offset,
+				       u32 num_bits, u32 value)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+	u32 mask = (1 << num_bits) - 1;
+
+	value &= mask;
+	mask <<= offset;
+	reg_val &= (~mask);
+	reg_val |= (value << offset);
+	kmb_write_mipi(dev_p, reg, reg_val);
+}
+
+static inline void kmb_set_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val | (1 << offset));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bit_mipi(struct kmb_drm_private *dev_p,
+				    unsigned int reg, u32 offset)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, reg_val & (~(1 << offset)));
+}
+
+static inline void kmb_set_bitmask_mipi(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private

*dev_p,

Review

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+					unsigned int reg, u32 mask)
+{
+	u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+	kmb_write_mipi(dev_p, reg, (reg_val & (~mask)));
+}
+
+int kmb_setup_crtc(struct drm_device *dev);
+void kmb_set_scanout(struct kmb_drm_private *lcd);
+#endif /* __KMB_DRV_H__ */
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.c

Quoted 23 lines

new file mode 100644
index 0000000..d1e7786

drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_plane_helper.h>
+
+#include "kmb_drv.h"
+#include "kmb_plane.h"

drivers/gpu/drm/kmb/kmb_plane.c line 28

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+#include "kmb_regs.h"
+
+const u32 layer_irqs[] = {
+	LCD_INT_VL0,
+	LCD_INT_VL1,
+	LCD_INT_GL0,
+	LCD_INT_GL1
+};
+
+static unsigned int check_pixel_format(struct drm_plane *plane, u32

format)

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+{
+	int i;
+
+	for (i = 0; i < plane->format_count; i++) {
+		if (plane->format_types[i] == format)
+			return 0;
+	}
+	return -EINVAL;
+}
+
+static int kmb_plane_atomic_check(struct drm_plane *plane,
+				  struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	int ret;
+	struct drm_crtc_state *crtc_state;
+	bool can_position;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+	fb = state->fb;
+	if (!fb || !state->crtc)
+		return 0;
+
+	ret = check_pixel_format(plane, fb->format->format);
+	if (ret)
+		return ret;
+
+	if (state->crtc_w > KMB_MAX_WIDTH || state->crtc_h >

KMB_MAX_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 57

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+		return -EINVAL;
+	if (state->crtc_w < KMB_MIN_WIDTH || state->crtc_h <

KMB_MIN_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 67

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		return -EINVAL;
+	can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
+	crtc_state =
+		drm_atomic_get_existing_crtc_state(state->state, state-

crtc);

drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+	return drm_atomic_helper_check_plane_state(state, crtc_state,
+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 1 line

+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +28 -0
+						 can_position, true);
+}
+
+static void kmb_plane_atomic_disable(struct drm_plane *plane,
+				     struct drm_plane_state *state)
+{
+	struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+	int plane_id = kmb_plane->id;
+	struct kmb_drm_private *kmb;
+
+	kmb = to_kmb(plane->dev);
+
+	switch (plane_id) {
+	case LAYER_0:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
+		break;
+	case LAYER_1:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
+		break;
+	case LAYER_2:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
+		break;
+	case LAYER_3:
+		kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
+		break;
+	}
+
+	kmb->plane_status[plane_id].disable = true;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+}
+
+unsigned int get_pixel_format(u32 format)
+{
+	unsigned int val = 0;
+
+	switch (format) {
+		/* planar formats */
+	case DRM_FORMAT_YUV444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU444:
+		val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU422:
+		val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_YUV420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_YVU420:
+		val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+	case DRM_FORMAT_NV12:
+		val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+		break;
+	case DRM_FORMAT_NV21:
+		val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		    | LCD_LAYER_CRCB_ORDER;
+		break;
+		/* packed formats */
+		/* looks hw requires B & G to be swapped when RGB */
+	case DRM_FORMAT_RGB332:
+		val = LCD_LAYER_FORMAT_RGB332 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR4444:
+		val = LCD_LAYER_FORMAT_RGBX4444;
+		break;
+	case DRM_FORMAT_ARGB4444:
+		val = LCD_LAYER_FORMAT_RGBA4444 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_ABGR4444:
+		val = LCD_LAYER_FORMAT_RGBA4444;
+		break;
+	case DRM_FORMAT_XRGB1555:
+		val = LCD_LAYER_FORMAT_XRGB1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR1555:
+		val = LCD_LAYER_FORMAT_XRGB1555;
+		break;
+	case DRM_FORMAT_ARGB1555:
+		val = LCD_LAYER_FORMAT_RGBA1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_ABGR1555:
+		val = LCD_LAYER_FORMAT_RGBA1555;
+		break;
+	case DRM_FORMAT_RGB565:
+		val = LCD_LAYER_FORMAT_RGB565 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_BGR565:
+		val = LCD_LAYER_FORMAT_RGB565;
+		break;
+	case DRM_FORMAT_RGB888:
+		val = LCD_LAYER_FORMAT_RGB888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_BGR888:
+		val = LCD_LAYER_FORMAT_RGB888;
+		break;
+	case DRM_FORMAT_XRGB8888:
+		val = LCD_LAYER_FORMAT_RGBX8888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+		break;
+	case DRM_FORMAT_XBGR8888:
+		val = LCD_LAYER_FORMAT_RGBX8888;
+		break;
+	case DRM_FORMAT_ARGB8888:
+		val = LCD_LAYER_FORMAT_RGBA8888 |

LCD_LAYER_BGR_ORDER;

Quoted 35 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +35 -0
+		break;
+	case DRM_FORMAT_ABGR8888:
+		val = LCD_LAYER_FORMAT_RGBA8888;
+		break;
+	}
+	DRM_INFO_ONCE("%s : %d format=0x%x val=0x%x\n",
+		      __func__, __LINE__, format, val);
+	return val;
+}
+
+unsigned int get_bits_per_pixel(const struct drm_format_info *format)
+{
+	u32 bpp = 0;
+	unsigned int val = 0;
+
+	if (format->num_planes > 1) {
+		val = LCD_LAYER_8BPP;
+		return val;
+	}
+
+	bpp += 8 * format->cpp[0];
+
+	switch (bpp) {
+	case 8:
+		val = LCD_LAYER_8BPP;
+		break;
+	case 16:
+		val = LCD_LAYER_16BPP;
+		break;
+	case 24:
+		val = LCD_LAYER_24BPP;
+		break;
+	case 32:
+		val = LCD_LAYER_32BPP;
+		break;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	}
+
+	DRM_DEBUG("bpp=%d val=0x%x\n", bpp, val);
+	return val;
+}
+
+static void config_csc(struct kmb_drm_private *kmb, int plane_id)
+{
+	/* YUV to RGB conversion using the fixed matrix csc_coef_lcd */
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id),

csc_coef_lcd[0]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id),

csc_coef_lcd[1]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id),

csc_coef_lcd[2]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id),

csc_coef_lcd[3]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id),

csc_coef_lcd[4]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id),

csc_coef_lcd[5]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id),

csc_coef_lcd[6]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id),

csc_coef_lcd[7]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id),

csc_coef_lcd[8]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id),

csc_coef_lcd[9]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id),

csc_coef_lcd[10]);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id),

csc_coef_lcd[11]);

Quoted 22 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +22 -0
+}
+
+static void kmb_plane_atomic_update(struct drm_plane *plane,
+				    struct drm_plane_state *state)
+{
+	struct drm_framebuffer *fb;
+	struct kmb_drm_private *kmb;
+	unsigned int width;
+	unsigned int height;
+	unsigned int dma_len;
+	struct kmb_plane *kmb_plane;
+	unsigned int dma_cfg;
+	unsigned int ctrl = 0, val = 0, out_format = 0;
+	unsigned int src_w, src_h, crtc_x, crtc_y;
+	unsigned char plane_id;
+	int num_planes;
+	static dma_addr_t addr[MAX_SUB_PLANES];
+
+	if (!plane || !plane->state || !state)
+		return;
+
+	fb = plane->state->fb;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+	if (!fb)
+		return;
+	num_planes = fb->format->num_planes;
+	kmb_plane = to_kmb_plane(plane);
+	plane_id = kmb_plane->id;
+
+	kmb = to_kmb(plane->dev);
+
+	if (kmb_under_flow || kmb_flush_done) {
+		drm_dbg(&kmb->drm, "plane_update:underflow!!!!

returning");

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+		return;
+	}
+
+	src_w = (plane->state->src_w >> 16);
+	src_h = plane->state->src_h >> 16;
+	crtc_x = plane->state->crtc_x;
+	crtc_y = plane->state->crtc_y;
+
+	drm_dbg(&kmb->drm,
+		"src_w=%d src_h=%d, fb->format->format=0x%x fb-

flags=0x%x\n",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8 -0
+		  src_w, src_h, fb->format->format, fb->flags);
+
+	width = fb->width;
+	height = fb->height;
+	dma_len = (width * height * fb->format->cpp[0]);
+	drm_dbg(&kmb->drm, "dma_len=%d ", dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id),

dma_len);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
+		      fb->pitches[0]);
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
+		      (width * fb->format->cpp[0]));

drivers/gpu/drm/kmb/kmb_plane.c line 303

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+	addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
+	kmb->fb_addr = addr[Y_PLANE];
+	kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
+		      addr[Y_PLANE] + fb->offsets[0]);
+	val = get_pixel_format(fb->format->format);
+	val |= get_bits_per_pixel(fb->format);
+	/* Program Cb/Cr for planar formats */
+	if (num_planes > 1) {
+		kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+			      width * fb->format->cpp[0]);
+		kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+			      (width * fb->format->cpp[0]));
+
+		addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane-

state,

drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 56 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +56 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_DMA_LAYER_VSTRIDE_EN |

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_DMA_LAYER_AXI_BURST_16;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

dma_cfg,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +28 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

drm_atomic_helper_plane_duplicate_state,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 27 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +27 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

ARRAY_SIZE(kmb_formats_v);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

ARRAY_SIZE(kmb_formats_g);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

&kmb_plane_funcs,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

num_plane_formats,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

(ret=%d)",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +13 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

__LINE__,

Review

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

b/drivers/gpu/drm/kmb/kmb_plane.h

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 31 lines

new file mode 100644
index 0000000..141cdaa

drivers/gpu/drm/kmb/kmb_plane.h new file +26 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LAYER2_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LAYER3_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_INT_VL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_INT_VL1_ERR)

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_INT_GL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

LCD_INT_GL1_ERR)

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 29 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +29 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

supported */

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 16 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +16 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

supported */

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +25 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

The static const arrays above look a bit strange in a header file (and could result in duplication in the driver .ko), please move to .c files. Headers should only contain definitions, not declarations of actual storage.

Cheers, Daniel

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2.7.4

Quoted 9 lines
Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

root@keembay:~/igt/tests# ./kms_vblank --r invalid
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: invalid
Subtest invalid: SUCCESS (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r crtc-id
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: crtc-id
Subtest crtc-id: SUCCESS (0.102s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-accuracy-idle
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-accuracy-idle
Beginning pipe-A-accuracy-idle on pipe A, connector HDMI-A-1
(kms_vblank:869) CRITICAL: Test assertion failure function accuracy, file kms_vblank.c:258:
(kms_vblank:869) CRITICAL: Failed assertion: vbl.reply.sequence == target
(kms_vblank:869) CRITICAL: Last errno: 2, No such file or directory
(kms_vblank:869) CRITICAL: error: 5875 != 5519
Stack trace:
  #0 /home/root/igt/lib/igt_core.c:1727 __igt_fail_assert()
  #1 [accuracy+0x284]
  #2 /home/root/igt/tests/kms_vblank.c:156 run_test()
  #3 /home/root/igt/tests/kms_vblank.c:450 run_subtests_for_pipe()
  #4 /home/root/igt/tests/kms_vblank.c:535 __real_main516()
  #5 /home/root/igt/tests/kms_vblank.c:516 main()
  #6 ../csu/libc-start.c:342 __libc_start_main()
  #7 ../sysdeps/aarch64/start.S:97 $x()
  #8 ../sysdeps/aarch64/start.S:97 $x()
Subtest pipe-A-accuracy-idle failed.
**** DEBUG ****
(kms_vblank:869) igt-kms-DEBUG: display: HDMI-A-1: set_pipe(A)
(kms_vblank:869) igt-kms-DEBUG: display: HDMI-A-1: Selecting pipe A
(kms_vblank:869) igt-fb-DEBUG: igt_create_fb_with_bo_size(width=1920, height=1080, format=XR24(0x34325258), modifier=0x0, size=0)
(kms_vblank:869) igt-fb-DEBUG: igt_create_fb_with_bo_size(handle=1, pitch=7680)
(kms_vblank:869) igt-fb-DEBUG: Test requirement passed: cairo_surface_status(fb->cairo_surface) == CAIRO_STATUS_SUCCESS
(kms_vblank:869) igt-kms-DEBUG: Test requirement passed: plane_idx >= 0 && plane_idx < pipe->n_planes
(kms_vblank:869) igt-kms-DEBUG: display: A.0: plane_set_fb(38)
(kms_vblank:869) igt-kms-DEBUG: display: A.0: plane_set_size (1920x1080)
(kms_vblank:869) igt-kms-DEBUG: display: A.0: fb_set_position(0,0)
(kms_vblank:869) igt-kms-DEBUG: display: A.0: fb_set_size(1920x1080)
(kms_vblank:869) igt-kms-DEBUG: display: commit {
(kms_vblank:869) igt-kms-DEBUG: display:     HDMI-A-1: SetCrtc pipe A, fb 38, src (0, 0), mode 1920x1080
(kms_vblank:869) igt-kms-DEBUG: display: }
(kms_vblank:869) igt-debugfs-DEBUG: Opening debugfs directory '/sys/kernel/debug/dri/1'
(kms_vblank:869) INFO: Beginning pipe-A-accuracy-idle on pipe A, connector HDMI-A-1
(kms_vblank:869) CRITICAL: Test assertion failure function accuracy, file kms_vblank.c:258:
(kms_vblank:869) CRITICAL: Failed assertion: vbl.reply.sequence == target
(kms_vblank:869) CRITICAL: Last errno: 2, No such file or directory
(kms_vblank:869) CRITICAL: error: 5875 != 5519
(kms_vblank:869) igt-core-INFO: Stack trace:
(kms_vblank:869) igt-core-INFO:   #0 /home/root/igt/lib/igt_core.c:1727 __igt_fail_assert()
(kms_vblank:869) igt-core-INFO:   #1 [accuracy+0x284]
(kms_vblank:869) igt-core-INFO:   #2 /home/root/igt/tests/kms_vblank.c:156 run_test()
(kms_vblank:869) igt-core-INFO:   #3 /home/root/igt/tests/kms_vblank.c:450 run_subtests_for_pipe()
(kms_vblank:869) igt-core-INFO:   #4 /home/root/igt/tests/kms_vblank.c:535 __real_main516()
(kms_vblank:869) igt-core-INFO:   #5 /home/root/igt/tests/kms_vblank.c:516 main()
(kms_vblank:869) igt-core-INFO:   #6 ../csu/libc-start.c:342 __libc_start_main()
(kms_vblank:869) igt-core-INFO:   #7 ../sysdeps/aarch64/start.S:97 $x()
(kms_vblank:869) igt-core-INFO:   #8 ../sysdeps/aarch64/start.S:97 $x()
****  END  ****
Subtest pipe-A-accuracy-idle: FAIL (2.328s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-idle
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-idle
Beginning pipe-A-query-idle on pipe A, connector HDMI-A-1
Time to query current counter (idle):            14.899µs

pipe-A-query-idle on pipe A, connector HDMI-A-1: PASSED

Subtest pipe-A-query-idle: SUCCESS (0.458s)

root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-idle-hang
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-idle-hang
Test requirement not met in function gem_context_require_bannable, file i915/gem_context.c:249:
Test requirement: has_ban_period || has_bannable
Last errno: 22, Invalid argument
Subtest pipe-A-query-idle-hang: SKIP (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-forked
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-forked
Beginning pipe-A-query-forked on pipe A, connector HDMI-A-1
Time to query current counter (idle):            14.734µs
Time to query current counter (idle):            14.802µs
Time to query current counter (idle):            14.778µs
Time to query current counter (idle):            14.766µs

pipe-A-query-forked on pipe A, connector HDMI-A-1: PASSED

Subtest pipe-A-query-forked: SUCCESS (0.548s)

root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-forked-hang
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-forked-hang
Test requirement not met in function gem_context_require_bannable, file i915/gem_context.c:249:
Test requirement: has_ban_period || has_bannable
Last errno: 22, Invalid argument
Subtest pipe-A-query-forked-hang: SKIP (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-busy
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-busy
Beginning pipe-A-query-busy on pipe A, connector HDMI-A-1
Time to query current counter (busy):            13.520µs

pipe-A-query-busy on pipe A, connector HDMI-A-1: PASSED

Subtest pipe-A-query-busy: SUCCESS (0.527s)

root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-busy-hang
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-busy-hang
Test requirement not met in function gem_context_require_bannable, file i915/gem_context.c:249:
Test requirement: has_ban_period || has_bannable
Last errno: 22, Invalid argument
Subtest pipe-A-query-busy-hang: SKIP (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-forked-busy
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-forked-busy
Beginning pipe-A-query-forked-busy on pipe A, connector HDMI-A-1
Time to query current counter (busy):            13.609µs
Time to query current counter (busy):            13.572µs
Time to query current counter (busy):            13.678µs
Time to query current counter (busy):            13.601µs

pipe-A-query-forked-busy on pipe A, connector HDMI-A-1: PASSED

Subtest pipe-A-query-forked-busy: SUCCESS (0.503s)

root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-query-forked-busy-hang
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-query-forked-busy-hang
Test requirement not met in function gem_context_require_bannable, file i915/gem_context.c:249:
Test requirement: has_ban_period || has_bannable
Last errno: 22, Invalid argument
Subtest pipe-A-query-forked-busy-hang: SKIP (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-wait-idle
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-wait-idle
Beginning pipe-A-wait-idle on pipe A, connector HDMI-A-1
Time to wait for 61/122 vblanks (idle):         8463.902µs

pipe-A-wait-idle on pipe A, connector HDMI-A-1: PASSED

Subtest pipe-A-wait-idle: SUCCESS (0.584s)

root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-wait-idle-hang
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-wait-idle-hang
Test requirement not met in function gem_context_require_bannable, file i915/gem_context.c:249:
Test requirement: has_ban_period || has_bannable
Last errno: 22, Invalid argument
Subtest pipe-A-wait-idle-hang: SKIP (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-wait-forked
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-wait-forked
Beginning pipe-A-wait-forked on pipe A, connector HDMI-A-1
Time to wait for 61/122 vblanks (idle):         16230.262µs
Time to wait for 62/122 vblanks (idle):         16245.532µs
Time to wait for 62/122 vblanks (idle):         16376.597µs
Time to wait for 63/122 vblanks (idle):         16126.270µs

pipe-A-wait-forked on pipe A, connector HDMI-A-1: PASSED

Subtest pipe-A-wait-forked: SUCCESS (1.135s)

root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-wait-forked-hang
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-wait-forked-hang
Test requirement not met in function gem_context_require_bannable, file i915/gem_context.c:249:
Test requirement: has_ban_period || has_bannable
Last errno: 22, Invalid argument
Subtest pipe-A-wait-forked-hang: SKIP (0.000s)
root@keembay:~/igt/tests# ./kms_vblank --r pipe-A-wait-busy
IGT-Version: 1.25-g0ec96201 (aarch64) (Linux: 5.9.0-rc7-intel-standard aarch64)
Starting subtest: pipe-A-wait-busy
Beginning pipe-A-wait-busy on pipe A, connector HDMI-A-1

1 line not shown · raw message

86 lines not shown · raw message

Parts of this message are not shown here. View the raw message.

#9 lore raw

Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 5 lines · Anitha

Hi Daniel,
I was finally able to test the driver with 5.9 kernel with minor changes in the driver.
Ran the igt_vblank test and it passed/skipped all the subtests except the pipe-A-accuracy-idle test.
Results are attached. Investigated the failing test and it seems like drm_handle_vblank() is taking too long sometimes. I can work on this after we merge.

kms_flip is the one that should check whether vblank events and page flip events agree. Which I think isn't the case with your current code.
-Daniel

Quoted 1,946 lines

Will send out V8 with the minor changes and device tree YAML binding file ASAP. Will work on the rest of the review comments after.

Thanks,
Anitha

Quoted 1,940 lines

From: Daniel Vetter <[email protected]>
Sent: Thursday, September 10, 2020 1:31 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>
Subject: Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 1 line · Anitha Chrisanthus

This is a basic KMS atomic modesetting display driver for KeemBay family

of

Quoted 18 lines

SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.(Sam)

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

Quoted 14 lines

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas)
renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)
re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam)
use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed kmb_plane_state

(Sam)

Quoted 4 lines

Sam asked me to take a look at this too, looks reasonable overall. I've spotted a few small things plus a potential functional issue around vblank/event handling. I strongly recommend running the igt test suite over the driver to see whether it all works reasonably ok. See below for details.

Quoted 3 lines
---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676

++++++++++++++++++++++++++++++++++++++++

Quoted 2 lines
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480

++++++++++++++++++++++++++++

Review

Quoted 9 lines
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 68 lines

new file mode 100644
index 0000000..a684331

drivers/gpu/drm/kmb/kmb_crtc.c new file +63 -0
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+   u32 vfront_porch;
+   u32 vback_porch;
+   u32 vsync_len;
+   u32 hfront_porch;
+   u32 hback_porch;
+   u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   /* Clear interrupt */
+   kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+   /* Set which interval to generate vertical interrupt */
+   kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+                 LCD_VSTATUS_COMPARE_VSYNC);
+   /* Enable vertical interrupt */
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+   return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   /* Clear interrupt */
+   kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+   /* Disable vertical interrupt */

drivers/gpu/drm/kmb/kmb_crtc.c line 73

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+   .destroy = drm_crtc_cleanup,
+   .set_config = drm_atomic_helper_set_config,
+   .page_flip = drm_atomic_helper_page_flip,
+   .reset = drm_atomic_helper_crtc_reset,
+   .atomic_duplicate_state =

drm_atomic_helper_crtc_duplicate_state,

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+   .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+   .enable_vblank = kmb_crtc_enable_vblank,
+   .disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+   struct drm_device *dev = crtc->dev;
+   struct drm_display_mode *m = &crtc->state->adjusted_mode;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+   struct kmb_crtc_timing vm;
+   int vsync_start_offset;
+   int vsync_end_offset;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+   unsigned int val = 0;
+
+   /* Initialize mipi */
+   kmb_dsi_hw_init(dev, m);
+   drm_info(dev,
+            "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d

hsync_len=%d\n",

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+            m->crtc_vsync_start - m->crtc_vdisplay,
+            m->crtc_vtotal - m->crtc_vsync_end,
+            m->crtc_vsync_end - m->crtc_vsync_start,
+            m->crtc_hsync_start - m->crtc_hdisplay,
+            m->crtc_htotal - m->crtc_hsync_end,
+            m->crtc_hsync_end - m->crtc_hsync_start);
+   val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+   vm.vfront_porch = 2;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+   vm.vback_porch = 2;
+   vm.vsync_len = 8;
+   vm.hfront_porch = 0;
+   vm.hback_porch = 0;
+   vm.hsync_len = 28;
+
+   vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+   vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+   drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-

w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",

drivers/gpu/drm/kmb/kmb_crtc.c line 114

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2 -0
+           __func__, __LINE__,
+                   m->crtc_vdisplay, vm.vback_porch,

vm.vfront_porch,

Quoted 69 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +69 -0
+                   vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+                   vm.hfront_porch, vm.hsync_len);
+   kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+                 m->crtc_vdisplay - 1);
+   kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+   kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+   kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+   kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+                 m->crtc_hdisplay - 1);
+   kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+   kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+   kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+   /* This is hardcoded as 0 in the Myriadx code */
+   kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+   kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+   /* Back ground color */
+   kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+   if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+           kmb_write_lcd(kmb,
+                         LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+           kmb_write_lcd(kmb,
+                         LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+           kmb_write_lcd(kmb,
+                         LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+           kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+                         m->crtc_vdisplay - 1);
+           /* This is hardcoded as 10 in the Myriadx code */
+           kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+           kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+   }
+   kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+   kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+                              struct drm_crtc_state *old_state)
+{
+   struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+   clk_prepare_enable(lcd->clk);
+   kmb_crtc_set_mode(crtc);
+   drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+                               struct drm_crtc_state *old_state)
+{
+   struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+   /* due to hw limitations, planes need to be off when crtc is off */
+   drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+   drm_crtc_vblank_off(crtc);
+   clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+                             struct drm_crtc_state *state)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+                             struct drm_crtc_state *state)

drivers/gpu/drm/kmb/kmb_crtc.c line 193

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+
+   spin_lock_irq(&crtc->dev->event_lock);
+   if (crtc->state->event)
+           drm_crtc_send_vblank_event(crtc, crtc->state->event);

Uh, you have vblank event support, but you immediately send out the vblank
event. That breaks userspace assumptions. You probably want to use drm_crtc_arm_vblank_event here. Also there's tons of races that can possibly happen, so please read the kerneldoc comment for that function carefully - you probably need to validate that the vblank event arming, vblank process and re-enabling of LCD_INT_ENABLE cannot race against each
another in bad ways.

Also we have igt testcases for this, so please run them:

https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#validating-
changes-with-igt

Review

Quoted 33 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +22 -0
+   crtc->state->event = NULL;
+   spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {
+   .atomic_begin = kmb_crtc_atomic_begin,
+   .atomic_enable = kmb_crtc_atomic_enable,
+   .atomic_disable = kmb_crtc_atomic_disable,
+   .atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+   struct kmb_drm_private *kmb = to_kmb(drm);
+   struct kmb_plane *primary;
+   int ret;
+
+   primary = kmb_plane_init(drm);
+   if (IS_ERR(primary))
+           return PTR_ERR(primary);
+
+   ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary-

base_plane,

drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+                                   NULL, &kmb_crtc_funcs, NULL);
+   if (ret) {
+           kmb_plane_destroy(&primary->base_plane);
+           return ret;
+   }
+
+   drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+   return 0;
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.c

Quoted 42 lines

new file mode 100644
index 0000000..e413099

drivers/gpu/drm/kmb/kmb_drv.c new file +37 -0
@@ -0,0 +1,676 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/console.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
+
+#include <drm/drm.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_regs.h"
+
+int kmb_under_flow = 0, kmb_flush_done = 0, layer_no = 0;
+static struct kmb_clock kmb_clk;

drivers/gpu/drm/kmb/kmb_drv.c line 47

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+static struct drm_bridge *adv_bridge;
+
+int kmb_display_clk_enable(struct kmb_drm_private *kmb)
+{
+   int ret = 0;
+
+   ret = clk_prepare_enable(kmb_clk.clk_lcd);
+   if (ret) {
+           drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n",

ret);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+           return ret;
+   }
+
+   ret = clk_prepare_enable(kmb_clk.clk_mipi);
+   if (ret) {
+           drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n",

ret);

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11 -0
+           return ret;
+   }
+
+   ret = clk_prepare_enable(kmb_clk.clk_mipi_ecfg);
+   if (ret) {
+           drm_err(&kmb->drm,
+                   "Failed to enable MIPI_ECFG clock: %d\n", ret);
+           return ret;
+   }
+
+   ret = clk_prepare_enable(kmb_clk.clk_mipi_cfg);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   if (ret) {
+           drm_err(&kmb->drm,
+                   "Failed to enable MIPI_CFG clock: %d\n", ret);
+           return ret;
+   }
+   DRM_INFO("SUCCESS : enabled LCD MIPI clocks\n");
+   return 0;
+}
+
+int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct device

*dev)

Quoted 37 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+{
+   struct device_node *vpu_dev;
+   unsigned long clk;
+   int ret = 0;
+
+   kmb_clk.clk_lcd = clk_get(dev, "clk_lcd");
+   if (IS_ERR(kmb_clk.clk_lcd)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_lcd\n");
+           return PTR_ERR(kmb_clk.clk_lcd);
+   }
+
+   kmb_clk.clk_mipi = clk_get(dev, "clk_mipi");
+   if (IS_ERR(kmb_clk.clk_mipi)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_mipi\n");
+           return PTR_ERR(kmb_clk.clk_mipi);
+   }
+
+   kmb_clk.clk_mipi_ecfg = clk_get(dev, "clk_mipi_ecfg");
+   if (IS_ERR(kmb_clk.clk_mipi_ecfg)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_mipi_ecfg\n");
+           return PTR_ERR(kmb_clk.clk_mipi_ecfg);
+   }
+
+   kmb_clk.clk_mipi_cfg = clk_get(dev, "clk_mipi_cfg");
+   if (IS_ERR(kmb_clk.clk_mipi_cfg)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_mipi_cfg\n");
+           return PTR_ERR(kmb_clk.clk_mipi_cfg);
+   }
+   vpu_dev = of_find_node_by_path("/soc/vpu-ipc");
+   kmb_clk.clk_pll0 = of_clk_get_by_name(vpu_dev, "pll_0_out_0");
+   if (IS_ERR(kmb_clk.clk_pll0)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_pll0 ");
+           return PTR_ERR(kmb_clk.clk_pll0);
+   }
+   kmb->sys_clk_mhz = clk_get_rate(kmb_clk.clk_pll0) / 1000000;
+   drm_info(&kmb->drm, "system clk = %d Mhz", kmb-

sys_clk_mhz);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+   /* Set LCD clock to 200 Mhz */
+   clk_set_rate(kmb_clk.clk_lcd, KMB_LCD_DEFAULT_CLK);
+   if (clk_get_rate(kmb_clk.clk_lcd) != KMB_LCD_DEFAULT_CLK) {
+           drm_err(&kmb->drm, "failed to set to clk_lcd to %d\n",
+                   KMB_LCD_DEFAULT_CLK);
+           return -1;
+   }
+   drm_dbg(&kmb->drm, "clk_lcd = %ld\n",

clk_get_rate(kmb_clk.clk_lcd));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+   /* Set MIPI clock to 24 Mhz */
+   clk_set_rate(kmb_clk.clk_mipi, KMB_MIPI_DEFAULT_CLK);
+   if (clk_get_rate(kmb_clk.clk_mipi) != KMB_MIPI_DEFAULT_CLK) {
+           drm_err(&kmb->drm, "failed to set to clk_mipi to %d\n",
+                   KMB_MIPI_DEFAULT_CLK);
+           return -1;
+   }
+   drm_dbg(&kmb->drm, "clk_mipi = %ld\n",

clk_get_rate(kmb_clk.clk_mipi));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+   clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+   if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+           /* Set MIPI_ECFG clock to 24 Mhz */
+           clk_set_rate(kmb_clk.clk_mipi_ecfg,

KMB_MIPI_DEFAULT_CFG_CLK);

Quoted 36 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+           clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+           if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+                   drm_err(&kmb->drm,
+                           "failed to set to clk_mipi_ecfg to %d\n",
+                            KMB_MIPI_DEFAULT_CFG_CLK);
+                   return -1;
+           }
+   }
+
+   clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+   if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+           /* Set MIPI_CFG clock to 24 Mhz */
+           clk_set_rate(kmb_clk.clk_mipi_cfg, 24000000);
+           clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+           if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+                   drm_err(&kmb->drm,
+                           "failed to set clk_mipi_cfg to %d\n",
+                             KMB_MIPI_DEFAULT_CFG_CLK);
+                   return -1;
+           }
+   }
+
+   ret = kmb_display_clk_enable(kmb);
+   if (ret)
+           return ret;
+
+   /* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */
+   kmb_set_bitmask_msscam(kmb, MSS_CAM_CLK_CTRL, 0x1fff);
+   kmb_set_bitmask_msscam(kmb, MSS_CAM_RSTN_CTRL, 0xffffffff);
+   return 0;
+}
+
+static int kmb_display_clk_disable(void)
+{
+   if (kmb_clk.clk_lcd)
+           clk_disable_unprepare(kmb_clk.clk_lcd);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   if (kmb_clk.clk_mipi)
+           clk_disable_unprepare(kmb_clk.clk_mipi);
+   if (kmb_clk.clk_mipi_ecfg)
+           clk_disable_unprepare(kmb_clk.clk_mipi_ecfg);
+   if (kmb_clk.clk_mipi_cfg)
+           clk_disable_unprepare(kmb_clk.clk_mipi_cfg);
+   return 0;
+}
+
+static void __iomem *kmb_map_mmio(struct drm_device *drm, char

*name)

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+{
+   struct resource *res;
+   struct platform_device *pdev = to_platform_device(drm->dev);
+   void __iomem *mem;
+
+   res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

name);

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +28 -0
+   if (!res) {
+           drm_err(drm, "failed to get resource for %s", name);
+           return ERR_PTR(-ENOMEM);
+   }
+   mem = devm_ioremap_resource(drm->dev, res);
+   if (IS_ERR(mem))
+           drm_err(drm, "failed to ioremap %s registers", name);
+   return mem;
+}
+
+static int kmb_hw_init(struct drm_device *drm, unsigned long flags)
+{
+   struct kmb_drm_private *kmb = to_kmb(drm);
+   struct platform_device *pdev = to_platform_device(drm->dev);
+   int irq_lcd;
+   int ret = 0;
+
+   /* Map LCD MMIO registers */
+   kmb->lcd_mmio = kmb_map_mmio(drm, "lcd_regs");
+   if (IS_ERR(kmb->lcd_mmio)) {
+           drm_err(&kmb->drm, "failed to map LCD registers\n");
+           return -ENOMEM;
+   }
+
+   /* Map MIPI MMIO registers */
+   kmb->mipi_mmio = kmb_map_mmio(drm, "mipi_regs");
+   if (IS_ERR(kmb->mipi_mmio)) {
+           drm_err(&kmb->drm, "failed to map MIPI registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+           iounmap(kmb->lcd_mmio);
+           return -ENOMEM;
+   }
+
+   /* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and
+    * MSS_CAM_CLK_CTRL register
+    */
+   kmb->msscam_mmio = kmb_map_mmio(drm, "msscam_regs");
+   if (IS_ERR(kmb->msscam_mmio)) {
+           drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+           iounmap(kmb->lcd_mmio);
+           iounmap(kmb->mipi_mmio);
+           return -ENOMEM;
+   }
+
+   if (IS_ERR(kmb->msscam_mmio)) {
+           drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

Quoted 54 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +54 -0
+           iounmap(kmb->lcd_mmio);
+           iounmap(kmb->mipi_mmio);
+           return -ENOMEM;
+   }
+   /* Enable display clocks */
+   kmb_initialize_clocks(kmb, &pdev->dev);
+
+   /* Register irqs here - section 17.3 in databook
+    * lists LCD at 79 and 82 for MIPI under MSS CPU -
+    * firmware has redirected 79 to A53 IRQ 33
+    */
+
+   /* Allocate LCD interrupt resources */
+   irq_lcd = platform_get_irq_byname(pdev, "irq_lcd");
+   if (irq_lcd < 0) {
+           drm_err(&kmb->drm, "irq_lcd not found");
+           goto setup_fail;
+   }
+
+   /* Get the optional framebuffer memory resource */
+   ret = of_reserved_mem_device_init(drm->dev);
+   if (ret && ret != -ENODEV)
+           return ret;
+
+   spin_lock_init(&kmb->irq_lock);
+
+   kmb->irq_lcd = irq_lcd;
+
+   return 0;
+
+ setup_fail:
+   of_reserved_mem_device_release(drm->dev);
+
+   return ret;
+}
+
+static const struct drm_mode_config_funcs kmb_mode_config_funcs = {
+   .fb_create = drm_gem_fb_create,
+   .atomic_check = drm_atomic_helper_check,
+   .atomic_commit = drm_atomic_helper_commit,
+};
+
+static int kmb_setup_mode_config(struct drm_device *drm)
+{
+   int ret;
+   struct kmb_drm_private *kmb = to_kmb(drm);
+
+   ret = drmm_mode_config_init(drm);
+   if (ret)
+           return ret;
+   drm->mode_config.min_width = KMB_MIN_WIDTH;
+   drm->mode_config.min_height = KMB_MIN_HEIGHT;
+   drm->mode_config.max_width = KMB_MAX_WIDTH;
+   drm->mode_config.max_height = KMB_MAX_HEIGHT;

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   drm->mode_config.funcs = &kmb_mode_config_funcs;
+
+   ret = kmb_setup_crtc(drm);
+   if (ret < 0) {
+           drm_err(drm, "failed to create crtc\n");
+           return ret;
+   }
+
+   /* Initialize MIPI DSI */
+   ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 20 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +20 -0
+   if (ret) {
+           drm_err(drm, "failed to initialize DSI\n");
+           return ret;
+   }
+
+   /* Set the CRTC's port so that the encoder component can find it */
+   kmb->crtc.port = of_graph_get_port_by_id(drm->dev->of_node, 0);
+   ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+   if (ret < 0) {
+           drm_err(drm, "failed to initialize vblank\n");
+           pm_runtime_disable(drm->dev);
+           return ret;
+   }
+
+   drm_mode_config_reset(drm);
+   return 0;
+}
+
+static irqreturn_t handle_lcd_irq(struct drm_device *dev)
+{

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   unsigned long status, val, val1;
+   int plane_id, dma0_state, dma1_state;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   status = kmb_read_lcd(kmb, LCD_INT_STATUS);
+
+   if (status & LCD_INT_EOF) {
+           kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF);
+
+           /* When disabling/enabling LCD layers, the change takes

effect

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+            * immediately and does not wait for EOF (end of frame).
+            * When kmb_plane_atomic_disable is called, mark the

plane as

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+            * disabled but actually disable the plane when EOF irq is
+            * being handled.
+            */
+           for (plane_id = LAYER_0;
+                           plane_id < KMB_MAX_PLANES; plane_id++)

{

drivers/gpu/drm/kmb/kmb_drv.c line 337

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+                   if (kmb->plane_status[plane_id].disable) {
+                           kmb_clr_bitmask_lcd(kmb,
+                                               LCD_LAYERn_DMA_CFG
+                                               (plane_id),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+
+                           kmb_clr_bitmask_lcd(kmb, LCD_CONTROL,
+                                               kmb-

plane_status[plane_id].ctrl);

drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+                           kmb->plane_status[plane_id].disable = false;
+                   }
+           }
+           if (kmb_under_flow) {
+                   /* DMA Recovery after underflow */
+                   dma0_state = (layer_no == 0) ?
+                       LCD_VIDEO0_DMA0_STATE :

LCD_VIDEO1_DMA0_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   dma1_state = (layer_no == 0) ?
+                       LCD_VIDEO0_DMA1_STATE :

LCD_VIDEO1_DMA1_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+                   do {
+                           kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+                           val = kmb_read_lcd(kmb, dma0_state)
+                               & LCD_DMA_STATE_ACTIVE;
+                           val1 = kmb_read_lcd(kmb, dma1_state)
+                               & LCD_DMA_STATE_ACTIVE;
+                   } while ((val || val1));
+                   /* disable dma */
+                   kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(layer_no),

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+                                       LCD_DMA_LAYER_ENABLE);
+                   kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+                   kmb_flush_done = 1;
+                   kmb_under_flow = 0;
+           }
+   }
+
+   if (status & LCD_INT_LINE_CMP) {
+           /* clear line compare interrupt */
+           kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LINE_CMP);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   }
+
+   if (status & LCD_INT_VERT_COMP) {
+           /* Read VSTATUS */
+           val = kmb_read_lcd(kmb, LCD_VSTATUS);
+           val = (val & LCD_VSTATUS_VERTICAL_STATUS_MASK);
+           switch (val) {
+           case LCD_VSTATUS_COMPARE_VSYNC:
+                   /* Clear vertical compare interrupt */
+                   kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

drivers/gpu/drm/kmb/kmb_drv.c line 422

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+                   if (kmb_flush_done) {
+                           kmb_set_bitmask_lcd(kmb,
+                                               LCD_LAYERn_DMA_CFG
+                                               (layer_no),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c line 387

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+                           kmb_flush_done = 0;
+                   }
+                   drm_handle_vblank(dev, 0);

Would be nice to use the new-style drm_crtc_handle_vblank here.

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+                   break;
+           case LCD_VSTATUS_COMPARE_BACKPORCH:
+           case LCD_VSTATUS_COMPARE_ACTIVE:
+           case LCD_VSTATUS_COMPARE_FRONT_PORCH:
+                   kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+                   break;
+           }
+   }
+   if (status & LCD_INT_DMA_ERR) {

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+           val =
+               (status & LCD_INT_DMA_ERR &
+                kmb_read_lcd(kmb, LCD_INT_ENABLE));
+           /* LAYER0 - VL0 */
+           if (val & (LAYER0_DMA_FIFO_UNDERFLOW |
+                      LAYER0_DMA_CB_FIFO_UNDERFLOW |
+                      LAYER0_DMA_CR_FIFO_UNDERFLOW)) {
+                   kmb_under_flow++;
+                   drm_info(&kmb->drm,
+                            "!LAYER0:VL0 DMA UNDERFLOW val =

0x%lx,under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+                        val, kmb_under_flow);
+                   /* disable underflow interrupt */
+                   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                                       LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+ LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   /* disable auto restart mode */
+                   kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(0),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+                   layer_no = 0;
+           }
+
+           if (val & LAYER0_DMA_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER0:VL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER0_DMA_CB_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER0:VL0 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER0_DMA_CR_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER0:VL0 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+           /* LAYER1 - VL1 */
+           if (val & (LAYER1_DMA_FIFO_UNDERFLOW |
+                      LAYER1_DMA_CB_FIFO_UNDERFLOW |
+                      LAYER1_DMA_CR_FIFO_UNDERFLOW)) {
+                   kmb_under_flow++;
+                   drm_info(&kmb->drm,
+                            "!LAYER1:VL1 DMA UNDERFLOW val =

0x%lx, under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+                        val, kmb_under_flow);
+                   /* disable underflow interrupt */
+                   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                                       LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+ LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   /* disable auto restart mode */
+                   kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(1),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+                   layer_no = 1;
+           }
+
+           /* LAYER1 - VL1 */
+           if (val & LAYER1_DMA_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER1:VL1 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER1_DMA_CB_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER1:VL1 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER1_DMA_CR_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER1:VL1 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+           /* LAYER2 - GL0 */
+           if (val & LAYER2_DMA_FIFO_UNDERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER2:GL0 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER2_DMA_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER2:GL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+           /* LAYER3 - GL1 */
+           if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER3:GL1 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER3:GL1 DMA OVERFLOW val = 0x%lx",

val);

Quoted 74 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +74 -0
+   }
+
+   if (status & LCD_INT_LAYER) {
+           /* Clear layer interrupts */
+           kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LAYER);
+   }
+
+   /* Clear all interrupts */
+   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, 1);
+   return IRQ_HANDLED;
+}
+
+/* IRQ handler */
+static irqreturn_t kmb_isr(int irq, void *arg)
+{
+   struct drm_device *dev = (struct drm_device *)arg;
+
+   handle_lcd_irq(dev);
+   return IRQ_HANDLED;
+}
+
+static void kmb_irq_reset(struct drm_device *drm)
+{
+   kmb_write_lcd(to_kmb(drm), LCD_INT_CLEAR, 0xFFFF);
+   kmb_write_lcd(to_kmb(drm), LCD_INT_ENABLE, 0);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(fops);
+
+static struct drm_driver kmb_driver = {
+   .driver_features = DRIVER_GEM |
+       DRIVER_MODESET | DRIVER_ATOMIC,
+   .irq_handler = kmb_isr,
+   .irq_preinstall = kmb_irq_reset,
+   .irq_uninstall = kmb_irq_reset,
+   /* GEM Operations */
+   .fops = &fops,
+   DRM_GEM_CMA_DRIVER_OPS_VMAP,
+   .name = "kmb-drm",
+   .desc = "KEEMBAY DISPLAY DRIVER ",
+   .date = "20190122",
+   .major = 1,
+   .minor = 0,
+};
+
+static int kmb_remove(struct platform_device *pdev)
+{
+   struct device *dev = &pdev->dev;
+   struct drm_device *drm = dev_get_drvdata(dev);
+   struct kmb_drm_private *kmb = to_kmb(drm);
+
+   drm_dev_unregister(drm);
+   drm_kms_helper_poll_fini(drm);
+   of_node_put(kmb->crtc.port);
+   kmb->crtc.port = NULL;
+   pm_runtime_get_sync(drm->dev);
+   drm_irq_uninstall(drm);
+   pm_runtime_put_sync(drm->dev);
+   pm_runtime_disable(drm->dev);
+
+   of_reserved_mem_device_release(drm->dev);
+
+   /* Release clks */
+   kmb_display_clk_disable();
+   clk_put(kmb_clk.clk_lcd);
+   clk_put(kmb_clk.clk_mipi);
+
+   dev_set_drvdata(dev, NULL);
+
+   /* Unregister DSI host */
+   kmb_dsi_host_unregister();
+   return 0;
+}
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+static int kmb_probe(struct platform_device *pdev)
+{
+   struct device *dev = get_device(&pdev->dev);
+   struct kmb_drm_private *kmb;
+   int ret = 0;
+
+   /* The bridge (ADV 7535) will return -EPROBE_DEFER until it
+    * has a mipi_dsi_host to register its device to. So, we
+    * first register the DSI host during probe time, and then return
+    * -EPROBE_DEFER until the bridge is loaded. Probe will be called

again

Quoted 85 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +85 -0
+    *  and then the rest of the driver initialization can proceed
+    *  afterwards and the bridge can be successfully attached.
+    */
+   adv_bridge = kmb_dsi_host_bridge_init(dev);
+
+   if (adv_bridge == ERR_PTR(-EPROBE_DEFER)) {
+           return -EPROBE_DEFER;
+   } else if (IS_ERR(adv_bridge)) {
+           DRM_ERROR("probe failed to initialize DSI host bridge\n");
+           return PTR_ERR(adv_bridge);
+   }
+
+   /* Create DRM device */
+   kmb = devm_drm_dev_alloc(dev, &kmb_driver,
+                            struct kmb_drm_private, drm);
+   if (IS_ERR(kmb))
+           return PTR_ERR(kmb);
+
+   dev_set_drvdata(dev, &kmb->drm);
+
+   ret = kmb_hw_init(&kmb->drm, 0);
+   if (ret)
+           goto err_free1;
+
+   ret = kmb_setup_mode_config(&kmb->drm);
+   if (ret)
+           goto err_free;
+
+   ret = drm_irq_install(&kmb->drm, kmb->irq_lcd);
+   if (ret < 0) {
+           drm_err(&kmb->drm, "failed to install IRQ handler\n");
+           goto err_irq;
+   }
+
+   drm_kms_helper_poll_init(&kmb->drm);
+
+   /* Register graphics device with the kernel */
+   ret = drm_dev_register(&kmb->drm, 0);
+   if (ret)
+           goto err_register;
+
+   return 0;
+
+ err_register:
+   drm_kms_helper_poll_fini(&kmb->drm);
+ err_irq:
+   pm_runtime_disable(kmb->drm.dev);
+ err_free:
+   drm_crtc_cleanup(&kmb->crtc);
+   drm_mode_config_cleanup(&kmb->drm);
+ err_free1:
+   dev_set_drvdata(dev, NULL);
+   kmb_dsi_host_unregister();
+
+   return ret;
+}
+
+static const struct of_device_id kmb_of_match[] = {
+   {.compatible = "intel,kmb_display"},
+   {},
+};
+
+MODULE_DEVICE_TABLE(of, kmb_of_match);
+
+static int __maybe_unused kmb_pm_suspend(struct device *dev)
+{
+   struct drm_device *drm = dev_get_drvdata(dev);
+   struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+   drm_kms_helper_poll_disable(drm);
+
+   kmb->state = drm_atomic_helper_suspend(drm);
+   if (IS_ERR(kmb->state)) {
+           drm_kms_helper_poll_enable(drm);
+           return PTR_ERR(kmb->state);
+   }
+
+   return 0;
+}
+
+static int __maybe_unused kmb_pm_resume(struct device *dev)
+{
+   struct drm_device *drm = dev_get_drvdata(dev);
+   struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   if (!kmb)
+           return 0;
+
+   drm_atomic_helper_resume(drm, kmb->state);
+   drm_kms_helper_poll_enable(drm);
+
+   return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend,

kmb_pm_resume);

Review

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +16 -0
+
+static struct platform_driver kmb_platform_driver = {
+   .probe = kmb_probe,
+   .remove = kmb_remove,
+   .driver = {
+           .name = "kmb-drm",
+           .pm = &kmb_pm_ops,
+           .of_match_table = kmb_of_match,
+   },
+};
+
+module_platform_driver(kmb_platform_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_DESCRIPTION("Keembay Display driver");
+MODULE_LICENSE("GPL v2");
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.h

Quoted 7 lines

new file mode 100644
index 0000000..352f2d2

drivers/gpu/drm/kmb/kmb_drv.h new file +2 -0
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *

drivers/gpu/drm/kmb/kmb_drv.h line 12

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_DRV_H__
+#define __KMB_DRV_H__
+
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+#define KMB_MAX_WIDTH                      1920 /*max width in pixels

*/

drivers/gpu/drm/kmb/kmb_drv.h line 13

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.h new file +1 -0
+#define KMB_MAX_HEIGHT                     1080 /*max height in

pixels */

Quoted 27 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +27 -0
+#define KMB_MIN_WIDTH                   1920 /*max width in pixels */
+#define KMB_MIN_HEIGHT                  1080 /*max height in pixels */
+#define KMB_LCD_DEFAULT_CLK                200000000
+#define KMB_MIPI_DEFAULT_CLK               24000000
+#define KMB_MIPI_DEFAULT_CFG_CLK   24000000
+#define KMB_SYS_CLK_MHZ                    500
+
+#define ICAM_MMIO          0x3b100000
+#define ICAM_LCD_OFFSET            0x1080
+#define ICAM_MMIO_SIZE             0x2000
+
+struct kmb_drm_private {
+   struct drm_device               drm;
+   void __iomem                    *lcd_mmio;
+   void __iomem                    *mipi_mmio;
+   void __iomem                    *msscam_mmio;
+   struct clk                      *clk;
+   struct drm_crtc                 crtc;
+   struct kmb_plane                *plane;
+   struct drm_atomic_state         *state;
+   spinlock_t                      irq_lock;
+   int                             irq_lcd;
+   int                             irq_mipi;
+   int                             sys_clk_mhz;
+   dma_addr_t                      fb_addr;
+   struct layer_status             plane_status[KMB_MAX_PLANES];
+};

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+struct kmb_clock {
+   struct clk *clk_lcd;
+   struct clk *clk_mipi;
+   struct clk *clk_mipi_ecfg;
+   struct clk *clk_mipi_cfg;
+   struct clk *clk_pll0;
+};
+
+static inline struct kmb_drm_private *to_kmb(const struct drm_device

*dev)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+   return container_of(dev, struct kmb_drm_private, drm);
+}
+
+static inline struct kmb_drm_private *crtc_to_kmb_priv(const struct

drm_crtc *x)

Quoted 23 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +23 -0
+{
+   return container_of(x, struct kmb_drm_private, crtc);
+}
+
+struct blt_layer_config {
+   unsigned char layer_format;
+};
+
+static inline void kmb_write_lcd(struct kmb_drm_private *dev_p,
+                            unsigned int reg, u32 value)
+{
+   writel(value, (dev_p->lcd_mmio + reg));
+}
+
+static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
+                             unsigned int reg, u32 value)
+{
+   writel(value, (dev_p->mipi_mmio + reg));
+}
+
+static inline void kmb_write_msscam(struct kmb_drm_private *dev_p,
+                               unsigned int reg, u32 value)
+{

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+   writel(value, (dev_p->msscam_mmio + reg));
+}
+
+static inline u32 kmb_read_msscam(struct kmb_drm_private *dev_p,
+                             unsigned int reg)
+{
+   return readl(dev_p->msscam_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_msscam(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+                                     unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_msscam(dev_p, reg);
+
+   kmb_write_msscam(dev_p, reg, (reg_val | mask));
+}
+
+static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p,

unsigned int reg)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+   return readl(dev_p->lcd_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_lcd(struct kmb_drm_private

*dev_p,

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+                                  unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+   kmb_write_lcd(dev_p, reg, (reg_val | mask));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bitmask_lcd(struct kmb_drm_private *dev_p,
+                                  unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+   kmb_write_lcd(dev_p, reg, (reg_val & (~mask)));
+}
+
+static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p,

unsigned int reg)

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +25 -0
+{
+   return readl(dev_p->mipi_mmio + reg);
+}
+
+static inline void kmb_write_bits_mipi(struct kmb_drm_private *dev_p,
+                                  unsigned int reg, u32 offset,
+                                  u32 num_bits, u32 value)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+   u32 mask = (1 << num_bits) - 1;
+
+   value &= mask;
+   mask <<= offset;
+   reg_val &= (~mask);
+   reg_val |= (value << offset);
+   kmb_write_mipi(dev_p, reg, reg_val);
+}
+
+static inline void kmb_set_bit_mipi(struct kmb_drm_private *dev_p,
+                               unsigned int reg, u32 offset)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, reg_val | (1 << offset));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bit_mipi(struct kmb_drm_private *dev_p,
+                               unsigned int reg, u32 offset)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, reg_val & (~(1 << offset)));
+}
+
+static inline void kmb_set_bitmask_mipi(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+                                   unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private

*dev_p,

Review

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+                                   unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, (reg_val & (~mask)));
+}
+
+int kmb_setup_crtc(struct drm_device *dev);
+void kmb_set_scanout(struct kmb_drm_private *lcd);
+#endif /* __KMB_DRV_H__ */
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.c

Quoted 23 lines

new file mode 100644
index 0000000..d1e7786

drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_plane_helper.h>
+
+#include "kmb_drv.h"
+#include "kmb_plane.h"

drivers/gpu/drm/kmb/kmb_plane.c line 28

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+#include "kmb_regs.h"
+
+const u32 layer_irqs[] = {
+   LCD_INT_VL0,
+   LCD_INT_VL1,
+   LCD_INT_GL0,
+   LCD_INT_GL1
+};
+
+static unsigned int check_pixel_format(struct drm_plane *plane, u32

format)

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+{
+   int i;
+
+   for (i = 0; i < plane->format_count; i++) {
+           if (plane->format_types[i] == format)
+                   return 0;
+   }
+   return -EINVAL;
+}
+
+static int kmb_plane_atomic_check(struct drm_plane *plane,
+                             struct drm_plane_state *state)
+{
+   struct drm_framebuffer *fb;
+   int ret;
+   struct drm_crtc_state *crtc_state;
+   bool can_position;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+   fb = state->fb;
+   if (!fb || !state->crtc)
+           return 0;
+
+   ret = check_pixel_format(plane, fb->format->format);
+   if (ret)
+           return ret;
+
+   if (state->crtc_w > KMB_MAX_WIDTH || state->crtc_h >

KMB_MAX_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 57

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+           return -EINVAL;
+   if (state->crtc_w < KMB_MIN_WIDTH || state->crtc_h <

KMB_MIN_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 67

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+           return -EINVAL;
+   can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
+   crtc_state =
+           drm_atomic_get_existing_crtc_state(state->state, state-

crtc);

drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+   return drm_atomic_helper_check_plane_state(state, crtc_state,
+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 1 line

+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +28 -0
+                                            can_position, true);
+}
+
+static void kmb_plane_atomic_disable(struct drm_plane *plane,
+                                struct drm_plane_state *state)
+{
+   struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+   int plane_id = kmb_plane->id;
+   struct kmb_drm_private *kmb;
+
+   kmb = to_kmb(plane->dev);
+
+   switch (plane_id) {
+   case LAYER_0:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
+           break;
+   case LAYER_1:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
+           break;
+   case LAYER_2:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
+           break;
+   case LAYER_3:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
+           break;
+   }
+
+   kmb->plane_status[plane_id].disable = true;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+}
+
+unsigned int get_pixel_format(u32 format)
+{
+   unsigned int val = 0;
+
+   switch (format) {
+           /* planar formats */
+   case DRM_FORMAT_YUV444:
+           val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_YVU444:
+           val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+   case DRM_FORMAT_YUV422:
+           val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_YVU422:
+           val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+   case DRM_FORMAT_YUV420:
+           val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_YVU420:
+           val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+   case DRM_FORMAT_NV12:
+           val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_NV21:
+           val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+           /* packed formats */
+           /* looks hw requires B & G to be swapped when RGB */
+   case DRM_FORMAT_RGB332:
+           val = LCD_LAYER_FORMAT_RGB332 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_XBGR4444:
+           val = LCD_LAYER_FORMAT_RGBX4444;
+           break;
+   case DRM_FORMAT_ARGB4444:
+           val = LCD_LAYER_FORMAT_RGBA4444 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_ABGR4444:
+           val = LCD_LAYER_FORMAT_RGBA4444;
+           break;
+   case DRM_FORMAT_XRGB1555:
+           val = LCD_LAYER_FORMAT_XRGB1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_XBGR1555:
+           val = LCD_LAYER_FORMAT_XRGB1555;
+           break;
+   case DRM_FORMAT_ARGB1555:
+           val = LCD_LAYER_FORMAT_RGBA1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_ABGR1555:
+           val = LCD_LAYER_FORMAT_RGBA1555;
+           break;
+   case DRM_FORMAT_RGB565:
+           val = LCD_LAYER_FORMAT_RGB565 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_BGR565:
+           val = LCD_LAYER_FORMAT_RGB565;
+           break;
+   case DRM_FORMAT_RGB888:
+           val = LCD_LAYER_FORMAT_RGB888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_BGR888:
+           val = LCD_LAYER_FORMAT_RGB888;
+           break;
+   case DRM_FORMAT_XRGB8888:
+           val = LCD_LAYER_FORMAT_RGBX8888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_XBGR8888:
+           val = LCD_LAYER_FORMAT_RGBX8888;
+           break;
+   case DRM_FORMAT_ARGB8888:
+           val = LCD_LAYER_FORMAT_RGBA8888 |

LCD_LAYER_BGR_ORDER;

Quoted 35 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +35 -0
+           break;
+   case DRM_FORMAT_ABGR8888:
+           val = LCD_LAYER_FORMAT_RGBA8888;
+           break;
+   }
+   DRM_INFO_ONCE("%s : %d format=0x%x val=0x%x\n",
+                 __func__, __LINE__, format, val);
+   return val;
+}
+
+unsigned int get_bits_per_pixel(const struct drm_format_info *format)
+{
+   u32 bpp = 0;
+   unsigned int val = 0;
+
+   if (format->num_planes > 1) {
+           val = LCD_LAYER_8BPP;
+           return val;
+   }
+
+   bpp += 8 * format->cpp[0];
+
+   switch (bpp) {
+   case 8:
+           val = LCD_LAYER_8BPP;
+           break;
+   case 16:
+           val = LCD_LAYER_16BPP;
+           break;
+   case 24:
+           val = LCD_LAYER_24BPP;
+           break;
+   case 32:
+           val = LCD_LAYER_32BPP;
+           break;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+   }
+
+   DRM_DEBUG("bpp=%d val=0x%x\n", bpp, val);
+   return val;
+}
+
+static void config_csc(struct kmb_drm_private *kmb, int plane_id)
+{
+   /* YUV to RGB conversion using the fixed matrix csc_coef_lcd */
+   kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id),

csc_coef_lcd[0]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id),

csc_coef_lcd[1]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id),

csc_coef_lcd[2]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id),

csc_coef_lcd[3]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id),

csc_coef_lcd[4]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id),

csc_coef_lcd[5]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id),

csc_coef_lcd[6]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id),

csc_coef_lcd[7]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id),

csc_coef_lcd[8]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id),

csc_coef_lcd[9]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id),

csc_coef_lcd[10]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id),

csc_coef_lcd[11]);

Quoted 22 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +22 -0
+}
+
+static void kmb_plane_atomic_update(struct drm_plane *plane,
+                               struct drm_plane_state *state)
+{
+   struct drm_framebuffer *fb;
+   struct kmb_drm_private *kmb;
+   unsigned int width;
+   unsigned int height;
+   unsigned int dma_len;
+   struct kmb_plane *kmb_plane;
+   unsigned int dma_cfg;
+   unsigned int ctrl = 0, val = 0, out_format = 0;
+   unsigned int src_w, src_h, crtc_x, crtc_y;
+   unsigned char plane_id;
+   int num_planes;
+   static dma_addr_t addr[MAX_SUB_PLANES];
+
+   if (!plane || !plane->state || !state)
+           return;
+
+   fb = plane->state->fb;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+   if (!fb)
+           return;
+   num_planes = fb->format->num_planes;
+   kmb_plane = to_kmb_plane(plane);
+   plane_id = kmb_plane->id;
+
+   kmb = to_kmb(plane->dev);
+
+   if (kmb_under_flow || kmb_flush_done) {
+           drm_dbg(&kmb->drm, "plane_update:underflow!!!!

returning");

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+           return;
+   }
+
+   src_w = (plane->state->src_w >> 16);
+   src_h = plane->state->src_h >> 16;
+   crtc_x = plane->state->crtc_x;
+   crtc_y = plane->state->crtc_y;
+
+   drm_dbg(&kmb->drm,
+           "src_w=%d src_h=%d, fb->format->format=0x%x fb-

flags=0x%x\n",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8 -0
+             src_w, src_h, fb->format->format, fb->flags);
+
+   width = fb->width;
+   height = fb->height;
+   dma_len = (width * height * fb->format->cpp[0]);
+   drm_dbg(&kmb->drm, "dma_len=%d ", dma_len);
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id),

dma_len);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
+                 fb->pitches[0]);
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
+                 (width * fb->format->cpp[0]));

drivers/gpu/drm/kmb/kmb_plane.c line 303

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+   addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
+   kmb->fb_addr = addr[Y_PLANE];
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
+                 addr[Y_PLANE] + fb->offsets[0]);
+   val = get_pixel_format(fb->format->format);
+   val |= get_bits_per_pixel(fb->format);
+   /* Program Cb/Cr for planar formats */
+   if (num_planes > 1) {
+           kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+                         width * fb->format->cpp[0]);
+           kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+                         (width * fb->format->cpp[0]));
+
+           addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane-

state,

drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+                                                   U_PLANE);
+           /* check if Cb/Cr is swapped*/
+           if (num_planes == 3 && (val & LCD_LAYER_CRCB_ORDER))
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+                                   addr[U_PLANE]);
+           else
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 315

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+                                   addr[U_PLANE]);
+
+           if (num_planes == 3) {
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 319

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+                                 ((width) * fb->format->cpp[0]));
+
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+                                 ((width) * fb->format->cpp[0]));
+
+                   addr[V_PLANE] = drm_fb_cma_get_gem_addr(fb,
+                                                           plane->state,
+                                                           V_PLANE);
+
+                   /* check if Cb/Cr is swapped*/
+                   if (val & LCD_LAYER_CRCB_ORDER)
+                           kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+                                         addr[V_PLANE]);
+                   else
+                           kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

Quoted 46 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +46 -0
+                                         addr[V_PLANE]);
+           }
+   }
+
+   kmb_write_lcd(kmb, LCD_LAYERn_WIDTH(plane_id), src_w - 1);
+   kmb_write_lcd(kmb, LCD_LAYERn_HEIGHT(plane_id), src_h - 1);
+   kmb_write_lcd(kmb, LCD_LAYERn_COL_START(plane_id), crtc_x);
+   kmb_write_lcd(kmb, LCD_LAYERn_ROW_START(plane_id), crtc_y);
+
+   val |= LCD_LAYER_FIFO_100;
+
+   if (val & LCD_LAYER_PLANAR_STORAGE) {
+           val |= LCD_LAYER_CSC_EN;
+
+           /* Enable CSC if input is planar and output is RGB */
+           config_csc(kmb, plane_id);
+   }
+
+   kmb_write_lcd(kmb, LCD_LAYERn_CFG(plane_id), val);
+
+   switch (plane_id) {
+   case LAYER_0:
+           ctrl = LCD_CTRL_VL1_ENABLE;
+           break;
+   case LAYER_1:
+           ctrl = LCD_CTRL_VL2_ENABLE;
+           break;
+   case LAYER_2:
+           ctrl = LCD_CTRL_GL1_ENABLE;
+           break;
+   case LAYER_3:
+           ctrl = LCD_CTRL_GL2_ENABLE;
+           break;
+   }
+
+   ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE
+       | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED;
+
+   /* LCD is connected to MIPI on kmb
+    * Therefore this bit is required for DSI Tx
+    */
+   ctrl |= LCD_CTRL_VHSYNC_IDLE_LVL;
+
+   kmb_set_bitmask_lcd(kmb, LCD_CONTROL, ctrl);
+
+   /* FIXME no doc on how to set output format,these values are

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+    * taken from the Myriadx tests
+    */
+   out_format |= LCD_OUTF_FORMAT_RGB888;
+
+   /* Leave RGB order,conversion mode and clip mode to default */
+   /* do not interleave RGB channels for mipi Tx compatibility */
+   out_format |= LCD_OUTF_MIPI_RGB_MODE;
+   kmb_write_lcd(kmb, LCD_OUT_FORMAT_CFG, out_format);
+
+   dma_cfg = LCD_DMA_LAYER_ENABLE |

LCD_DMA_LAYER_VSTRIDE_EN |

Quoted 1 line

+ LCD_DMA_LAYER_CONT_UPDATE |

LCD_DMA_LAYER_AXI_BURST_16;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+
+   /* Enable DMA */
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id), dma_cfg);
+   drm_dbg(&kmb->drm, "dma_cfg=0x%x LCD_DMA_CFG=0x%x\n",

dma_cfg,

Quoted 18 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
+           kmb_read_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id)));
+
+   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF |
+                   LCD_INT_DMA_ERR);
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, LCD_INT_EOF |
+                   LCD_INT_DMA_ERR);
+}
+
+static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
+   .atomic_check = kmb_plane_atomic_check,
+   .atomic_update = kmb_plane_atomic_update,
+   .atomic_disable = kmb_plane_atomic_disable
+};
+
+void kmb_plane_destroy(struct drm_plane *plane)
+{
+   struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+   drm_plane_cleanup(plane);
+   kfree(kmb_plane);
+}
+
+static const struct drm_plane_funcs kmb_plane_funcs = {
+   .update_plane = drm_atomic_helper_update_plane,
+   .disable_plane = drm_atomic_helper_disable_plane,
+   .destroy = kmb_plane_destroy,
+   .reset = drm_atomic_helper_plane_reset,
+   .atomic_duplicate_state =

drm_atomic_helper_plane_duplicate_state,

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+   .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+};
+
+struct kmb_plane *kmb_plane_init(struct drm_device *drm)
+{
+   struct kmb_drm_private *kmb = to_kmb(drm);
+   struct kmb_plane *plane = NULL;
+   struct kmb_plane *primary = NULL;
+   int i = 0;
+   int ret = 0;
+   enum drm_plane_type plane_type;
+   const u32 *plane_formats;
+   int num_plane_formats;
+
+   for (i = 0; i < KMB_MAX_PLANES; i++) {
+           plane = drmm_kzalloc(drm, sizeof(*plane), GFP_KERNEL);
+

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+           if (!plane) {
+                   drm_err(drm, "Failed to allocate plane\n");
+                   return ERR_PTR(-ENOMEM);
+           }
+
+           plane_type = (i == 0) ? DRM_PLANE_TYPE_PRIMARY :
+               DRM_PLANE_TYPE_OVERLAY;
+           if (i < 2) {
+                   plane_formats = kmb_formats_v;
+                   num_plane_formats =

ARRAY_SIZE(kmb_formats_v);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           } else {
+                   plane_formats = kmb_formats_g;
+                   num_plane_formats =

ARRAY_SIZE(kmb_formats_g);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+           }
+
+           ret = drm_universal_plane_init(drm, &plane->base_plane,
+                                          POSSIBLE_CRTCS,

&kmb_plane_funcs,

Quoted 1 line

+ plane_formats,

num_plane_formats,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+                                          NULL, plane_type, "plane %d", i);
+           if (ret < 0) {
+                   drm_err(drm, "drm_universal_plane_init failed

(ret=%d)",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +13 -0
+                           ret);
+                   goto cleanup;
+           }
+           drm_dbg(drm, "%s : %d i=%d type=%d",
+                   __func__, __LINE__,
+                     i, plane_type);
+           drm_plane_helper_add(&plane->base_plane,
+                                &kmb_plane_helper_funcs);
+           if (plane_type == DRM_PLANE_TYPE_PRIMARY) {
+                   primary = plane;
+                   kmb->plane = plane;
+           }
+           drm_dbg(drm, "%s : %d primary=%p\n", __func__,

__LINE__,

Review

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0
+                   &primary->base_plane);
+           plane->id = i;
+   }
+
+   return primary;
+cleanup:
+   drmm_kfree(drm, plane);
+   return ERR_PTR(ret);
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.h

Quoted 21 lines

new file mode 100644
index 0000000..141cdaa

drivers/gpu/drm/kmb/kmb_plane.h new file +16 -0
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_PLANE_H__
+#define __KMB_PLANE_H__
+
+extern int kmb_under_flow;
+extern int kmb_flush_done;
+
+#define LCD_INT_VL0_ERR ((LAYER0_DMA_FIFO_UNDERFLOW) | \
+                   (LAYER0_DMA_FIFO_OVERFLOW) | \
+                   (LAYER0_DMA_CB_FIFO_OVERFLOW) | \
+                   (LAYER0_DMA_CB_FIFO_UNDERFLOW) | \
+                   (LAYER0_DMA_CR_FIFO_OVERFLOW) | \

drivers/gpu/drm/kmb/kmb_plane.h line 26

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+                   (LAYER0_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_VL1_ERR ((LAYER1_DMA_FIFO_UNDERFLOW) | \
+                   (LAYER1_DMA_FIFO_OVERFLOW) | \
+                   (LAYER1_DMA_CB_FIFO_OVERFLOW) | \
+                   (LAYER1_DMA_CB_FIFO_UNDERFLOW) | \
+                   (LAYER1_DMA_CR_FIFO_OVERFLOW) | \
+                   (LAYER1_DMA_CR_FIFO_UNDERFLOW))
+
+#define LCD_INT_GL0_ERR (LAYER2_DMA_FIFO_OVERFLOW |

LAYER2_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h line 27

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL1_ERR (LAYER3_DMA_FIFO_OVERFLOW |

LAYER3_DMA_FIFO_UNDERFLOW)

drivers/gpu/drm/kmb/kmb_plane.h line 28

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_VL0 (LAYER0_DMA_DONE | LAYER0_DMA_IDLE |

LCD_INT_VL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 29

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_VL1 (LAYER1_DMA_DONE | LAYER1_DMA_IDLE |

LCD_INT_VL1_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 30

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL0 (LAYER2_DMA_DONE | LAYER2_DMA_IDLE |

LCD_INT_GL0_ERR)

drivers/gpu/drm/kmb/kmb_plane.h line 31

Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1 -0
+#define LCD_INT_GL1 (LAYER3_DMA_DONE | LAYER3_DMA_IDLE |

LCD_INT_GL1_ERR)

Quoted 19 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +19 -0
+#define LCD_INT_DMA_ERR (LCD_INT_VL0_ERR | LCD_INT_VL1_ERR \
+           | LCD_INT_GL0_ERR | LCD_INT_GL1_ERR)
+
+#define POSSIBLE_CRTCS 1
+#define to_kmb_plane(x) container_of(x, struct kmb_plane, base_plane)
+
+enum layer_id {
+   LAYER_0,
+   LAYER_1,
+   LAYER_2,
+   LAYER_3,
+   /* KMB_MAX_PLANES */
+};
+
+#define KMB_MAX_PLANES 1
+
+enum sub_plane_id {
+   Y_PLANE,
+   U_PLANE,

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10 -0
+   V_PLANE,
+   MAX_SUB_PLANES,
+};
+
+struct kmb_plane {
+   struct drm_plane base_plane;
+   unsigned char id;
+};
+
+/* Graphics layer (layers 2 & 3) formats, only packed formats  are

supported */

Quoted 13 lines

drivers/gpu/drm/kmb/kmb_plane.h line 63

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +3 -0
+static const u32 kmb_formats_g[] = {
+   DRM_FORMAT_RGB332,
+   DRM_FORMAT_XRGB4444, DRM_FORMAT_XBGR4444,
[… more lines in the raw message]

supported */

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 25 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +25 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

The static const arrays above look a bit strange in a header file (and could result in duplication in the driver .ko), please move to .c files. Headers should only contain definitions, not declarations of actual storage.

Cheers, Daniel

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9 -1

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

2.7.4

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

7 lines not shown · raw message

Parts of this message are not shown here. View the raw message.

author maintainer
#10 lore raw

RE: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 18 lines

-----Original Message-----
From: Daniel Vetter <[email protected]>
Sent: Friday, October 2, 2020 2:19 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>
Subject: Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay Display

Quoted 3 lines · Anitha

Hi Daniel,
I was finally able to test the driver with 5.9 kernel with minor changes in

the driver.

Quoted 1 line

Ran the igt_vblank test and it passed/skipped all the subtests except the

Quoted 8 lines

pipe-A-accuracy-idle test.

Quoted 1 line

Results are attached. Investigated the failing test and it seems like

drm_handle_vblank() is taking too long sometimes. I can work on this after we merge.

kms_flip is the one that should check whether vblank events and page flip events agree. Which I think isn't the case with your current code.

Thanks. I will run that test and work on the failures. I did send v8 with 5.9 testing changes today and also sent the YAML file v1 today to [email protected], not sure if I should cc dri-devel,, should I?

Anitha

Quoted 1,978 lines

-Daniel

Quoted 2 lines

Will send out V8 with the minor changes and device tree YAML binding

file ASAP. Will work on the rest of the review comments after.

Quoted 11 lines

Thanks,
Anitha

Quoted 7 lines

From: Daniel Vetter <[email protected]>
Sent: Thursday, September 10, 2020 1:31 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>
Subject: Re: [PATCH v7 2/4] drm/kmb: Add support for KeemBay

Display

Quoted 2 lines
Quoted 2 lines

On Mon, Aug 31, 2020 at 01:02:50PM -0700, Anitha Chrisanthus

Quoted 1 line · wrote:
Quoted 1 line
Quoted 1 line

This is a basic KMS atomic modesetting display driver for KeemBay

family

Quoted 10 lines
Quoted 10 lines

of

Quoted 9 lines

SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.

Single CRTC with LCD controller->mipi DSI-> ADV bridge

Only 1080p resolution and single plane is supported at this time.

v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed

HAVE_IRQ.(Sam)

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines

v3: Squashed all 59 commits to one

v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP

Quoted 14 lines
Quoted 6 lines
Quoted 6 lines

v5: corrected spellings
v6: corrected checkpatch warnings
v7: review changes Sam Ravnborg and Thomas Zimmerman
removed kmb_crtc.h kmb_crtc_cleanup (Thomas) renamed mode_set, kmb_load, inlined unload (Thomas) moved remaining logging to drm_*(Thomas)

Quoted 8 lines
Quoted 8 lines

re-orged driver initialization (Thomas)
moved plane_status to drm_private (Sam)
removed unnecessary logs and defines and ifdef codes (Sam) call helper_check in plane_atomic_check (Sam)
renamed set to get for bpp and format functions(Sam)
use drm helper functions for reset, duplicate/destroy state instead of kmb functions (Sam)
removed kmb_priv from kmb_plane and removed

kmb_plane_state

Quoted 229 lines
Quoted 229 lines

(Sam)

Quoted 4 lines

Sam asked me to take a look at this too, looks reasonable overall. I've spotted a few small things plus a potential functional issue around vblank/event handling. I strongly recommend running the igt test suite over the driver to see whether it all works reasonably ok. See below for details.

Quoted 3 lines
---
 drivers/gpu/drm/kmb/kmb_crtc.c  | 224 +++++++++++++
 drivers/gpu/drm/kmb/kmb_drv.c   | 676

++++++++++++++++++++++++++++++++++++++++

Quoted 2 lines
 drivers/gpu/drm/kmb/kmb_drv.h   | 170 ++++++++++
 drivers/gpu/drm/kmb/kmb_plane.c | 480

++++++++++++++++++++++++++++

Review

Quoted 9 lines
 drivers/gpu/drm/kmb/kmb_plane.h | 110 +++++++
 5 files changed, 1660 insertions(+)
 create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_drv.h
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.c
 create mode 100644 drivers/gpu/drm/kmb/kmb_plane.h
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 68 lines

new file mode 100644
index 0000000..a684331

drivers/gpu/drm/kmb/kmb_crtc.c new file +63 -0
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/of_graph.h>
+#include <linux/platform_data/simplefb.h>
+
+#include <video/videomode.h>
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_debugfs.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_of.h>
+#include <drm/drm_plane_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+struct kmb_crtc_timing {
+   u32 vfront_porch;
+   u32 vback_porch;
+   u32 vsync_len;
+   u32 hfront_porch;
+   u32 hback_porch;
+   u32 hsync_len;
+};
+
+static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   /* Clear interrupt */
+   kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+   /* Set which interval to generate vertical interrupt */
+   kmb_write_lcd(kmb, LCD_VSTATUS_COMPARE,
+                 LCD_VSTATUS_COMPARE_VSYNC);
+   /* Enable vertical interrupt */
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+   return 0;
+}
+
+static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   /* Clear interrupt */
+   kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_VERT_COMP);
+   /* Disable vertical interrupt */

drivers/gpu/drm/kmb/kmb_crtc.c line 73

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+}
+
+static const struct drm_crtc_funcs kmb_crtc_funcs = {
+   .destroy = drm_crtc_cleanup,
+   .set_config = drm_atomic_helper_set_config,
+   .page_flip = drm_atomic_helper_page_flip,
+   .reset = drm_atomic_helper_crtc_reset,
+   .atomic_duplicate_state =

drm_atomic_helper_crtc_duplicate_state,

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+   .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
+   .enable_vblank = kmb_crtc_enable_vblank,
+   .disable_vblank = kmb_crtc_disable_vblank,
+};
+
+static void kmb_crtc_set_mode(struct drm_crtc *crtc)
+{
+   struct drm_device *dev = crtc->dev;
+   struct drm_display_mode *m = &crtc->state->adjusted_mode;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+   struct kmb_crtc_timing vm;
+   int vsync_start_offset;
+   int vsync_end_offset;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+   unsigned int val = 0;
+
+   /* Initialize mipi */
+   kmb_dsi_hw_init(dev, m);
+   drm_info(dev,
+            "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d

hsync_len=%d\n",

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+            m->crtc_vsync_start - m->crtc_vdisplay,
+            m->crtc_vtotal - m->crtc_vsync_end,
+            m->crtc_vsync_end - m->crtc_vsync_start,
+            m->crtc_hsync_start - m->crtc_hdisplay,
+            m->crtc_htotal - m->crtc_hsync_end,
+            m->crtc_hsync_end - m->crtc_hsync_start);
+   val = kmb_read_lcd(kmb, LCD_INT_ENABLE);
+   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, ~0x0);
+   vm.vfront_porch = 2;

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10 -0
+   vm.vback_porch = 2;
+   vm.vsync_len = 8;
+   vm.hfront_porch = 0;
+   vm.hback_porch = 0;
+   vm.hsync_len = 28;
+
+   vsync_start_offset =  m->crtc_vsync_start -  m->crtc_hsync_start;
+   vsync_end_offset =  m->crtc_vsync_end - m->crtc_hsync_end;
+
+   drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-

w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",

drivers/gpu/drm/kmb/kmb_crtc.c line 114

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2 -0
+           __func__, __LINE__,
+                   m->crtc_vdisplay, vm.vback_porch,

vm.vfront_porch,

Quoted 77 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +77 -0
+                   vm.vsync_len, m->crtc_hdisplay, vm.hback_porch,
+                   vm.hfront_porch, vm.hsync_len);
+   kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT,
+                 m->crtc_vdisplay - 1);
+   kmb_write_lcd(kmb, LCD_V_BACKPORCH, vm.vback_porch);
+   kmb_write_lcd(kmb, LCD_V_FRONTPORCH, vm.vfront_porch);
+   kmb_write_lcd(kmb, LCD_VSYNC_WIDTH, vm.vsync_len - 1);
+   kmb_write_lcd(kmb, LCD_H_ACTIVEWIDTH,
+                 m->crtc_hdisplay - 1);
+   kmb_write_lcd(kmb, LCD_H_BACKPORCH, vm.hback_porch);
+   kmb_write_lcd(kmb, LCD_H_FRONTPORCH, vm.hfront_porch);
+   kmb_write_lcd(kmb, LCD_HSYNC_WIDTH, vm.hsync_len - 1);
+   /* This is hardcoded as 0 in the Myriadx code */
+   kmb_write_lcd(kmb, LCD_VSYNC_START, 0);
+   kmb_write_lcd(kmb, LCD_VSYNC_END, 0);
+   /* Back ground color */
+   kmb_write_lcd(kmb, LCD_BG_COLOUR_LS, 0x4);
+   if (m->flags == DRM_MODE_FLAG_INTERLACE) {
+           kmb_write_lcd(kmb,
+                         LCD_VSYNC_WIDTH_EVEN, vm.vsync_len - 1);
+           kmb_write_lcd(kmb,
+                         LCD_V_BACKPORCH_EVEN, vm.vback_porch);
+           kmb_write_lcd(kmb,
+                         LCD_V_FRONTPORCH_EVEN, vm.vfront_porch);
+           kmb_write_lcd(kmb, LCD_V_ACTIVEHEIGHT_EVEN,
+                         m->crtc_vdisplay - 1);
+           /* This is hardcoded as 10 in the Myriadx code */
+           kmb_write_lcd(kmb, LCD_VSYNC_START_EVEN, 10);
+           kmb_write_lcd(kmb, LCD_VSYNC_END_EVEN, 10);
+   }
+   kmb_write_lcd(kmb, LCD_TIMING_GEN_TRIG, ENABLE);
+   kmb_set_bitmask_lcd(kmb, LCD_CONTROL, LCD_CTRL_ENABLE);
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, val);
+}
+
+static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,
+                              struct drm_crtc_state *old_state)
+{
+   struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+   clk_prepare_enable(lcd->clk);
+   kmb_crtc_set_mode(crtc);
+   drm_crtc_vblank_on(crtc);
+}
+
+static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
+                               struct drm_crtc_state *old_state)
+{
+   struct kmb_drm_private *lcd = crtc_to_kmb_priv(crtc);
+
+   /* due to hw limitations, planes need to be off when crtc is off */
+   drm_atomic_helper_disable_planes_on_crtc(old_state, false);
+
+   drm_crtc_vblank_off(crtc);
+   clk_disable_unprepare(lcd->clk);
+}
+
+static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,
+                             struct drm_crtc_state *state)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+}
+
+static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
+                             struct drm_crtc_state *state)
+{
+   struct drm_device *dev = crtc->dev;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                       LCD_INT_VERT_COMP);
+
+   spin_lock_irq(&crtc->dev->event_lock);
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_crtc.c line 193

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2 -0
+   if (crtc->state->event)
+           drm_crtc_send_vblank_event(crtc, crtc->state->event);

Uh, you have vblank event support, but you immediately send out the vblank
event. That breaks userspace assumptions. You probably want to use drm_crtc_arm_vblank_event here. Also there's tons of races that can possibly happen, so please read the kerneldoc comment for that

function

Quoted 8 lines
Quoted 6 lines

carefully - you probably need to validate that the vblank event arming, vblank process and re-enabling of LCD_INT_ENABLE cannot race against each
another in bad ways.

Also we have igt testcases for this, so please run them:

Quoted 8 lines
Quoted 8 lines

https://dri.freedesktop.org/docs/drm/gpu/drm-uapi.html#validating-
changes-with-igt

drivers/gpu/drm/kmb/kmb_crtc.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +5 -0
+   crtc->state->event = NULL;
+   spin_unlock_irq(&crtc->dev->event_lock);
+}
+
+static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs =

{

Quoted 102 lines
Quoted 102 lines

Review

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +17 -0
+   .atomic_begin = kmb_crtc_atomic_begin,
+   .atomic_enable = kmb_crtc_atomic_enable,
+   .atomic_disable = kmb_crtc_atomic_disable,
+   .atomic_flush = kmb_crtc_atomic_flush,
+};
+
+int kmb_setup_crtc(struct drm_device *drm)
+{
+   struct kmb_drm_private *kmb = to_kmb(drm);
+   struct kmb_plane *primary;
+   int ret;
+
+   primary = kmb_plane_init(drm);
+   if (IS_ERR(primary))
+           return PTR_ERR(primary);
+
+   ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary-

base_plane,

drivers/gpu/drm/kmb/kmb_crtc.c new file +9 -0
+                                   NULL, &kmb_crtc_funcs, NULL);
+   if (ret) {
+           kmb_plane_destroy(&primary->base_plane);
+           return ret;
+   }
+
+   drm_crtc_helper_add(&kmb->crtc, &kmb_crtc_helper_funcs);
+   return 0;
+}
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.c

Quoted 42 lines

new file mode 100644
index 0000000..e413099

drivers/gpu/drm/kmb/kmb_drv.c new file +37 -0
@@ -0,0 +1,676 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <linux/clk.h>
+#include <linux/console.h>
+#include <linux/list.h>
+#include <linux/module.h>
+#include <linux/of_graph.h>
+#include <linux/of_reserved_mem.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/spinlock.h>
+
+#include <drm/drm.h>
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_gem_framebuffer_helper.h>
+#include <drm/drm_ioctl.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_of.h>
+#include <drm/drm_probe_helper.h>
+#include <drm/drm_vblank.h>
+
+#include "kmb_drv.h"
+#include "kmb_dsi.h"
+#include "kmb_regs.h"
+
+int kmb_under_flow = 0, kmb_flush_done = 0, layer_no = 0;
+static struct kmb_clock kmb_clk;

drivers/gpu/drm/kmb/kmb_drv.c line 47

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+static struct drm_bridge *adv_bridge;
+
+int kmb_display_clk_enable(struct kmb_drm_private *kmb)
+{
+   int ret = 0;
+
+   ret = clk_prepare_enable(kmb_clk.clk_lcd);
+   if (ret) {
+           drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n",

ret);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+           return ret;
+   }
+
+   ret = clk_prepare_enable(kmb_clk.clk_mipi);
+   if (ret) {
+           drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n",

ret);

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +13 -0
+           return ret;
+   }
+
+   ret = clk_prepare_enable(kmb_clk.clk_mipi_ecfg);
+   if (ret) {
+           drm_err(&kmb->drm,
+                   "Failed to enable MIPI_ECFG clock: %d\n", ret);
+           return ret;
+   }
+
+   ret = clk_prepare_enable(kmb_clk.clk_mipi_cfg);
+   if (ret) {
+           drm_err(&kmb->drm,
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+                   "Failed to enable MIPI_CFG clock: %d\n", ret);
+           return ret;
+   }
+   DRM_INFO("SUCCESS : enabled LCD MIPI clocks\n");
+   return 0;
+}
+
+int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct

device

Quoted 85 lines
Quoted 85 lines

*dev)

Quoted 37 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36 -0
+{
+   struct device_node *vpu_dev;
+   unsigned long clk;
+   int ret = 0;
+
+   kmb_clk.clk_lcd = clk_get(dev, "clk_lcd");
+   if (IS_ERR(kmb_clk.clk_lcd)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_lcd\n");
+           return PTR_ERR(kmb_clk.clk_lcd);
+   }
+
+   kmb_clk.clk_mipi = clk_get(dev, "clk_mipi");
+   if (IS_ERR(kmb_clk.clk_mipi)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_mipi\n");
+           return PTR_ERR(kmb_clk.clk_mipi);
+   }
+
+   kmb_clk.clk_mipi_ecfg = clk_get(dev, "clk_mipi_ecfg");
+   if (IS_ERR(kmb_clk.clk_mipi_ecfg)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_mipi_ecfg\n");
+           return PTR_ERR(kmb_clk.clk_mipi_ecfg);
+   }
+
+   kmb_clk.clk_mipi_cfg = clk_get(dev, "clk_mipi_cfg");
+   if (IS_ERR(kmb_clk.clk_mipi_cfg)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_mipi_cfg\n");
+           return PTR_ERR(kmb_clk.clk_mipi_cfg);
+   }
+   vpu_dev = of_find_node_by_path("/soc/vpu-ipc");
+   kmb_clk.clk_pll0 = of_clk_get_by_name(vpu_dev, "pll_0_out_0");
+   if (IS_ERR(kmb_clk.clk_pll0)) {
+           drm_err(&kmb->drm, "clk_get() failed clk_pll0 ");
+           return PTR_ERR(kmb_clk.clk_pll0);
+   }
+   kmb->sys_clk_mhz = clk_get_rate(kmb_clk.clk_pll0) / 1000000;
+   drm_info(&kmb->drm, "system clk = %d Mhz", kmb-

sys_clk_mhz);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+   /* Set LCD clock to 200 Mhz */
+   clk_set_rate(kmb_clk.clk_lcd, KMB_LCD_DEFAULT_CLK);
+   if (clk_get_rate(kmb_clk.clk_lcd) != KMB_LCD_DEFAULT_CLK) {
+           drm_err(&kmb->drm, "failed to set to clk_lcd to %d\n",
+                   KMB_LCD_DEFAULT_CLK);
+           return -1;
+   }
+   drm_dbg(&kmb->drm, "clk_lcd = %ld\n",

clk_get_rate(kmb_clk.clk_lcd));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+
+   /* Set MIPI clock to 24 Mhz */
+   clk_set_rate(kmb_clk.clk_mipi, KMB_MIPI_DEFAULT_CLK);
+   if (clk_get_rate(kmb_clk.clk_mipi) != KMB_MIPI_DEFAULT_CLK) {
+           drm_err(&kmb->drm, "failed to set to clk_mipi to %d\n",
+                   KMB_MIPI_DEFAULT_CLK);
+           return -1;
+   }
+   drm_dbg(&kmb->drm, "clk_mipi = %ld\n",

clk_get_rate(kmb_clk.clk_mipi));

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+   clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+   if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+           /* Set MIPI_ECFG clock to 24 Mhz */
+           clk_set_rate(kmb_clk.clk_mipi_ecfg,

KMB_MIPI_DEFAULT_CFG_CLK);

Quoted 21 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +21 -0
+           clk = clk_get_rate(kmb_clk.clk_mipi_ecfg);
+           if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+                   drm_err(&kmb->drm,
+                           "failed to set to clk_mipi_ecfg to %d\n",
+                            KMB_MIPI_DEFAULT_CFG_CLK);
+                   return -1;
+           }
+   }
+
+   clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+   if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+           /* Set MIPI_CFG clock to 24 Mhz */
+           clk_set_rate(kmb_clk.clk_mipi_cfg, 24000000);
+           clk = clk_get_rate(kmb_clk.clk_mipi_cfg);
+           if (clk != KMB_MIPI_DEFAULT_CFG_CLK) {
+                   drm_err(&kmb->drm,
+                           "failed to set clk_mipi_cfg to %d\n",
+                             KMB_MIPI_DEFAULT_CFG_CLK);
+                   return -1;
+           }
+   }
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+   ret = kmb_display_clk_enable(kmb);
+   if (ret)
+           return ret;
+
+   /* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */
+   kmb_set_bitmask_msscam(kmb, MSS_CAM_CLK_CTRL, 0x1fff);
+   kmb_set_bitmask_msscam(kmb, MSS_CAM_RSTN_CTRL,

0xffffffff);

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9 -0
+   return 0;
+}
+
+static int kmb_display_clk_disable(void)
+{
+   if (kmb_clk.clk_lcd)
+           clk_disable_unprepare(kmb_clk.clk_lcd);
+   if (kmb_clk.clk_mipi)
+           clk_disable_unprepare(kmb_clk.clk_mipi);
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+   if (kmb_clk.clk_mipi_ecfg)
+           clk_disable_unprepare(kmb_clk.clk_mipi_ecfg);
+   if (kmb_clk.clk_mipi_cfg)
+           clk_disable_unprepare(kmb_clk.clk_mipi_cfg);
+   return 0;
+}
+
+static void __iomem *kmb_map_mmio(struct drm_device *drm,

char

Quoted 84 lines
Quoted 84 lines

*name)

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+{
+   struct resource *res;
+   struct platform_device *pdev = to_platform_device(drm->dev);
+   void __iomem *mem;
+
+   res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

name);

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +28 -0
+   if (!res) {
+           drm_err(drm, "failed to get resource for %s", name);
+           return ERR_PTR(-ENOMEM);
+   }
+   mem = devm_ioremap_resource(drm->dev, res);
+   if (IS_ERR(mem))
+           drm_err(drm, "failed to ioremap %s registers", name);
+   return mem;
+}
+
+static int kmb_hw_init(struct drm_device *drm, unsigned long flags)
+{
+   struct kmb_drm_private *kmb = to_kmb(drm);
+   struct platform_device *pdev = to_platform_device(drm->dev);
+   int irq_lcd;
+   int ret = 0;
+
+   /* Map LCD MMIO registers */
+   kmb->lcd_mmio = kmb_map_mmio(drm, "lcd_regs");
+   if (IS_ERR(kmb->lcd_mmio)) {
+           drm_err(&kmb->drm, "failed to map LCD registers\n");
+           return -ENOMEM;
+   }
+
+   /* Map MIPI MMIO registers */
+   kmb->mipi_mmio = kmb_map_mmio(drm, "mipi_regs");
+   if (IS_ERR(kmb->mipi_mmio)) {
+           drm_err(&kmb->drm, "failed to map MIPI registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+           iounmap(kmb->lcd_mmio);
+           return -ENOMEM;
+   }
+
+   /* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and
+    * MSS_CAM_CLK_CTRL register
+    */
+   kmb->msscam_mmio = kmb_map_mmio(drm, "msscam_regs");
+   if (IS_ERR(kmb->msscam_mmio)) {
+           drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+           iounmap(kmb->lcd_mmio);
+           iounmap(kmb->mipi_mmio);
+           return -ENOMEM;
+   }
+
+   if (IS_ERR(kmb->msscam_mmio)) {
+           drm_err(&kmb->drm, "failed to map MSSCAM

registers\n");

Quoted 29 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +29 -0
+           iounmap(kmb->lcd_mmio);
+           iounmap(kmb->mipi_mmio);
+           return -ENOMEM;
+   }
+   /* Enable display clocks */
+   kmb_initialize_clocks(kmb, &pdev->dev);
+
+   /* Register irqs here - section 17.3 in databook
+    * lists LCD at 79 and 82 for MIPI under MSS CPU -
+    * firmware has redirected 79 to A53 IRQ 33
+    */
+
+   /* Allocate LCD interrupt resources */
+   irq_lcd = platform_get_irq_byname(pdev, "irq_lcd");
+   if (irq_lcd < 0) {
+           drm_err(&kmb->drm, "irq_lcd not found");
+           goto setup_fail;
+   }
+
+   /* Get the optional framebuffer memory resource */
+   ret = of_reserved_mem_device_init(drm->dev);
+   if (ret && ret != -ENODEV)
+           return ret;
+
+   spin_lock_init(&kmb->irq_lock);
+
+   kmb->irq_lcd = irq_lcd;
+
+   return 0;
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+ setup_fail:
+   of_reserved_mem_device_release(drm->dev);
+
+   return ret;
+}
+
+static const struct drm_mode_config_funcs

kmb_mode_config_funcs = {

Quoted 31 lines
Quoted 31 lines
Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +17 -0
+   .fb_create = drm_gem_fb_create,
+   .atomic_check = drm_atomic_helper_check,
+   .atomic_commit = drm_atomic_helper_commit,
+};
+
+static int kmb_setup_mode_config(struct drm_device *drm)
+{
+   int ret;
+   struct kmb_drm_private *kmb = to_kmb(drm);
+
+   ret = drmm_mode_config_init(drm);
+   if (ret)
+           return ret;
+   drm->mode_config.min_width = KMB_MIN_WIDTH;
+   drm->mode_config.min_height = KMB_MIN_HEIGHT;
+   drm->mode_config.max_width = KMB_MAX_WIDTH;
+   drm->mode_config.max_height = KMB_MAX_HEIGHT;

drivers/gpu/drm/kmb/kmb_drv.c line 294

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   drm->mode_config.funcs = &kmb_mode_config_funcs;
+
+   ret = kmb_setup_crtc(drm);
+   if (ret < 0) {
+           drm_err(drm, "failed to create crtc\n");
+           return ret;
+   }
+
+   /* Initialize MIPI DSI */
+   ret = kmb_dsi_init(drm, adv_bridge);

Split up isn't correct here, this won't compile since the dsi code isn't in this patch yet. So you need to have this ordered the other way round.

Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+   if (ret) {
+           drm_err(drm, "failed to initialize DSI\n");
+           return ret;
+   }
+
+   /* Set the CRTC's port so that the encoder component can find it

*/

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ kmb->crtc.port = of_graph_get_port_by_id(drm->dev->of_node,

0);

Quoted 470 lines
Quoted 470 lines
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +13 -0
+   ret = drm_vblank_init(drm, drm->mode_config.num_crtc);
+   if (ret < 0) {
+           drm_err(drm, "failed to initialize vblank\n");
+           pm_runtime_disable(drm->dev);
+           return ret;
+   }
+
+   drm_mode_config_reset(drm);
+   return 0;
+}
+
+static irqreturn_t handle_lcd_irq(struct drm_device *dev)
+{

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   unsigned long status, val, val1;
+   int plane_id, dma0_state, dma1_state;
+   struct kmb_drm_private *kmb = to_kmb(dev);
+
+   status = kmb_read_lcd(kmb, LCD_INT_STATUS);
+
+   if (status & LCD_INT_EOF) {
+           kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF);
+
+           /* When disabling/enabling LCD layers, the change takes

effect

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+            * immediately and does not wait for EOF (end of frame).
+            * When kmb_plane_atomic_disable is called, mark the

plane as

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+            * disabled but actually disable the plane when EOF irq is
+            * being handled.
+            */
+           for (plane_id = LAYER_0;
+                           plane_id < KMB_MAX_PLANES; plane_id++)

{

drivers/gpu/drm/kmb/kmb_drv.c line 337

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+                   if (kmb->plane_status[plane_id].disable) {
+                           kmb_clr_bitmask_lcd(kmb,
+                                               LCD_LAYERn_DMA_CFG
+                                               (plane_id),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+
+                           kmb_clr_bitmask_lcd(kmb, LCD_CONTROL,
+                                               kmb-

plane_status[plane_id].ctrl);

drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+                           kmb->plane_status[plane_id].disable = false;
+                   }
+           }
+           if (kmb_under_flow) {
+                   /* DMA Recovery after underflow */
+                   dma0_state = (layer_no == 0) ?
+                       LCD_VIDEO0_DMA0_STATE :

LCD_VIDEO1_DMA0_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   dma1_state = (layer_no == 0) ?
+                       LCD_VIDEO0_DMA1_STATE :

LCD_VIDEO1_DMA1_STATE;

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+
+                   do {
+                           kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+                           val = kmb_read_lcd(kmb, dma0_state)
+                               & LCD_DMA_STATE_ACTIVE;
+                           val1 = kmb_read_lcd(kmb, dma1_state)
+                               & LCD_DMA_STATE_ACTIVE;
+                   } while ((val || val1));
+                   /* disable dma */
+                   kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(layer_no),

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+                                       LCD_DMA_LAYER_ENABLE);
+                   kmb_write_lcd(kmb, LCD_FIFO_FLUSH, 1);
+                   kmb_flush_done = 1;
+                   kmb_under_flow = 0;
+           }
+   }
+
+   if (status & LCD_INT_LINE_CMP) {
+           /* clear line compare interrupt */
+           kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LINE_CMP);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   }
+
+   if (status & LCD_INT_VERT_COMP) {
+           /* Read VSTATUS */
+           val = kmb_read_lcd(kmb, LCD_VSTATUS);
+           val = (val & LCD_VSTATUS_VERTICAL_STATUS_MASK);
+           switch (val) {
+           case LCD_VSTATUS_COMPARE_VSYNC:
+                   /* Clear vertical compare interrupt */
+                   kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

drivers/gpu/drm/kmb/kmb_drv.c line 422

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+                   if (kmb_flush_done) {
+                           kmb_set_bitmask_lcd(kmb,
+                                               LCD_LAYERn_DMA_CFG
+                                               (layer_no),
+

LCD_DMA_LAYER_ENABLE);

drivers/gpu/drm/kmb/kmb_drv.c line 387

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+                           kmb_flush_done = 0;
+                   }
+                   drm_handle_vblank(dev, 0);

Would be nice to use the new-style drm_crtc_handle_vblank here.

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+                   break;
+           case LCD_VSTATUS_COMPARE_BACKPORCH:
+           case LCD_VSTATUS_COMPARE_ACTIVE:
+           case LCD_VSTATUS_COMPARE_FRONT_PORCH:
+                   kmb_write_lcd(kmb, LCD_INT_CLEAR,

LCD_INT_VERT_COMP);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+                   break;
+           }
+   }
+   if (status & LCD_INT_DMA_ERR) {

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+           val =
+               (status & LCD_INT_DMA_ERR &
+                kmb_read_lcd(kmb, LCD_INT_ENABLE));
+           /* LAYER0 - VL0 */
+           if (val & (LAYER0_DMA_FIFO_UNDERFLOW |
+                      LAYER0_DMA_CB_FIFO_UNDERFLOW |
+                      LAYER0_DMA_CR_FIFO_UNDERFLOW)) {
+                   kmb_under_flow++;
+                   drm_info(&kmb->drm,
+                            "!LAYER0:VL0 DMA UNDERFLOW val =

0x%lx,under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+                        val, kmb_under_flow);
+                   /* disable underflow interrupt */
+                   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                                       LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER0_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+ LAYER0_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER0_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   /* disable auto restart mode */
+                   kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(0),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6 -0
+                   layer_no = 0;
+           }
+
+           if (val & LAYER0_DMA_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER0:VL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER0_DMA_CB_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER0:VL0 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER0_DMA_CR_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER0:VL0 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8 -0
+
+           /* LAYER1 - VL1 */
+           if (val & (LAYER1_DMA_FIFO_UNDERFLOW |
+                      LAYER1_DMA_CB_FIFO_UNDERFLOW |
+                      LAYER1_DMA_CR_FIFO_UNDERFLOW)) {
+                   kmb_under_flow++;
+                   drm_info(&kmb->drm,
+                            "!LAYER1:VL1 DMA UNDERFLOW val =

0x%lx, under_flow=%d",

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4 -0
+                        val, kmb_under_flow);
+                   /* disable underflow interrupt */
+                   kmb_clr_bitmask_lcd(kmb, LCD_INT_ENABLE,
+                                       LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR,
+

LAYER1_DMA_CB_FIFO_UNDERFLOW |

Quoted 1 line

+ LAYER1_DMA_FIFO_UNDERFLOW

|

Quoted 1 line

+

LAYER1_DMA_CR_FIFO_UNDERFLOW);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2 -0
+                   /* disable auto restart mode */
+                   kmb_clr_bitmask_lcd(kmb,

LCD_LAYERn_DMA_CFG(1),

Quoted 1 line

+

LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7 -0
+                   layer_no = 1;
+           }
+
+           /* LAYER1 - VL1 */
+           if (val & LAYER1_DMA_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER1:VL1 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER1_DMA_CB_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER1:VL1 DMA CB OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER1_DMA_CR_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER1:VL1 DMA CR OVERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+           /* LAYER2 - GL0 */
+           if (val & LAYER2_DMA_FIFO_UNDERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER2:GL0 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER2_DMA_FIFO_OVERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER2:GL0 DMA OVERFLOW val = 0x%lx",

val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5 -0
+
+           /* LAYER3 - GL1 */
+           if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER3:GL1 DMA UNDERFLOW val =

0x%lx", val);

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3 -0
+           if (val & LAYER3_DMA_FIFO_UNDERFLOW)
+                   drm_dbg(&kmb->drm,
+                           "LAYER3:GL1 DMA OVERFLOW val = 0x%lx",

val);

Quoted 74 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +74 -0
+   }
+
+   if (status & LCD_INT_LAYER) {
+           /* Clear layer interrupts */
+           kmb_write_lcd(kmb, LCD_INT_CLEAR, LCD_INT_LAYER);
+   }
+
+   /* Clear all interrupts */
+   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, 1);
+   return IRQ_HANDLED;
+}
+
+/* IRQ handler */
+static irqreturn_t kmb_isr(int irq, void *arg)
+{
+   struct drm_device *dev = (struct drm_device *)arg;
+
+   handle_lcd_irq(dev);
+   return IRQ_HANDLED;
+}
+
+static void kmb_irq_reset(struct drm_device *drm)
+{
+   kmb_write_lcd(to_kmb(drm), LCD_INT_CLEAR, 0xFFFF);
+   kmb_write_lcd(to_kmb(drm), LCD_INT_ENABLE, 0);
+}
+
+DEFINE_DRM_GEM_CMA_FOPS(fops);
+
+static struct drm_driver kmb_driver = {
+   .driver_features = DRIVER_GEM |
+       DRIVER_MODESET | DRIVER_ATOMIC,
+   .irq_handler = kmb_isr,
+   .irq_preinstall = kmb_irq_reset,
+   .irq_uninstall = kmb_irq_reset,
+   /* GEM Operations */
+   .fops = &fops,
+   DRM_GEM_CMA_DRIVER_OPS_VMAP,
+   .name = "kmb-drm",
+   .desc = "KEEMBAY DISPLAY DRIVER ",
+   .date = "20190122",
+   .major = 1,
+   .minor = 0,
+};
+
+static int kmb_remove(struct platform_device *pdev)
+{
+   struct device *dev = &pdev->dev;
+   struct drm_device *drm = dev_get_drvdata(dev);
+   struct kmb_drm_private *kmb = to_kmb(drm);
+
+   drm_dev_unregister(drm);
+   drm_kms_helper_poll_fini(drm);
+   of_node_put(kmb->crtc.port);
+   kmb->crtc.port = NULL;
+   pm_runtime_get_sync(drm->dev);
+   drm_irq_uninstall(drm);
+   pm_runtime_put_sync(drm->dev);
+   pm_runtime_disable(drm->dev);
+
+   of_reserved_mem_device_release(drm->dev);
+
+   /* Release clks */
+   kmb_display_clk_disable();
+   clk_put(kmb_clk.clk_lcd);
+   clk_put(kmb_clk.clk_mipi);
+
+   dev_set_drvdata(dev, NULL);
+
+   /* Unregister DSI host */
+   kmb_dsi_host_unregister();
+   return 0;
+}
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+static int kmb_probe(struct platform_device *pdev)
+{
+   struct device *dev = get_device(&pdev->dev);
+   struct kmb_drm_private *kmb;
+   int ret = 0;
+
+   /* The bridge (ADV 7535) will return -EPROBE_DEFER until it
+    * has a mipi_dsi_host to register its device to. So, we
+    * first register the DSI host during probe time, and then return
+    * -EPROBE_DEFER until the bridge is loaded. Probe will be called

again

Quoted 85 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +85 -0
+    *  and then the rest of the driver initialization can proceed
+    *  afterwards and the bridge can be successfully attached.
+    */
+   adv_bridge = kmb_dsi_host_bridge_init(dev);
+
+   if (adv_bridge == ERR_PTR(-EPROBE_DEFER)) {
+           return -EPROBE_DEFER;
+   } else if (IS_ERR(adv_bridge)) {
+           DRM_ERROR("probe failed to initialize DSI host bridge\n");
+           return PTR_ERR(adv_bridge);
+   }
+
+   /* Create DRM device */
+   kmb = devm_drm_dev_alloc(dev, &kmb_driver,
+                            struct kmb_drm_private, drm);
+   if (IS_ERR(kmb))
+           return PTR_ERR(kmb);
+
+   dev_set_drvdata(dev, &kmb->drm);
+
+   ret = kmb_hw_init(&kmb->drm, 0);
+   if (ret)
+           goto err_free1;
+
+   ret = kmb_setup_mode_config(&kmb->drm);
+   if (ret)
+           goto err_free;
+
+   ret = drm_irq_install(&kmb->drm, kmb->irq_lcd);
+   if (ret < 0) {
+           drm_err(&kmb->drm, "failed to install IRQ handler\n");
+           goto err_irq;
+   }
+
+   drm_kms_helper_poll_init(&kmb->drm);
+
+   /* Register graphics device with the kernel */
+   ret = drm_dev_register(&kmb->drm, 0);
+   if (ret)
+           goto err_register;
+
+   return 0;
+
+ err_register:
+   drm_kms_helper_poll_fini(&kmb->drm);
+ err_irq:
+   pm_runtime_disable(kmb->drm.dev);
+ err_free:
+   drm_crtc_cleanup(&kmb->crtc);
+   drm_mode_config_cleanup(&kmb->drm);
+ err_free1:
+   dev_set_drvdata(dev, NULL);
+   kmb_dsi_host_unregister();
+
+   return ret;
+}
+
+static const struct of_device_id kmb_of_match[] = {
+   {.compatible = "intel,kmb_display"},
+   {},
+};
+
+MODULE_DEVICE_TABLE(of, kmb_of_match);
+
+static int __maybe_unused kmb_pm_suspend(struct device *dev)
+{
+   struct drm_device *drm = dev_get_drvdata(dev);
+   struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+
+   drm_kms_helper_poll_disable(drm);
+
+   kmb->state = drm_atomic_helper_suspend(drm);
+   if (IS_ERR(kmb->state)) {
+           drm_kms_helper_poll_enable(drm);
+           return PTR_ERR(kmb->state);
+   }
+
+   return 0;
+}
+
+static int __maybe_unused kmb_pm_resume(struct device *dev)
+{
+   struct drm_device *drm = dev_get_drvdata(dev);
+   struct kmb_drm_private *kmb = drm ? to_kmb(drm) : NULL;
+

drivers/gpu/drm/kmb/kmb_drv.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10 -0
+   if (!kmb)
+           return 0;
+
+   drm_atomic_helper_resume(drm, kmb->state);
+   drm_kms_helper_poll_enable(drm);
+
+   return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend,

kmb_pm_resume);

Review

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +16 -0
+
+static struct platform_driver kmb_platform_driver = {
+   .probe = kmb_probe,
+   .remove = kmb_remove,
+   .driver = {
+           .name = "kmb-drm",
+           .pm = &kmb_pm_ops,
+           .of_match_table = kmb_of_match,
+   },
+};
+
+module_platform_driver(kmb_platform_driver);
+
+MODULE_AUTHOR("Intel Corporation");
+MODULE_DESCRIPTION("Keembay Display driver");
+MODULE_LICENSE("GPL v2");
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_drv.h

Quoted 7 lines

new file mode 100644
index 0000000..352f2d2

drivers/gpu/drm/kmb/kmb_drv.h new file +2 -0
@@ -0,0 +1,170 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ *

drivers/gpu/drm/kmb/kmb_drv.h line 12

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#ifndef __KMB_DRV_H__
+#define __KMB_DRV_H__
+
+#include "kmb_plane.h"
+#include "kmb_regs.h"
+
+#define KMB_MAX_WIDTH                      1920 /*max width in pixels

*/

drivers/gpu/drm/kmb/kmb_drv.h line 13

Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.h new file +1 -0
+#define KMB_MAX_HEIGHT                     1080 /*max height in

pixels */

Quoted 29 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +29 -0
+#define KMB_MIN_WIDTH                   1920 /*max width in pixels */
+#define KMB_MIN_HEIGHT                  1080 /*max height in pixels */
+#define KMB_LCD_DEFAULT_CLK                200000000
+#define KMB_MIPI_DEFAULT_CLK               24000000
+#define KMB_MIPI_DEFAULT_CFG_CLK   24000000
+#define KMB_SYS_CLK_MHZ                    500
+
+#define ICAM_MMIO          0x3b100000
+#define ICAM_LCD_OFFSET            0x1080
+#define ICAM_MMIO_SIZE             0x2000
+
+struct kmb_drm_private {
+   struct drm_device               drm;
+   void __iomem                    *lcd_mmio;
+   void __iomem                    *mipi_mmio;
+   void __iomem                    *msscam_mmio;
+   struct clk                      *clk;
+   struct drm_crtc                 crtc;
+   struct kmb_plane                *plane;
+   struct drm_atomic_state         *state;
+   spinlock_t                      irq_lock;
+   int                             irq_lcd;
+   int                             irq_mipi;
+   int                             sys_clk_mhz;
+   dma_addr_t                      fb_addr;
+   struct layer_status             plane_status[KMB_MAX_PLANES];
+};
+
+struct kmb_clock {
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+   struct clk *clk_lcd;
+   struct clk *clk_mipi;
+   struct clk *clk_mipi_ecfg;
+   struct clk *clk_mipi_cfg;
+   struct clk *clk_pll0;
+};
+
+static inline struct kmb_drm_private *to_kmb(const struct

drm_device

Quoted 6 lines
Quoted 6 lines

*dev)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+   return container_of(dev, struct kmb_drm_private, drm);
+}
+
+static inline struct kmb_drm_private *crtc_to_kmb_priv(const

struct

Quoted 14 lines
Quoted 14 lines

drm_crtc *x)

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +13 -0
+{
+   return container_of(x, struct kmb_drm_private, crtc);
+}
+
+struct blt_layer_config {
+   unsigned char layer_format;
+};
+
+static inline void kmb_write_lcd(struct kmb_drm_private *dev_p,
+                            unsigned int reg, u32 value)
+{
+   writel(value, (dev_p->lcd_mmio + reg));
+}
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+
+static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
+                             unsigned int reg, u32 value)
+{
+   writel(value, (dev_p->mipi_mmio + reg));
+}
+
+static inline void kmb_write_msscam(struct kmb_drm_private

*dev_p,

Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+                               unsigned int reg, u32 value)
+{
+   writel(value, (dev_p->msscam_mmio + reg));
+}
+
+static inline u32 kmb_read_msscam(struct kmb_drm_private

*dev_p,

Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+                             unsigned int reg)
+{
+   return readl(dev_p->msscam_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_msscam(struct

kmb_drm_private

Quoted 16 lines
Quoted 16 lines

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+                                     unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_msscam(dev_p, reg);
+
+   kmb_write_msscam(dev_p, reg, (reg_val | mask));
+}
+
+static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p,

unsigned int reg)

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+   return readl(dev_p->lcd_mmio + reg);
+}
+
+static inline void kmb_set_bitmask_lcd(struct kmb_drm_private

*dev_p,

Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+                                  unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+   kmb_write_lcd(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_lcd(struct kmb_drm_private

*dev_p,

Quoted 9 lines
Quoted 9 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+                                  unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_lcd(dev_p, reg);
+
+   kmb_write_lcd(dev_p, reg, (reg_val & (~mask)));
+}
+
+static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p,

unsigned int reg)

Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5 -0
+{
+   return readl(dev_p->mipi_mmio + reg);
+}
+
+static inline void kmb_write_bits_mipi(struct kmb_drm_private

*dev_p,

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+                                  unsigned int reg, u32 offset,
+                                  u32 num_bits, u32 value)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+   u32 mask = (1 << num_bits) - 1;
+
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+   value &= mask;
+   mask <<= offset;
+   reg_val &= (~mask);
+   reg_val |= (value << offset);
+   kmb_write_mipi(dev_p, reg, reg_val);
+}
+
+static inline void kmb_set_bit_mipi(struct kmb_drm_private

*dev_p,

Quoted 239 lines
Quoted 239 lines
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6 -0
+                               unsigned int reg, u32 offset)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, reg_val | (1 << offset));
+}

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+
+static inline void kmb_clr_bit_mipi(struct kmb_drm_private *dev_p,
+                               unsigned int reg, u32 offset)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, reg_val & (~(1 << offset)));
+}
+
+static inline void kmb_set_bitmask_mipi(struct kmb_drm_private

*dev_p,

drivers/gpu/drm/kmb/kmb_drv.h

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8 -0
+                                   unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, (reg_val | mask));
+}
+
+static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private

*dev_p,

Review

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10 -0
+                                   unsigned int reg, u32 mask)
+{
+   u32 reg_val = kmb_read_mipi(dev_p, reg);
+
+   kmb_write_mipi(dev_p, reg, (reg_val & (~mask)));
+}
+
+int kmb_setup_crtc(struct drm_device *dev);
+void kmb_set_scanout(struct kmb_drm_private *lcd);
+#endif /* __KMB_DRV_H__ */
(quoted diff) +0 -0

b/drivers/gpu/drm/kmb/kmb_plane.c

Quoted 23 lines

new file mode 100644
index 0000000..d1e7786

drivers/gpu/drm/kmb/kmb_plane.c new file +18 -0
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2018-2020 Intel Corporation
+ */
+
+#include <drm/drm_atomic.h>
+#include <drm/drm_atomic_helper.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_fb_cma_helper.h>
+#include <drm/drm_fb_helper.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_gem_cma_helper.h>
+#include <drm/drm_managed.h>
+#include <drm/drm_plane_helper.h>
+
+#include "kmb_drv.h"
+#include "kmb_plane.h"

drivers/gpu/drm/kmb/kmb_plane.c line 28

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+#include "kmb_regs.h"
+
+const u32 layer_irqs[] = {
+   LCD_INT_VL0,
+   LCD_INT_VL1,
+   LCD_INT_GL0,
+   LCD_INT_GL1
+};
+
+static unsigned int check_pixel_format(struct drm_plane *plane, u32

format)

Quoted 17 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +17 -0
+{
+   int i;
+
+   for (i = 0; i < plane->format_count; i++) {
+           if (plane->format_types[i] == format)
+                   return 0;
+   }
+   return -EINVAL;
+}
+
+static int kmb_plane_atomic_check(struct drm_plane *plane,
+                             struct drm_plane_state *state)
+{
+   struct drm_framebuffer *fb;
+   int ret;
+   struct drm_crtc_state *crtc_state;
+   bool can_position;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+   fb = state->fb;
+   if (!fb || !state->crtc)
+           return 0;
+
+   ret = check_pixel_format(plane, fb->format->format);
+   if (ret)
+           return ret;
+
+   if (state->crtc_w > KMB_MAX_WIDTH || state->crtc_h >

KMB_MAX_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 57

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+           return -EINVAL;
+   if (state->crtc_w < KMB_MIN_WIDTH || state->crtc_h <

KMB_MIN_HEIGHT)

drivers/gpu/drm/kmb/kmb_plane.c line 67

Quoted 7 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+           return -EINVAL;
+   can_position = (plane->type == DRM_PLANE_TYPE_OVERLAY);
+   crtc_state =
+           drm_atomic_get_existing_crtc_state(state->state, state-

crtc);

drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+   return drm_atomic_helper_check_plane_state(state, crtc_state,
+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 1 line

+

DRM_PLANE_HELPER_NO_SCALING,

Quoted 28 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +28 -0
+                                            can_position, true);
+}
+
+static void kmb_plane_atomic_disable(struct drm_plane *plane,
+                                struct drm_plane_state *state)
+{
+   struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+   int plane_id = kmb_plane->id;
+   struct kmb_drm_private *kmb;
+
+   kmb = to_kmb(plane->dev);
+
+   switch (plane_id) {
+   case LAYER_0:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL1_ENABLE;
+           break;
+   case LAYER_1:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
+           break;
+   case LAYER_2:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
+           break;
+   case LAYER_3:
+           kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
+           break;
+   }
+
+   kmb->plane_status[plane_id].disable = true;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+}
+
+unsigned int get_pixel_format(u32 format)
+{
+   unsigned int val = 0;
+
+   switch (format) {
+           /* planar formats */
+   case DRM_FORMAT_YUV444:
+           val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_YVU444:
+           val = LCD_LAYER_FORMAT_YCBCR444PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+   case DRM_FORMAT_YUV422:
+           val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_YVU422:
+           val = LCD_LAYER_FORMAT_YCBCR422PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+   case DRM_FORMAT_YUV420:
+           val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_YVU420:
+           val = LCD_LAYER_FORMAT_YCBCR420PLAN |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+   case DRM_FORMAT_NV12:
+           val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+           break;
+   case DRM_FORMAT_NV21:
+           val = LCD_LAYER_FORMAT_NV12 |

LCD_LAYER_PLANAR_STORAGE

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+               | LCD_LAYER_CRCB_ORDER;
+           break;
+           /* packed formats */
+           /* looks hw requires B & G to be swapped when RGB */
+   case DRM_FORMAT_RGB332:
+           val = LCD_LAYER_FORMAT_RGB332 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_XBGR4444:
+           val = LCD_LAYER_FORMAT_RGBX4444;
+           break;
+   case DRM_FORMAT_ARGB4444:
+           val = LCD_LAYER_FORMAT_RGBA4444 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_ABGR4444:
+           val = LCD_LAYER_FORMAT_RGBA4444;
+           break;
+   case DRM_FORMAT_XRGB1555:
+           val = LCD_LAYER_FORMAT_XRGB1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_XBGR1555:
+           val = LCD_LAYER_FORMAT_XRGB1555;
+           break;
+   case DRM_FORMAT_ARGB1555:
+           val = LCD_LAYER_FORMAT_RGBA1555 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_ABGR1555:
+           val = LCD_LAYER_FORMAT_RGBA1555;
+           break;
+   case DRM_FORMAT_RGB565:
+           val = LCD_LAYER_FORMAT_RGB565 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_BGR565:
+           val = LCD_LAYER_FORMAT_RGB565;
+           break;
+   case DRM_FORMAT_RGB888:
+           val = LCD_LAYER_FORMAT_RGB888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_BGR888:
+           val = LCD_LAYER_FORMAT_RGB888;
+           break;
+   case DRM_FORMAT_XRGB8888:
+           val = LCD_LAYER_FORMAT_RGBX8888 |

LCD_LAYER_BGR_ORDER;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6 -0
+           break;
+   case DRM_FORMAT_XBGR8888:
+           val = LCD_LAYER_FORMAT_RGBX8888;
+           break;
+   case DRM_FORMAT_ARGB8888:
+           val = LCD_LAYER_FORMAT_RGBA8888 |

LCD_LAYER_BGR_ORDER;

Quoted 11 lines
Quoted 11 lines

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +11 -0
+           break;
+   case DRM_FORMAT_ABGR8888:
+           val = LCD_LAYER_FORMAT_RGBA8888;
+           break;
+   }
+   DRM_INFO_ONCE("%s : %d format=0x%x val=0x%x\n",
+                 __func__, __LINE__, format, val);
+   return val;
+}
+
+unsigned int get_bits_per_pixel(const struct drm_format_info

*format)

Quoted 234 lines
Quoted 234 lines
Quoted 24 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +24 -0
+{
+   u32 bpp = 0;
+   unsigned int val = 0;
+
+   if (format->num_planes > 1) {
+           val = LCD_LAYER_8BPP;
+           return val;
+   }
+
+   bpp += 8 * format->cpp[0];
+
+   switch (bpp) {
+   case 8:
+           val = LCD_LAYER_8BPP;
+           break;
+   case 16:
+           val = LCD_LAYER_16BPP;
+           break;
+   case 24:
+           val = LCD_LAYER_24BPP;
+           break;
+   case 32:
+           val = LCD_LAYER_32BPP;
+           break;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+   }
+
+   DRM_DEBUG("bpp=%d val=0x%x\n", bpp, val);
+   return val;
+}
+
+static void config_csc(struct kmb_drm_private *kmb, int plane_id)
+{
+   /* YUV to RGB conversion using the fixed matrix csc_coef_lcd */
+   kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id),

csc_coef_lcd[0]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id),

csc_coef_lcd[1]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id),

csc_coef_lcd[2]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id),

csc_coef_lcd[3]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id),

csc_coef_lcd[4]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id),

csc_coef_lcd[5]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id),

csc_coef_lcd[6]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id),

csc_coef_lcd[7]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id),

csc_coef_lcd[8]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id),

csc_coef_lcd[9]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id),

csc_coef_lcd[10]);

Quoted 1 line

+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id),

csc_coef_lcd[11]);

Quoted 22 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +22 -0
+}
+
+static void kmb_plane_atomic_update(struct drm_plane *plane,
+                               struct drm_plane_state *state)
+{
+   struct drm_framebuffer *fb;
+   struct kmb_drm_private *kmb;
+   unsigned int width;
+   unsigned int height;
+   unsigned int dma_len;
+   struct kmb_plane *kmb_plane;
+   unsigned int dma_cfg;
+   unsigned int ctrl = 0, val = 0, out_format = 0;
+   unsigned int src_w, src_h, crtc_x, crtc_y;
+   unsigned char plane_id;
+   int num_planes;
+   static dma_addr_t addr[MAX_SUB_PLANES];
+
+   if (!plane || !plane->state || !state)
+           return;
+
+   fb = plane->state->fb;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+   if (!fb)
+           return;
+   num_planes = fb->format->num_planes;
+   kmb_plane = to_kmb_plane(plane);
+   plane_id = kmb_plane->id;
+
+   kmb = to_kmb(plane->dev);
+
+   if (kmb_under_flow || kmb_flush_done) {
+           drm_dbg(&kmb->drm, "plane_update:underflow!!!!

returning");

Quoted 11 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+           return;
+   }
+
+   src_w = (plane->state->src_w >> 16);
+   src_h = plane->state->src_h >> 16;
+   crtc_x = plane->state->crtc_x;
+   crtc_y = plane->state->crtc_y;
+
+   drm_dbg(&kmb->drm,
+           "src_w=%d src_h=%d, fb->format->format=0x%x fb-

flags=0x%x\n",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8 -0
+             src_w, src_h, fb->format->format, fb->flags);
+
+   width = fb->width;
+   height = fb->height;
+   dma_len = (width * height * fb->format->cpp[0]);
+   drm_dbg(&kmb->drm, "dma_len=%d ", dma_len);
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id),

dma_len);

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
+                 fb->pitches[0]);
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
+                 (width * fb->format->cpp[0]));

drivers/gpu/drm/kmb/kmb_plane.c line 303

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+
+   addr[Y_PLANE] = drm_fb_cma_get_gem_addr(fb, plane->state, 0);
+   kmb->fb_addr = addr[Y_PLANE];
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
+                 addr[Y_PLANE] + fb->offsets[0]);
+   val = get_pixel_format(fb->format->format);
+   val |= get_bits_per_pixel(fb->format);
+   /* Program Cb/Cr for planar formats */
+   if (num_planes > 1) {
+           kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2 -0
+                         width * fb->format->cpp[0]);
+           kmb_write_lcd(kmb,

LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0
+                         (width * fb->format->cpp[0]));
+
+           addr[U_PLANE] = drm_fb_cma_get_gem_addr(fb, plane-

state,

drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+                                                   U_PLANE);
+           /* check if Cb/Cr is swapped*/
+           if (num_planes == 3 && (val & LCD_LAYER_CRCB_ORDER))
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 310

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+                                   addr[U_PLANE]);
+           else
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 315

Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5 -0
+                                   addr[U_PLANE]);
+
+           if (num_planes == 3) {
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 319

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+                                 ((width) * fb->format->cpp[0]));
+
+                   kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+                                 ((width) * fb->format->cpp[0]));
+
+                   addr[V_PLANE] = drm_fb_cma_get_gem_addr(fb,
+                                                           plane->state,
+                                                           V_PLANE);
+
+                   /* check if Cb/Cr is swapped*/
+                   if (val & LCD_LAYER_CRCB_ORDER)
+                           kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CB_ADR(plane_id),

drivers/gpu/drm/kmb/kmb_plane.c line 335

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+                                         addr[V_PLANE]);
+                   else
+                           kmb_write_lcd(kmb,
+

LCD_LAYERn_DMA_START_CR_ADR(plane_id),

Quoted 46 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +46 -0
+                                         addr[V_PLANE]);
+           }
+   }
+
+   kmb_write_lcd(kmb, LCD_LAYERn_WIDTH(plane_id), src_w - 1);
+   kmb_write_lcd(kmb, LCD_LAYERn_HEIGHT(plane_id), src_h - 1);
+   kmb_write_lcd(kmb, LCD_LAYERn_COL_START(plane_id), crtc_x);
+   kmb_write_lcd(kmb, LCD_LAYERn_ROW_START(plane_id), crtc_y);
+
+   val |= LCD_LAYER_FIFO_100;
+
+   if (val & LCD_LAYER_PLANAR_STORAGE) {
+           val |= LCD_LAYER_CSC_EN;
+
+           /* Enable CSC if input is planar and output is RGB */
+           config_csc(kmb, plane_id);
+   }
+
+   kmb_write_lcd(kmb, LCD_LAYERn_CFG(plane_id), val);
+
+   switch (plane_id) {
+   case LAYER_0:
+           ctrl = LCD_CTRL_VL1_ENABLE;
+           break;
+   case LAYER_1:
+           ctrl = LCD_CTRL_VL2_ENABLE;
+           break;
+   case LAYER_2:
+           ctrl = LCD_CTRL_GL1_ENABLE;
+           break;
+   case LAYER_3:
+           ctrl = LCD_CTRL_GL2_ENABLE;
+           break;
+   }
+
+   ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE
+       | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED;
+
+   /* LCD is connected to MIPI on kmb
+    * Therefore this bit is required for DSI Tx
+    */
+   ctrl |= LCD_CTRL_VHSYNC_IDLE_LVL;
+
+   kmb_set_bitmask_lcd(kmb, LCD_CONTROL, ctrl);
+
+   /* FIXME no doc on how to set output format,these values are

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+    * taken from the Myriadx tests
+    */
+   out_format |= LCD_OUTF_FORMAT_RGB888;
+
+   /* Leave RGB order,conversion mode and clip mode to default */
+   /* do not interleave RGB channels for mipi Tx compatibility */
+   out_format |= LCD_OUTF_MIPI_RGB_MODE;
+   kmb_write_lcd(kmb, LCD_OUT_FORMAT_CFG, out_format);
+
+   dma_cfg = LCD_DMA_LAYER_ENABLE |

LCD_DMA_LAYER_VSTRIDE_EN |

Quoted 1 line

+ LCD_DMA_LAYER_CONT_UPDATE |

LCD_DMA_LAYER_AXI_BURST_16;

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0
+
+   /* Enable DMA */
+   kmb_write_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id), dma_cfg);
+   drm_dbg(&kmb->drm, "dma_cfg=0x%x LCD_DMA_CFG=0x%x\n",

dma_cfg,

Quoted 9 lines
Quoted 9 lines

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0
+           kmb_read_lcd(kmb, LCD_LAYERn_DMA_CFG(plane_id)));
+
+   kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, LCD_INT_EOF |
+                   LCD_INT_DMA_ERR);
+   kmb_set_bitmask_lcd(kmb, LCD_INT_ENABLE, LCD_INT_EOF |
+                   LCD_INT_DMA_ERR);
+}
+
+static const struct drm_plane_helper_funcs

kmb_plane_helper_funcs = {

Quoted 20 lines
Quoted 20 lines
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0
+   .atomic_check = kmb_plane_atomic_check,
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

drivers/gpu/drm/kmb/kmb_plane.c line 412

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10 -0
+   .atomic_update = kmb_plane_atomic_update,
+   .atomic_disable = kmb_plane_atomic_disable
+};
+
+void kmb_plane_destroy(struct drm_plane *plane)
+{
+   struct kmb_plane *kmb_plane = to_kmb_plane(plane);
+
+   drm_plane_cleanup(plane);
+   kfree(kmb_plane);
[… more lines in the raw message]

drm_atomic_helper_plane_duplicate_state,

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ .atomic_destroy_state =

drm_atomic_helper_plane_destroy_state,

Quoted 102 lines
Quoted 102 lines

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 26 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +26 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

ARRAY_SIZE(kmb_formats_v);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

ARRAY_SIZE(kmb_formats_g);

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

&kmb_plane_funcs,

Quoted 1 line

+ plane_formats,

num_plane_formats,

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

(ret=%d)",

drivers/gpu/drm/kmb/kmb_plane.c

Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +13 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

__LINE__,

Review

Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9 -0

Lines of this file are not shown. View the raw message.

(quoted diff) +0 -0

The rest of this diff is not shown. View the raw message.

b/drivers/gpu/drm/kmb/kmb_plane.h

drivers/gpu/drm/kmb/kmb_plane.h

Quoted 31 lines

new file mode 100644
index 0000000..141cdaa

drivers/gpu/drm/kmb/kmb_plane.h new file +26 -0

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

4 lines not shown · raw message

Quoted 8 lines

8 lines not shown · raw message

102 lines not shown · raw message

Quoted 4 lines

4 lines not shown · raw message

4 lines not shown · raw message

Parts of this message are not shown here. View the raw message.