Add support for Keem Bay DRM driver
Subsystems (3)
Anitha Chrisanthus
maintainercover Add support for Keem Bay 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.
Since we are just starting the upstream process, the KMB EVM board is not in mainline and so Device tree changes are missing.
Anitha Chrisanthus (52):
drm/kmb: Add support for KeemBay Display drm/kmb: Added id to kmb_plane
drm/kmb: Set correct values in the LAYERn_CFG register drm/kmb: Use biwise operators for register definitions drm/kmb: Updated kmb_plane_atomic_check drm/kmb: Initial check-in for Mipi DSI
drm/kmb: Set OUT_FORMAT_CFG register
drm/kmb: Added mipi_dsi_host initialization drm/kmb: Part 1 of Mipi Tx Initialization drm/kmb: Part 2 of Mipi Tx Initialization drm/kmb: Use correct mmio offset from data book drm/kmb: Part3 of Mipi Tx initialization drm/kmb: Part4 of Mipi Tx Initialization drm/kmb: Correct address offsets for mipi registers drm/kmb: Part5 of Mipi Tx Intitialization drm/kmb: Part6 of Mipi Tx Initialization drm/kmb: Part7 of Mipi Tx Initialization drm/kmb: Part8 of Mipi Tx Initialization drm/kmb: Added ioremap/iounmap for register access drm/kmb: Register IRQ for LCD
drm/kmb: IRQ handlers for LCD and mipi dsi drm/kmb: Set hardcoded values to LCD_VSYNC_START drm/kmb: Additional register programming to update_plane drm/kmb: Add ADV7535 bridge
drm/kmb: Display clock enable/disable
drm/kmb: rebase to newer kernel version drm/kmb: minor name change to match device tree drm/kmb: Changed MMIO size
drm/kmb: Defer Probe
drm/kmb: call bridge init in the very beginning drm/kmb: Enable MSS_CAM_CLK_CTRL for LCD and MIPI drm/kmb: Set MSS_CAM_RSTN_CTRL along with enable drm/kmb: Mipi DPHY initialization changes drm/kmb: Fixed driver unload
drm/kmb: Added LCD_TEST config
drm/kmb: Changes for LCD to Mipi
drm/kmb: Update LCD programming to match MIPI drm/kmb: Changed name of driver to kmb-drm drm/kmb: Mipi settings from input timings drm/kmb: Enable LCD interrupts
drm/kmb: Enable LCD interrupts during modeset drm/kmb: Don’t inadvertantly disable LCD controller drm/kmb: SWAP R and B LCD Layer order
drm/kmb: Disable ping pong mode
drm/kmb: Do the layer initializations only once drm/kmb: disable the LCD layer in EOF irq handler drm/kmb: Initialize uninitialized variables drm/kmb: Added useful messages in LCD ISR kmb/drm: Prune unsupported modes
drm/kmb: workaround for dma undeflow issue drm/kmb: Get System Clock from SCMI
drm/kmb: work around for planar formats
Edmund Dea (7):
drm/kmb: Cleanup probe functions
drm/kmb: Revert dsi_host back to a static variable drm/kmb: Initialize clocks for clk_msscam, clk_mipi_ecfg, &
clk_mipi_cfg.
drm/kmb: Remove declaration of irq_lcd/irq_mipi drm/kmb: Enable MIPI TX HS Test Pattern Generation drm/kmb: Write to LCD_LAYERn_CFG only once drm/kmb: Cleaned up code
drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 12 + drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 243 +++++ drivers/gpu/drm/kmb/kmb_crtc.h | 61 ++ drivers/gpu/drm/kmb/kmb_drv.c | 828 +++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 196 ++++ drivers/gpu/drm/kmb/kmb_dsi.c | 1950 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 390 ++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 538 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 142 +++ drivers/gpu/drm/kmb/kmb_regs.h | 758 +++++++++++++++ 13 files changed, 5123 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_crtc.h 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
Anitha Chrisanthus
maintainerPATCH 1/59 drm/kmb: Add support for KeemBay Display
Initial check-in for basic display driver for KeemBay family of SOCs. This is not tested and does not work and also there are many TBDs in the code which will be implemented in future commits.
--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 12 ++ drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 215 +++++++++++++++++++ drivers/gpu/drm/kmb/kmb_crtc.h | 59 ++++++ drivers/gpu/drm/kmb/kmb_drv.c | 372 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 67 ++++++ drivers/gpu/drm/kmb/kmb_plane.c | 252 ++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 52 +++++ drivers/gpu/drm/kmb/kmb_regs.h | 460 ++++++++++++++++++++++++++++++++++++++++ 11 files changed, 1494 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_crtc.h 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 create mode 100644 drivers/gpu/drm/kmb/kmb_regs.h
drivers/gpu/drm/Kconfig +2 -0
@@ -275,6 +275,8 @@ source "drivers/gpu/drm/nouveau/Kconfig" source "drivers/gpu/drm/i915/Kconfig" +source "drivers/gpu/drm/kmb/Kconfig" + config DRM_VGEM tristate "Virtual GEM provider" depends on DRM
drivers/gpu/drm/Makefile +1 -0
@@ -71,6 +71,7 @@ obj-$(CONFIG_DRM_AMDGPU)+= amd/amdgpu/ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_I915) += i915/ +obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb/ obj-$(CONFIG_DRM_MGAG200) += mgag200/ obj-$(CONFIG_DRM_V3D) += v3d/ obj-$(CONFIG_DRM_VC4) += vc4/
drivers/gpu/drm/kmb/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +config DRM_KMB_DISPLAY + tristate "KEEMBAY DISPLAY" + depends on DRM && OF && (ARM || ARM64) + depends on COMMON_CLK + select DRM_KMS_HELPER + select DRM_KMS_CMA_HELPER + select DRM_GEM_CMA_HELPER + select VIDEOMODE_HELPERS + help + Choose this option if you have an KEEMBAY DISPLAY controller. + + If M is selected the module will be called kmb-display.
drivers/gpu/drm/kmb/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +kmb-display-y := kmb_crtc.o kmb_drv.o kmb_plane.o +obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb-display.o
drivers/gpu/drm/kmb/kmb_crtc.c new file +215 -0
215 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_crtc.h new file +59 -0
59 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.c new file +372 -0
372 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.h new file +67 -0
67 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c new file +252 -0
252 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.h new file +52 -0
52 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_regs.h new file +460 -0
460 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 2/59 drm/kmb: Added id to kmb_plane
In reply to Anitha ChrisanthusThis is to keep track of the id of the plane as there are 4 planes in Kmb and when update() is called, we need to know which plane need to be updated so that the corresponding plane's registers can be programmed.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 13 ++++--- drivers/gpu/drm/kmb/kmb_crtc.h | 2 +- drivers/gpu/drm/kmb/kmb_drv.h | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 80 +++++++++++++++++++++++++++-------------- drivers/gpu/drm/kmb/kmb_plane.h | 28 +++++++++------ 5 files changed, 79 insertions(+), 46 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +6 -7
@@ -126,9 +126,8 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)kmb_write (lcd,LCD_VSYNC_START_EVEN , vsync_start_offset);kmb_write (lcd,LCD_VSYNC_END_EVEN , vsync_end_offset); } -/* enable all 4 layers */ - ctrl =LCD_CTRL_ENABLE |LCD_CTRL_VL1_ENABLE - |LCD_CTRL_VL2_ENABLE |LCD_CTRL_GL1_ENABLE |LCD_CTRL_GL2_ENABLE ; +/* enable VL1 layer as default */ + ctrl =LCD_CTRL_ENABLE |LCD_CTRL_VL1_ENABLE ; ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE |LCD_CTRL_OUTPUT_ENABLED ;kmb_write (lcd,LCD_CONTROL , ctrl);
@@ -196,17 +195,17 @@ static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = {int kmb_setup_crtc (struct drm_device *drm) {struct kmb_drm_private *lcd = drm->dev_private; -struct drm_plane *primary; +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, &lcd->crtc, primary,NULL , - &kmb_crtc_funcs,NULL ); + ret =drm_crtc_init_with_planes (drm, &lcd->crtc, &primary->base_plane, +NULL , &kmb_crtc_funcs,NULL );if (ret) { -kmb_plane_destroy (primary); +kmb_plane_destroy (&primary->base_plane);return ret; }
drivers/gpu/drm/kmb/kmb_crtc.h +1 -1
@@ -55,5 +55,5 @@ struct kmb_crtc_state {#define to_kmb_crtc_state (x) container_of(x, struct kmb_crtc_state, crtc_base)#define to_kmb_crtc (x) container_of(x, struct kmb_crtc, crtc_base)extern void kmb_plane_destroy (struct drm_plane *plane); -extern struct drm_plane *kmb_plane_init (struct drm_device *drm); +extern struct kmb_plane *kmb_plane_init (struct drm_device *drm);#endif /* __KMB_CRTC_H__ */
drivers/gpu/drm/kmb/kmb_drv.h +1 -1
@@ -36,7 +36,7 @@ struct kmb_drm_private {struct clk *clk;struct drm_fbdev_cma *fbdev;struct drm_crtc crtc; -struct drm_plane *plane; +struct kmb_plane *plane;struct drm_atomic_state *state; };
drivers/gpu/drm/kmb/kmb_plane.c +54 -26
136 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.h +17 -11
@@ -28,25 +28,31 @@#include "kmb_drv.h" -#define KMB_MAX_PLANES 4 +enum layer_id { +LAYER_0 , +LAYER_1 , +LAYER_2 , +LAYER_3 , +KMB_MAX_PLANES , +}; + +struct kmb_plane { +struct drm_plane base_plane; +struct kmb_drm_private kmb_dev; +unsigned char id; +}; -/* this struct may be needed in the future -*struct kmb_plane { -* struct drm_plane base_plane; -* struct kmb_drm_private kmb_dev; -*}; -*/ struct kmb_plane_state {struct drm_plane_state base_plane_state;unsigned char no_planes; }; -/* may be needed in the future -*#define to_kmb_plane(x) container_of(x, struct kmb_plane, base_plane) -*/ +#define POSSIBLE_CRTCS 1 +#define to_kmb_plane (x) container_of(x, struct kmb_plane, base_plane) +#define to_kmb_plane_state (x) \ container_of(x, struct kmb_plane_state, base_plane_state) -struct drm_plane *kmb_plane_init (struct drm_device *drm); +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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 3/59 drm/kmb: Set correct values in the LAYERn_CFG register
In reply to Anitha ChrisanthusDuring update plane, set the layer format, bpp, fifo level, RGB order, Cb/Cr order etc. in the LAYER_CFG register.
v2: Return val in set_pixel and set_bpp instead of passing in pointer,
--- drivers/gpu/drm/kmb/kmb_plane.c | 145 ++++++++++++++++++++++++++++++---- drivers/gpu/drm/kmb/kmb_regs.h | 167 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 14 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +131 -14
@@ -53,6 +53,119 @@ static int kmb_plane_atomic_check(struct drm_plane *plane,return 0 ; } +unsigned int set_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 */ +case DRM_FORMAT_RGB332 : + val =LCD_LAYER_FORMAT_RGB332 ; +break ; +case DRM_FORMAT_XBGR4444 : + val =LCD_LAYER_FORMAT_RGBX4444 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_ARGB4444 : + val =LCD_LAYER_FORMAT_RGBA4444 ; +break ; +case DRM_FORMAT_ABGR4444 : + val =LCD_LAYER_FORMAT_RGBA4444 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_XRGB1555 : + val =LCD_LAYER_FORMAT_XRGB1555 ; +break ; +case DRM_FORMAT_XBGR1555 : + val =LCD_LAYER_FORMAT_XRGB1555 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_ARGB1555 : + val =LCD_LAYER_FORMAT_RGBA1555 ; +break ; +case DRM_FORMAT_ABGR1555 : + val =LCD_LAYER_FORMAT_RGBA1555 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_RGB565 : + val =LCD_LAYER_FORMAT_RGB565 ; +break ; +case DRM_FORMAT_BGR565 : + val =LCD_LAYER_FORMAT_RGB565 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_RGB888 : + val =LCD_LAYER_FORMAT_RGB888 ; +break ; +case DRM_FORMAT_BGR888 : + val =LCD_LAYER_FORMAT_RGB888 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_XRGB8888 : + val =LCD_LAYER_FORMAT_RGBX8888 ; +break ; +case DRM_FORMAT_XBGR8888 : + val =LCD_LAYER_FORMAT_RGBX8888 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_ARGB8888 : + val =LCD_LAYER_FORMAT_RGBA8888 ; +break ; +case DRM_FORMAT_ABGR8888 : + val =LCD_LAYER_FORMAT_RGBA8888 |LCD_LAYER_BGR_ORDER ; +break ; + } +return val; +} + +unsigned int set_bits_per_pixel (const struct drm_format_info *format) +{ +int i; +u32 bpp =0 ; +unsigned int val =0 ; + +for (i =0 ; i < format->num_planes; i++) + bpp +=8 *format->cpp[i]; + +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 ; + } +return val; +} +static void kmb_plane_atomic_update (struct drm_plane *plane,struct drm_plane_state *state) {
@@ -64,7 +177,8 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,unsigned int dma_len;struct kmb_plane *kmb_plane =to_kmb_plane (plane);unsigned int dma_cfg; -unsigned int ctrl =0 ; +unsigned int ctrl =0 , val =0 ; +unsigned int src_w, src_h, crtc_x, crtc_y;unsigned char plane_id = kmb_plane->id;if (!fb)
@@ -72,6 +186,22 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, lcd = plane->dev->dev_private; + 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; + +kmb_write (lcd,LCD_LAYERn_WIDTH (plane_id), src_w-1 ); +kmb_write (lcd,LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); +kmb_write (lcd,LCD_LAYERn_COL_START (plane_id), crtc_x); +kmb_write (lcd,LCD_LAYERn_ROW_START (plane_id), crtc_y); + + val =set_pixel_format (fb->format->format); + val |=set_bits_per_pixel (fb->format); +/*CHECKME Leon drvr sets it to 50 try this for now */ + val |=LCD_LAYER_FIFO_50 ; +kmb_write (lcd,LCD_LAYERn_CFG (plane_id), val); +switch (plane_id) {case LAYER_0 : ctrl =LCD_CTRL_VL1_ENABLE ;
@@ -92,12 +222,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, | LCD_CTRL_OUTPUT_ENABLED;kmb_write (lcd,LCD_CONTROL , ctrl); -/* TBD */ -/*set LCD_LAYERn_WIDTH, LCD_LAYERn_HEIGHT, LCD_LAYERn_COL_START, -* LCD_LAYERn_ROW_START, LCD_LAYERn_CFG -* CFG should set the pixel format, FIFO level and BPP -*/ -/*TBD check visible? */ /* we may have to set LCD_DMA_VSTRIDE_ENABLE in the future */
@@ -202,9 +326,6 @@ static const u32 kmb_formats_g[] = {DRM_FORMAT_RGB888 ,DRM_FORMAT_BGR888 ,DRM_FORMAT_XRGB8888 ,DRM_FORMAT_XBGR8888 , DRM_FORMAT_ARGB8888, DRM_FORMAT_ABGR8888, -DRM_FORMAT_XRGB2101010 ,DRM_FORMAT_XBGR2101010 , -DRM_FORMAT_YUYV ,DRM_FORMAT_YVYU , - DRM_FORMAT_UYVY, DRM_FORMAT_VYUY, };/* video layer (0 & 1) formats, packed and planar formats are supported */
@@ -219,11 +340,7 @@ static const u32 kmb_formats_v[] = {DRM_FORMAT_RGB888 ,DRM_FORMAT_BGR888 ,DRM_FORMAT_XRGB8888 ,DRM_FORMAT_XBGR8888 ,DRM_FORMAT_ARGB8888 ,DRM_FORMAT_ABGR8888 , -DRM_FORMAT_XRGB2101010 ,DRM_FORMAT_XBGR2101010 , -DRM_FORMAT_YUYV ,DRM_FORMAT_YVYU , -DRM_FORMAT_UYVY ,DRM_FORMAT_VYUY ,/*planar formats */ -DRM_FORMAT_YUV411 ,DRM_FORMAT_YVU411 ,DRM_FORMAT_YUV420 ,DRM_FORMAT_YVU420 ,DRM_FORMAT_YUV422 ,DRM_FORMAT_YVU422 , DRM_FORMAT_YUV444, DRM_FORMAT_YVU444,
drivers/gpu/drm/kmb/kmb_regs.h +167 -0
173 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 4/59 drm/kmb: Use biwise operators for register definitions
In reply to Anitha ChrisanthusDid some general clean up and organization.
--- drivers/gpu/drm/kmb/kmb_drv.c | 3 +- drivers/gpu/drm/kmb/kmb_regs.h | 852 +++++++++++++++-------------------------- 2 files changed, 307 insertions(+), 548 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +1 -2
@@ -133,8 +133,7 @@ static irqreturn_t kmb_irq(int irq, void *arg)if (status &LCD_INT_VERT_COMP ) {/* read VSTATUS */ val =kmb_read (lcd,LCD_VSTATUS ); -/* BITS 13 and 14 */ - val = (val &LCD_VSTATUS_VERTICAL_STATUS_MASK ) >>12 ; + val = (val &LCD_VSTATUS_VERTICAL_STATUS_MASK );switch (val) {case LCD_VSTATUS_COMPARE_VSYNC :case LCD_VSTATUS_COMPARE_BACKPORCH :
drivers/gpu/drm/kmb/kmb_regs.h +306 -546
881 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 5/59 drm/kmb: Updated kmb_plane_atomic_check
In reply to Anitha ChrisanthusCheck if format is supported and size is within limits.
v2: simplified the code as per code review
--- drivers/gpu/drm/kmb/kmb_plane.c | 111 +++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 46 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +65 -46
@@ -41,15 +41,66 @@#include "kmb_regs.h" #include "kmb_drv.h" +/* 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 , +DRM_FORMAT_NV12 ,DRM_FORMAT_NV21 , +}; + +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) { -/* TBD below structure will be used for implementation later -* struct drm_crtc_state *crtc_state; -*/ -/* TBD */ -/* Plane based checking */ +struct drm_framebuffer *fb; +int ret; + + fb = state->fb; + 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 ;return 0 ; }
@@ -58,36 +109,36 @@ unsigned int set_pixel_format(u32 format)unsigned int val =0 ;switch (format) { -/*planar formats */ +/*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 ; + |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 ; + |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 ; + |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 ; + |LCD_LAYER_CRCB_ORDER ;break ; -/* packed formats */ +/* packed formats */ case DRM_FORMAT_RGB332 : val =LCD_LAYER_FORMAT_RGB332 ;break ;
@@ -147,7 +198,7 @@ unsigned int set_bits_per_pixel(const struct drm_format_info *format)unsigned int val =0 ;for (i =0 ; i < format->num_planes; i++) - bpp +=8 *format->cpp[i]; + bpp +=8 * format->cpp[i];switch (bpp) {case 8 :
@@ -191,8 +242,8 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, crtc_x = plane->state->crtc_x; crtc_y = plane->state->crtc_y; -kmb_write (lcd,LCD_LAYERn_WIDTH (plane_id), src_w-1 ); -kmb_write (lcd,LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); +kmb_write (lcd,LCD_LAYERn_WIDTH (plane_id), src_w -1 ); +kmb_write (lcd,LCD_LAYERn_HEIGHT (plane_id), src_h -1 );kmb_write (lcd,LCD_LAYERn_COL_START (plane_id), crtc_x);kmb_write (lcd,LCD_LAYERn_ROW_START (plane_id), crtc_y);
@@ -315,38 +366,6 @@ static const struct drm_plane_funcs kmb_plane_funcs = { .atomic_destroy_state = kmb_destroy_plane_state, }; -/* 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 , -}; - -/* 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 , -DRM_FORMAT_NV12 ,DRM_FORMAT_NV21 , -}; -struct kmb_plane *kmb_plane_init (struct drm_device *drm) {struct kmb_drm_private *lcd = drm->dev_private;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 6/59 drm/kmb: Initial check-in for Mipi DSI
In reply to Anitha ChrisanthusBasic frame work for mipi encoder and connector.
More hardware specific details will be added in the future commits.
--- drivers/gpu/drm/kmb/Makefile | 2 +- drivers/gpu/drm/kmb/kmb_drv.c | 2 + drivers/gpu/drm/kmb/kmb_dsi.c | 114 ++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 58 +++++++++++++++++++++ 4 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.c create mode 100644 drivers/gpu/drm/kmb/kmb_dsi.h
drivers/gpu/drm/kmb/Makefile +1 -1
@@ -1,2 +1,2 @@ -kmb-display-y := kmb_crtc.o kmb_drv.o kmb_plane.o +kmb-display-y := kmb_crtc.o kmb_drv.o kmb_plane.o kmb_dsi.o obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb-display.o
drivers/gpu/drm/kmb/kmb_drv.c +2 -0
@@ -47,6 +47,7 @@#include "kmb_regs.h" #include "kmb_crtc.h" #include "kmb_plane.h" +#include "kmb_dsi.h" static int kmb_load (struct drm_device *drm,unsigned long flags) {
@@ -83,6 +84,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; } +kmb_dsi_init (drm); ret =drm_irq_install (drm,platform_get_irq (pdev,0 ));if (ret <0 ) {DRM_ERROR ("failed to install IRQ handler\n" );
drivers/gpu/drm/kmb/kmb_dsi.c new file +114 -0
114 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h new file +58 -0
58 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
Anitha Chrisanthus
maintainerPATCH 7/59 drm/kmb: Set OUT_FORMAT_CFG register
In reply to Anitha Chrisanthusv2: code review changes
--- drivers/gpu/drm/kmb/kmb_plane.c | 14 +++++++++++++- drivers/gpu/drm/kmb/kmb_regs.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/kmb/kmb_plane.c +13 -1
@@ -228,7 +228,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,unsigned int dma_len;struct kmb_plane *kmb_plane =to_kmb_plane (plane);unsigned int dma_cfg; -unsigned int ctrl =0 , val =0 ; +unsigned int ctrl =0 , val =0 , out_format =0 ;unsigned int src_w, src_h, crtc_x, crtc_y;unsigned char plane_id = kmb_plane->id;
@@ -299,6 +299,18 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,/* enable DMA */ kmb_write (lcd,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +/* FIXME no doc on how to set output format - may need to change +* this later +*/ +if (val &LCD_LAYER_BGR_ORDER ) + out_format |=LCD_OUTF_BGR_ORDER ; +else if (val &LCD_LAYER_CRCB_ORDER ) + out_format |=LCD_OUTF_CRCB_ORDER ; +/* do not interleave RGB channels for mipi Tx compatibility */ + out_format |=LCD_OUTF_MIPI_RGB_MODE ; +/* pixel format from LCD_LAYER_CFG */ + out_format |= ((val >>9 ) &0x1F ); +kmb_write (lcd,LCD_OUT_FORMAT_CFG , out_format); }static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
drivers/gpu/drm/kmb/kmb_regs.h +1 -0
@@ -340,6 +340,7 @@#define LCD_OUTF_BGR_ORDER (1 << 5)#define LCD_OUTF_Y_ORDER (1 << 6)#define LCD_OUTF_CRCB_ORDER (1 << 7) +#define LCD_OUTF_MIPI_RGB_MODE (1 << 18)#define LCD_HSYNC_WIDTH (0x4 * 0x801)#define LCD_H_BACKPORCH (0x4 * 0x802)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 8/59 drm/kmb: Added mipi_dsi_host initialization
In reply to Anitha ChrisanthusAdded mipi DSI host initialization functions
--- drivers/gpu/drm/kmb/kmb_dsi.c | 59 +++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 4 +++ 2 files changed, 63 insertions(+)
drivers/gpu/drm/kmb/kmb_dsi.c +59 -0
@@ -85,12 +85,59 @@ static const struct drm_connector_funcs kmb_dsi_connector_funcs = { .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, }; +static ssize_t kmb_dsi_host_transfer (struct mipi_dsi_host *host, +const struct mipi_dsi_msg *msg) +{ +return 0 ; +} + +static int kmb_dsi_host_attach (struct mipi_dsi_host *host, +struct mipi_dsi_device *dev) +{ +return 0 ; +} + +static int kmb_dsi_host_detach (struct mipi_dsi_host *host, +struct mipi_dsi_device *dev) +{ +return 0 ; +} + +static const struct mipi_dsi_host_ops kmb_dsi_host_ops = { + .attach = kmb_dsi_host_attach, + .detach = kmb_dsi_host_detach, + .transfer = kmb_dsi_host_transfer, +}; + +static struct kmb_dsi_host *kmb_dsi_host_init (struct kmb_dsi *kmb_dsi) +{ +struct kmb_dsi_host *host; +struct mipi_dsi_device *device; + + host =kzalloc (sizeof (*host),GFP_KERNEL ); +if (!host) +return NULL ; + + host->base.ops = &kmb_dsi_host_ops; + host->kmb_dsi = kmb_dsi; + + device =kzalloc (sizeof (*device),GFP_KERNEL ); +if (!device) { +kfree (host); +return NULL ; + } + device->host = &host->base; + host->device = device; +return host; +} +void kmb_dsi_init (struct drm_device *dev) {struct kmb_dsi *kmb_dsi;struct drm_encoder *encoder;struct kmb_connector *kmb_connector;struct drm_connector *connector; +struct kmb_dsi_host *host; kmb_dsi =kzalloc (sizeof (*kmb_dsi),GFP_KERNEL );if (!kmb_dsi)
@@ -108,7 +155,19 @@ void kmb_dsi_init(struct drm_device *dev) encoder = &kmb_dsi->base;drm_encoder_init (dev, encoder, &kmb_dsi_funcs,DRM_MODE_ENCODER_DSI ,"MIPI-DSI" ); + + host =kmb_dsi_host_init (kmb_dsi); +if (!host) { +drm_encoder_cleanup (encoder); +kfree (kmb_dsi); +kfree (kmb_connector); + } +drm_connector_init (dev, connector, &kmb_dsi_connector_funcs,DRM_MODE_CONNECTOR_DSI );drm_connector_helper_add (connector, &kmb_dsi_connector_helper_funcs); + + connector->encoder = encoder; +drm_connector_attach_encoder (connector, encoder); + }
drivers/gpu/drm/kmb/kmb_dsi.h +4 -0
@@ -32,19 +32,23 @@#include "kmb_drv.h" struct kmb_connector ; +struct kmb_dsi_host ;struct kmb_dsi {struct drm_encoder base;struct kmb_connector *attached_connector; +struct kmb_dsi_host *dsi_host; };struct kmb_dsi_host {struct mipi_dsi_host base;struct kmb_dsi *kmb_dsi; +struct mipi_dsi_device *device; };struct kmb_connector {struct drm_connector base; +struct drm_encoder *encoder;struct drm_display_mode *fixed_mode; };
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 9/59 drm/kmb: Part 1 of Mipi Tx Initialization
In reply to Anitha ChrisanthusMipi TX frame section configuration
This is the first part in the MIPI controller initialization. Compute and set the right values in MIPI TX frame section configuration registers like packet header(PH), unpacked bytes and line config.
v2: added more comments to clarify assumptions
v3: improved code readability as per code review
--- drivers/gpu/drm/kmb/kmb_drv.h | 14 ++ drivers/gpu/drm/kmb/kmb_dsi.c | 330 +++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 232 +++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_regs.h | 25 ++++ 4 files changed, 601 insertions(+)
drivers/gpu/drm/kmb/kmb_drv.h +14 -0
@@ -62,6 +62,20 @@ static inline u32 kmb_read(struct kmb_drm_private *lcd, unsigned int reg) return readl(lcd->mmio + reg); } +static inline void kmb_write_bits (struct kmb_drm_private *lcd, +unsigned int reg,u32 offset,u32 num_bits, +u32 value) +{ +u32 reg_val =kmb_read (lcd, reg); +u32 mask = (1 << num_bits) -1 ; + + value &= mask; + mask <<= offset; + reg_val &= (~mask); + reg_val |= (value << offset); +writel (reg_val, lcd->mmio + reg); +} +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_dsi.c +330 -0
357 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +232 -0
238 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_regs.h +25 -0
@@ -385,4 +385,29 @@#define LCD_GRAPHIC1_DMA_BYTES (0x4 * 0xb0e)#define LCD_GRAPHIC1_DMA_STATE (0x4 * 0xb0f) +/*************************************************************************** +* MIPI controller control register defines +***********************************************i****************************/ +#define MIPI_BASE_ADDR (0x20900000) +#define MIPI0_HS_BASE_ADDR (MIPI_BASE_ADDR + 0x400) +#define MIPI_CTRL_HS_BASE_ADDR (0x400) +#define MIPI_TX0_HS_FG0_SECT0_PH (0x40) +#define MIPI_TXm_HS_FGn_SECTo_PH (M ,N ,O ) (MIPI_TX0_HS_FG0_SECT0_PH + \ + (0x400*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 (1<<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 + (0x400*M) + (0x2C*N)) +#define MIPI_TXm_HS_FGn_SECTo_LINE_CFG (M ,N ,O ) (MIPI_TX_HS_FG0_SECT0_LINE_CFG \ + + (0x400*M) + (0x2C*N) + (8*O)) +#define MIPI_TX_HS_FG0_SECT0_LINE_CFG (0x44) +#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 10/59 drm/kmb: Part 2 of Mipi Tx Initialization
In reply to Anitha ChrisanthusMipi TX Frame generator timing configuration
Compute and set frame generator timings like hactive, front porch, back porch etc.
v2: minor code review changes
--- drivers/gpu/drm/kmb/kmb_dsi.c | 132 ++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/kmb/kmb_regs.h | 37 ++++++++++++ 2 files changed, 166 insertions(+), 3 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +129 -3
@@ -411,6 +411,123 @@ static u32 mipi_tx_fg_section_cfg(struct kmb_drm_private *dev_priv,return 0 ; } +static void mipi_tx_fg_cfg_regs (struct kmb_drm_private *dev_priv, +u8 frame_gen, +struct mipi_tx_frame_timing_cfg *fg_cfg) +{ +u32 sysclk; +/*float ppl_llp_ratio; */ +u32 ppl_llp_ratio; +u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; + +/*Get system clock for blanking period cnfigurations */ +/*TODO need to get system clock from clock driver */ +/* Assume 700 Mhz system clock for now */ + sysclk =700 ; + +/*ppl-pixel packing layer, llp-low level protocol +* frame genartor timing parameters are clocked on the system clock +* whereas as the equivalent parameters in the LLP blocks are clocked +* on LLP Tx clock from the D-PHY - BYTE clock +*/ + +/*multiply by 1000 to keep the precision */ + ppl_llp_ratio = ((fg_cfg->bpp /8 ) * sysclk *1000 ) / + ((fg_cfg->lane_rate_mbps /8 ) * fg_cfg->active_lanes); + +/*frame generator number of lines */ + reg_adr =MIPI_TXm_HS_FGn_NUM_LINES (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, fg_cfg->v_active); + +/*vsync width */ +/* +*there are 2 registers for vsync width -VSA in lines for channels 0-3 +*REG_VSYNC_WIDTH0: [15:0]-VSA for channel0, [31:16]-VSA for channel1 +*REG_VSYNC_WIDTH1: [15:0]-VSA for channel2, [31:16]-VSA for channel3 +*/ + offset = (frame_gen %2 ) *16 ; + reg_adr =MIPI_TXm_HS_VSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_bits (dev_priv, reg_adr, offset,16 , fg_cfg->vsync_width); + +/*v backporch - same register config like vsync width */ + reg_adr =MIPI_TXm_HS_V_BACKPORCHESn (ctrl_no, frame_gen); +kmb_write_bits (dev_priv, reg_adr, offset,16 , fg_cfg->v_backporch); + +/*v frontporch - same register config like vsync width */ + reg_adr =MIPI_TXm_HS_V_FRONTPORCHESn (ctrl_no, frame_gen); +kmb_write_bits (dev_priv, reg_adr, offset,16 , fg_cfg->v_frontporch); + +/*v active - same register config like vsync width */ + reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen); +kmb_write_bits (dev_priv, reg_adr, offset,16 , fg_cfg->v_active); + +/*hsyc width */ + reg_adr =MIPI_TXm_HS_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, + (fg_cfg->hsync_width * ppl_llp_ratio) /1000 ); + +/*h backporch */ + reg_adr =MIPI_TXm_HS_H_BACKPORCHn (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, + (fg_cfg->h_backporch * ppl_llp_ratio) /1000 ); + +/*h frontporch */ + reg_adr =MIPI_TXm_HS_H_FRONTPORCHn (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, + (fg_cfg->h_frontporch * ppl_llp_ratio) /1000 ); + +/*h active */ + reg_adr =MIPI_TXm_HS_H_ACTIVEn (ctrl_no, frame_gen); +/*convert h_active which is wc in bytes to cycles */ + val = (fg_cfg->h_active * sysclk *1000 ) / + ((fg_cfg->lane_rate_mbps /8 ) * fg_cfg->active_lanes); + val /=1000 ; +kmb_write (dev_priv, reg_adr, val); + +/* llp hsync width */ + reg_adr =MIPI_TXm_HS_LLP_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, fg_cfg->hsync_width * (fg_cfg->bpp /8 )); + +/* llp h backporch */ + reg_adr =MIPI_TXm_HS_LLP_H_BACKPORCHn (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, fg_cfg->h_backporch * (fg_cfg->bpp /8 )); + +/* llp h frontporch */ + reg_adr =MIPI_TXm_HS_LLP_H_FRONTPORCHn (ctrl_no, frame_gen); +kmb_write (dev_priv, reg_adr, fg_cfg->h_frontporch * (fg_cfg->bpp /8 )); +} + +static void mipi_tx_fg_cfg (struct kmb_drm_private *dev_priv,u8 frame_gen, +u8 active_lanes,u32 bpp,u32 wc, +u32 lane_rate_mbps,struct mipi_tx_frame_cfg *fg_cfg) +{ +u32 i, fg_num_lines =0 ; +struct mipi_tx_frame_timing_cfg fg_t_cfg; + +/*calculate the total frame generator number of lines based on it's +* active sections +*/ +for (i =0 ; i <MIPI_TX_FRAME_GEN_SECTIONS ; i++) { +if (fg_cfg->sections[i] !=NULL ) + fg_num_lines += fg_cfg->sections[i]->height_lines; + } + + fg_t_cfg.bpp = bpp; + fg_t_cfg.lane_rate_mbps = lane_rate_mbps; + fg_t_cfg.hsync_width = fg_cfg->hsync_width; + fg_t_cfg.h_backporch = fg_cfg->h_backporch; + fg_t_cfg.h_frontporch = fg_cfg->h_frontporch; + fg_t_cfg.h_active = wc; + fg_t_cfg.vsync_width = fg_cfg->vsync_width; + fg_t_cfg.v_backporch = fg_cfg->v_backporch; + fg_t_cfg.v_frontporch = fg_cfg->v_frontporch; + fg_t_cfg.v_active = fg_num_lines; + fg_t_cfg.active_lanes = active_lanes; + +/*apply frame generator timing setting */ +mipi_tx_fg_cfg_regs (dev_priv, frame_gen, &fg_t_cfg); +} +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *dev_priv,struct mipi_ctrl_cfg *ctrl_cfg) {
@@ -432,12 +549,13 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_priv,if (ctrl_cfg->tx_ctrl_cfg.frames[frame_id] ==NULL )continue ; +/* Frame Section configuration */ /*TODO - assume there is only one valid section in a frame, so * bits_per_pclk and word_count are only set once */ for (sect =0 ; sect <MIPI_CTRL_VIRTUAL_CHANNELS ; sect++) {if (ctrl_cfg->tx_ctrl_cfg.frames[frame_id]->sections[sect] - ==NULL ) + ==NULL )continue ; ret = mipi_tx_fg_section_cfg(dev_priv, frame_id, sect,
@@ -449,9 +567,17 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_priv, } +/* set frame specific parameters */ +mipi_tx_fg_cfg (dev_priv, frame_id, ctrl_cfg->active_lanes, + bits_per_pclk, + word_count, + ctrl_cfg->lane_rate_mbps, + ctrl_cfg->tx_ctrl_cfg.frames[frame_id]);/*function for setting frame sepecific parameters will be -* called here bits_per_pclk and word_count will be passed -* in to this function +* called here +*/ +/*bits_per_pclk and word_count will be passed in to this +* function */ }
drivers/gpu/drm/kmb/kmb_regs.h +37 -0
@@ -410,4 +410,41 @@ + (0x400*M) + (0x2C*N) + (8*O))#define MIPI_TX_HS_FG0_SECT0_LINE_CFG (0x44) +#define MIPI_TX_HS_FG0_NUM_LINES (0x68) +#define MIPI_TXm_HS_FGn_NUM_LINES (M ,N ) (MIPI_TX_HS_FG0_NUM_LINES + \ + (0x400*M) + (0x2C*N)) +#define MIPI_TX_HS_VSYNC_WIDTHS0 (0x104) +#define MIPI_TXm_HS_VSYNC_WIDTHn (M ,N ) (MIPI_TX_HS_VSYNC_WIDTHS0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_V_BACKPORCHES0 (0x16c) +#define MIPI_TXm_HS_V_BACKPORCHESn (M ,N ) (MIPI_TX_HS_V_BACKPORCHES0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_V_FRONTPORCHES0 (0x174) +#define MIPI_TXm_HS_V_FRONTPORCHESn (M ,N ) (MIPI_TX_HS_V_FRONTPORCHES0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_V_ACTIVE0 (0x17c) +#define MIPI_TXm_HS_V_ACTIVEn (M ,N ) (MIPI_TX_HS_V_ACTIVE0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_HSYNC_WIDTH0 (0x10c) +#define MIPI_TXm_HS_HSYNC_WIDTHn (M ,N ) (MIPI_TX_HS_HSYNC_WIDTH0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_H_BACKPORCH0 (0x11c) +#define MIPI_TXm_HS_H_BACKPORCHn (M ,N ) (MIPI_TX_HS_H_BACKPORCH0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_H_FRONTPORCH0 (0x12c) +#define MIPI_TXm_HS_H_FRONTPORCHn (M ,N ) (MIPI_TX_HS_H_FRONTPORCH0 + \ + (0x400*M) + (0x4*N)) +#define MIPI_TX_HS_H_ACTIVE0 (0x184) +#define MIPI_TXm_HS_H_ACTIVEn (M ,N ) (MIPI_TX_HS_H_ACTIVE0 + \ + (0x400*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 + \ + (0x400*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 + \ + (0x400*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 \ + + (0x400*M) + (0x4*N)) +#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 11/59 drm/kmb: Use correct mmio offset from data book
In reply to Anitha ChrisanthusAlso added separate macros for lcd and mipi register accesses that use the corrected mmio offset. mmio oofset will be read from the device tree in the future.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 49 ++++++++++++++++++----------------------- drivers/gpu/drm/kmb/kmb_drv.c | 18 ++++++--------- drivers/gpu/drm/kmb/kmb_drv.h | 47 ++++++++++++++++++++++++++++++++++++--- drivers/gpu/drm/kmb/kmb_dsi.c | 41 +++++++++++++++------------------- drivers/gpu/drm/kmb/kmb_plane.c | 34 ++++++++++++++-------------- drivers/gpu/drm/kmb/kmb_regs.h | 6 ++++- 6 files changed, 113 insertions(+), 82 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +22 -27
@@ -52,25 +52,21 @@ static void kmb_crtc_cleanup(struct drm_crtc *crtc)static int kmb_crtc_enable_vblank (struct drm_crtc *crtc) { -struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc); -/*clear interrupt */ -kmb_write (lcd,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/*set which interval to generate vertical interrupt */ -kmb_write (lcd,LCD_VSTATUS_COMPARE ,LCD_VSTATUS_COMPARE_VSYNC ); +kmb_write_lcd (LCD_VSTATUS_COMPARE ,LCD_VSTATUS_COMPARE_VSYNC );/* enable vertical interrupt */ -kmb_write (lcd,LCD_INT_ENABLE ,LCD_INT_VERT_COMP ); +kmb_write_lcd (LCD_INT_ENABLE ,LCD_INT_VERT_COMP );return 0 ; }static void kmb_crtc_disable_vblank (struct drm_crtc *crtc) { -struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc); -/*clear interrupt */ -kmb_write (lcd,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/* disable vertical interrupt */ -kmb_write (lcd,LCD_INT_ENABLE ,0 ); +kmb_write_lcd (LCD_INT_ENABLE ,0 );/* TBD * set the BIT2 (VERTICAL_COMPARE_INTERRUPT) of the LCD_INT_ENABLE register
@@ -92,7 +88,6 @@ static const struct drm_crtc_funcs kmb_crtc_funcs = {static void kmb_crtc_mode_set_nofb (struct drm_crtc *crtc) { -struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc);struct drm_display_mode *m = &crtc->state->adjusted_mode;struct videomode vm;int vsync_start_offset;
@@ -109,30 +104,30 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; -kmb_write (lcd,LCD_V_ACTIVEHEIGHT , m->crtc_vdisplay -1 ); -kmb_write (lcd,LCD_V_BACKPORCH , vm.vback_porch -1 ); -kmb_write (lcd,LCD_V_FRONTPORCH , vm.vfront_porch -1 ); -kmb_write (lcd,LCD_VSYNC_WIDTH , vm.vsync_len -1 ); -kmb_write (lcd,LCD_H_ACTIVEWIDTH , m->crtc_hdisplay -1 ); -kmb_write (lcd,LCD_H_BACKPORCH , vm.hback_porch -1 ); -kmb_write (lcd,LCD_H_FRONTPORCH , vm.hfront_porch -1 ); -kmb_write (lcd,LCD_HSYNC_WIDTH , vm.hsync_len -1 ); +kmb_write_lcd (LCD_V_ACTIVEHEIGHT , m->crtc_vdisplay -1 ); +kmb_write_lcd (LCD_V_BACKPORCH , vm.vback_porch -1 ); +kmb_write_lcd (LCD_V_FRONTPORCH , vm.vfront_porch -1 ); +kmb_write_lcd (LCD_VSYNC_WIDTH , vm.vsync_len -1 ); +kmb_write_lcd (LCD_H_ACTIVEWIDTH , m->crtc_hdisplay -1 ); +kmb_write_lcd (LCD_H_BACKPORCH , vm.hback_porch -1 ); +kmb_write_lcd (LCD_H_FRONTPORCH , vm.hfront_porch -1 ); +kmb_write_lcd (LCD_HSYNC_WIDTH , vm.hsync_len -1 );if (m->flags ==DRM_MODE_FLAG_INTERLACE ) { -kmb_write (lcd,LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); -kmb_write (lcd,LCD_V_BACKPORCH_EVEN , vm.vback_porch -1 ); -kmb_write (lcd,LCD_V_FRONTPORCH_EVEN , vm.vfront_porch -1 ); -kmb_write (lcd,LCD_V_ACTIVEHEIGHT_EVEN , m->crtc_vdisplay -1 ); -kmb_write (lcd,LCD_VSYNC_START_EVEN , vsync_start_offset); -kmb_write (lcd,LCD_VSYNC_END_EVEN , vsync_end_offset); +kmb_write_lcd (LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); +kmb_write_lcd (LCD_V_BACKPORCH_EVEN , vm.vback_porch -1 ); +kmb_write_lcd (LCD_V_FRONTPORCH_EVEN , vm.vfront_porch -1 ); +kmb_write_lcd (LCD_V_ACTIVEHEIGHT_EVEN , m->crtc_vdisplay -1 ); +kmb_write_lcd (LCD_VSYNC_START_EVEN , vsync_start_offset); +kmb_write_lcd (LCD_VSYNC_END_EVEN , vsync_end_offset); }/* enable VL1 layer as default */ ctrl =LCD_CTRL_ENABLE |LCD_CTRL_VL1_ENABLE ; ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE - |LCD_CTRL_OUTPUT_ENABLED ; -kmb_write (lcd,LCD_CONTROL , ctrl); + |LCD_CTRL_OUTPUT_ENABLED ; +kmb_write_lcd (LCD_CONTROL , ctrl); -kmb_write (lcd,LCD_TIMING_GEN_TRIG ,ENABLE ); +kmb_write_lcd (LCD_TIMING_GEN_TRIG ,ENABLE );/* TBD */ /* set clocks here */
drivers/gpu/drm/kmb/kmb_drv.c +7 -11
@@ -44,7 +44,6 @@#include <drm/drm_of.h> #include <drm/drm_irq.h> #include "kmb_drv.h" -#include "kmb_regs.h" #include "kmb_crtc.h" #include "kmb_plane.h" #include "kmb_dsi.h"
@@ -120,21 +119,20 @@ static void kmb_setup_mode_config(struct drm_device *drm)static irqreturn_t kmb_irq (int irq,void *arg) {struct drm_device *dev = (struct drm_device *)arg; -struct kmb_drm_private *lcd = dev->dev_private;unsigned long status, val; - status =kmb_read (lcd,LCD_INT_STATUS ); + status =kmb_read_lcd (LCD_INT_STATUS );if (status &LCD_INT_EOF ) {/*To DO - handle EOF interrupt? */ -kmb_write (lcd,LCD_INT_CLEAR ,LCD_INT_EOF ); +kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_EOF ); }if (status &LCD_INT_LINE_CMP ) {/* clear line compare interrupt */ -kmb_write (lcd,LCD_INT_CLEAR ,LCD_INT_LINE_CMP ); +kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_LINE_CMP ); }if (status &LCD_INT_VERT_COMP ) {/* read VSTATUS */ - val =kmb_read (lcd,LCD_VSTATUS ); + val =kmb_read_lcd (LCD_VSTATUS ); val = (val &LCD_VSTATUS_VERTICAL_STATUS_MASK );switch (val) {case LCD_VSTATUS_COMPARE_VSYNC :
@@ -142,7 +140,7 @@ static irqreturn_t kmb_irq(int irq, void *arg)case LCD_VSTATUS_COMPARE_ACTIVE :case LCD_VSTATUS_COMPARE_FRONT_PORCH :/* clear vertical compare interrupt */ -kmb_write (lcd,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_VERT_COMP );drm_handle_vblank (dev,0 );break ; }
@@ -153,10 +151,8 @@ static irqreturn_t kmb_irq(int irq, void *arg)static void kmb_irq_reset (struct drm_device *drm) { -struct kmb_drm_private *lcd = drm->dev_private; - -kmb_write (lcd,LCD_INT_CLEAR ,0xFFFF ); -kmb_write (lcd,LCD_INT_ENABLE ,0 ); +kmb_write_lcd (LCD_INT_CLEAR ,0xFFFF ); +kmb_write_lcd (LCD_INT_ENABLE ,0 ); }DEFINE_DRM_GEM_CMA_FOPS (fops);
drivers/gpu/drm/kmb/kmb_drv.h +44 -3
65 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.c +18 -23
101 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c +17 -17
@@ -242,16 +242,16 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, crtc_x = plane->state->crtc_x; crtc_y = plane->state->crtc_y; -kmb_write (lcd,LCD_LAYERn_WIDTH (plane_id), src_w -1 ); -kmb_write (lcd,LCD_LAYERn_HEIGHT (plane_id), src_h -1 ); -kmb_write (lcd,LCD_LAYERn_COL_START (plane_id), crtc_x); -kmb_write (lcd,LCD_LAYERn_ROW_START (plane_id), crtc_y); +kmb_write_lcd (LCD_LAYERn_WIDTH (plane_id), src_w-1 ); +kmb_write_lcd (LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); +kmb_write_lcd (LCD_LAYERn_COL_START (plane_id), crtc_x); +kmb_write_lcd (LCD_LAYERn_ROW_START (plane_id), crtc_y); val =set_pixel_format (fb->format->format); val |=set_bits_per_pixel (fb->format);/*CHECKME Leon drvr sets it to 50 try this for now */ val |=LCD_LAYER_FIFO_50 ; -kmb_write (lcd,LCD_LAYERn_CFG (plane_id), val); +kmb_write_lcd (LCD_LAYERn_CFG (plane_id), val);switch (plane_id) {case LAYER_0 :
@@ -270,8 +270,8 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, ctrl |=LCD_CTRL_ENABLE ; ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE - |LCD_CTRL_OUTPUT_ENABLED ; -kmb_write (lcd,LCD_CONTROL , ctrl); + |LCD_CTRL_OUTPUT_ENABLED ; +kmb_write_lcd (LCD_CONTROL , ctrl);/*TBD check visible? */
@@ -280,24 +280,24 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, | LCD_DMA_LAYER_CONT_UPDATE | LCD_DMA_LAYER_AXI_BURST_1;/* disable DMA first */ -kmb_write (lcd,LCD_LAYERn_DMA_CFG (plane_id), ~LCD_DMA_LAYER_ENABLE ); +kmb_write_lcd (LCD_LAYERn_DMA_CFG (plane_id), ~LCD_DMA_LAYER_ENABLE ); addr =drm_fb_cma_get_gem_addr (fb, plane->state, plane_id); -kmb_write (lcd,LCD_LAYERn_DMA_START_ADDR (plane_id), addr); -kmb_write (lcd,LCD_LAYERn_DMA_START_SHADOW (plane_id), addr); +kmb_write_lcd (LCD_LAYERn_DMA_START_ADDR (plane_id), addr); +kmb_write_lcd (LCD_LAYERn_DMA_START_SHADOW (plane_id), addr); width = fb->width; height = fb->height; dma_len = width * height * fb->format->cpp[plane_id]; -kmb_write (lcd,LCD_LAYERn_DMA_LEN (plane_id), dma_len); +kmb_write_lcd (LCD_LAYERn_DMA_LEN (plane_id), dma_len); -kmb_write (lcd,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), - fb->pitches[plane_id]); -kmb_write (lcd,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), - (width * fb->format->cpp[plane_id])); +kmb_write_lcd (LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), + fb->pitches[plane_id]); +kmb_write_lcd (LCD_LAYERn_DMA_LINE_WIDTH (plane_id), + (width*fb->format->cpp[plane_id]));/* enable DMA */ -kmb_write (lcd,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +kmb_write_lcd (LCD_LAYERn_DMA_CFG (plane_id), dma_cfg);/* FIXME no doc on how to set output format - may need to change * this later
@@ -310,7 +310,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, out_format |=LCD_OUTF_MIPI_RGB_MODE ;/* pixel format from LCD_LAYER_CFG */ out_format |= ((val >>9 ) &0x1F ); -kmb_write (lcd,LCD_OUT_FORMAT_CFG , out_format); +kmb_write_lcd (LCD_OUT_FORMAT_CFG , out_format); }static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
drivers/gpu/drm/kmb/kmb_regs.h +5 -1
@@ -27,6 +27,11 @@#define __KMB_REGS_H__#define ENABLE 1 +/*from Data Book section 12.5.8.1 page 4322 */ +#define MIPI_BASE_ADDR (void *)(0x20900000) +/*from Data Book section 12.11.6.1 page 4972 */ +#define LCD_BASE_ADDR (void *)(0x20930000) +/*************************************************************************** * LCD controller control register defines ***************************************************************************/
@@ -388,7 +393,6 @@/*************************************************************************** * MIPI controller control register defines ***********************************************i****************************/ -#define MIPI_BASE_ADDR (0x20900000)#define MIPI0_HS_BASE_ADDR (MIPI_BASE_ADDR + 0x400)#define MIPI_CTRL_HS_BASE_ADDR (0x400)#define MIPI_TX0_HS_FG0_SECT0_PH (0x40)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 12/59 drm/kmb: Part3 of Mipi Tx initialization
In reply to Anitha ChrisanthusThis initializes the multichannel fifo in the mipi transmitter and sets the LCD to mipi interconnect which connects LCD to MIPI ctrl #6
v2: code review changes to make code simpler
--- drivers/gpu/drm/kmb/kmb_drv.h | 25 +++++++++++++++--- drivers/gpu/drm/kmb/kmb_dsi.c | 58 ++++++++++++++++++++++++++++++++++-------- drivers/gpu/drm/kmb/kmb_dsi.h | 3 +++ drivers/gpu/drm/kmb/kmb_regs.h | 30 +++++++++++++++++++--- 4 files changed, 99 insertions(+), 17 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.h +22 -3
@@ -28,8 +28,8 @@#include "kmb_regs.h" -#define KMB_MAX_WIDTH 16384/*max width in pixels */ -#define KMB_MAX_HEIGHT 16384/*max height in pixels */ +#define KMB_MAX_WIDTH 16384/*max width in pixels */ +#define KMB_MAX_HEIGHT 16384/*max height in pixels */ struct kmb_drm_private {struct drm_device drm;
@@ -84,6 +84,11 @@ static inline void kmb_write_bits(struct kmb_drm_private *lcd, }#endif +static inline void kmb_write (void *reg,u32 value) +{ +writel (value, reg); +} +static inline void kmb_write_lcd (unsigned int reg,u32 value) {writel (value, (LCD_BASE_ADDR + reg));
@@ -105,7 +110,7 @@ static inline u32 kmb_read_mipi(unsigned int reg) }static inline void kmb_write_bits_mipi (unsigned int reg,u32 offset, -u32 num_bits,u32 value) +u32 num_bits,u32 value) {u32 reg_val =kmb_read_mipi (reg);u32 mask = (1 << num_bits) -1 ;
@@ -117,6 +122,20 @@ static inline void kmb_write_bits_mipi(unsigned int reg, u32 offset, kmb_write_mipi(reg, reg_val); } +static inline void kmb_set_bit_mipi (unsigned int reg,u32 offset) +{ +u32 reg_val =kmb_read_mipi (reg); + +kmb_write_mipi (reg, reg_val | (1 << offset)); +} + +static inline void kmb_clr_bit_mipi (unsigned int reg,u32 offset) +{ +u32 reg_val =kmb_read_mipi (reg); + +kmb_write_mipi (reg, reg_val & (~(1 << offset))); +} +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_dsi.c +47 -11
75 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +3 -0
@@ -55,6 +55,9 @@ struct kmb_connector {#define MIPI_TX_FRAME_GEN 4#define MIPI_TX_FRAME_GEN_SECTIONS 4#define MIPI_CTRL_VIRTUAL_CHANNELS 4 +#define MIPI_D_LANES_PER_DPHY 2 +#define MIPI_CTRL_2LANE_MAX_MC_FIFO_LOC 255 +#define MIPI_CTRL_4LANE_MAX_MC_FIFO_LOC 511enum mipi_ctrl_num {MIPI_CTRL0 =0 ,
drivers/gpu/drm/kmb/kmb_regs.h +27 -3
@@ -31,6 +31,7 @@#define MIPI_BASE_ADDR (void *)(0x20900000)/*from Data Book section 12.11.6.1 page 4972 */ #define LCD_BASE_ADDR (void *)(0x20930000) +#define MSS_CAM_BASE_ADDR (MIPI_BASE_ADDR + 0x10000)/*************************************************************************** * LCD controller control register defines
@@ -395,6 +396,9 @@***********************************************i****************************/ #define MIPI0_HS_BASE_ADDR (MIPI_BASE_ADDR + 0x400)#define MIPI_CTRL_HS_BASE_ADDR (0x400) + +#define MIPI_TX_HS_CTRL (0x0) +#define MIPI_TX_HS_SYNC_CFG (0x8)#define MIPI_TX0_HS_FG0_SECT0_PH (0x40)#define MIPI_TXm_HS_FGn_SECTo_PH (M ,N ,O ) (MIPI_TX0_HS_FG0_SECT0_PH + \ (0x400*M) + (0x2C*N) + (8*O))
@@ -409,10 +413,10 @@#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 + (0x400*M) + (0x2C*N)) -#define MIPI_TXm_HS_FGn_SECTo_LINE_CFG (M ,N ,O ) (MIPI_TX_HS_FG0_SECT0_LINE_CFG \ - + (0x400*M) + (0x2C*N) + (8*O)) + (MIPI_TX_HS_FG0_SECT_UNPACKED_BYTES0 + (0x400*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 + (0x400*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 + \
@@ -451,4 +455,24 @@#define MIPI_TXm_HS_LLP_H_FRONTPORCHn (M ,N ) (MIPI_TX_HS_LLP_H_FRONTPORCH0 \ + (0x400*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 \ + + (0x400*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 + (0x400*M) + (0x4*N)) +#define SET_MC_FIFO_CHAN_ALLOC (ctrl, vc, sz) \ + kmb_write_bits_mipi(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 + (0x400*M) + (0x4*N)) +#define SET_MC_FIFO_RTHRESHOLD (ctrl, vc, th) \ + kmb_write_bits_mipi(MIPI_TXm_HS_MC_FIFO_RTHRESHOLDn(ctrl, vc/2), \ + (vc % 2)*16, 16, th) + +#define MIPI_TX_MSS_LCD_MIPI_CFG (0x04) +#define BIT_MASK_16 (0xffff)#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 13/59 drm/kmb: Part4 of Mipi Tx Initialization
In reply to Anitha ChrisanthusThis initializes the mipi high speed transmitter CTRL and SYNC configuration registers.
--- drivers/gpu/drm/kmb/kmb_dsi.c | 55 ++++++++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/kmb/kmb_regs.h | 29 +++++++++++++++++++++- 2 files changed, 81 insertions(+), 3 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +53 -2
@@ -553,6 +553,55 @@ static void mipi_tx_multichannel_fifo_cfg(u8 active_lanes, u8 vchannel_id)kmb_set_bit_mipi (MIPI_TXm_HS_MC_FIFO_CTRL_EN (ctrl_no), vchannel_id); } +static void mipi_tx_ctrl_cfg (u8 fg_id,struct mipi_ctrl_cfg *ctrl_cfg) +{ +u32 sync_cfg =0 , ctrl =0 , fg_en; +u32 ctrl_no =MIPI_CTRL6 ; + +/*MIPI_TX_HS_SYNC_CFG*/ +if (ctrl_cfg->tx_ctrl_cfg.line_sync_pkt_en) + sync_cfg |=LINE_SYNC_PKT_ENABLE ; +if (ctrl_cfg->tx_ctrl_cfg.frame_counter_active) + sync_cfg |=FRAME_COUNTER_ACTIVE ; +if (ctrl_cfg->tx_ctrl_cfg.line_counter_active) + sync_cfg |=LINE_COUNTER_ACTIVE ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->v_blanking) + sync_cfg |=DSI_V_BLANKING ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->hsa_blanking) + sync_cfg |=DSI_HSA_BLANKING ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->hbp_blanking) + sync_cfg |=DSI_HBP_BLANKING ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->hfp_blanking) + sync_cfg |=DSI_HFP_BLANKING ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->sync_pulse_eventn) + sync_cfg |=DSI_SYNC_PULSE_EVENTN ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->lpm_first_vsa_line) + sync_cfg |=DSI_LPM_FIRST_VSA_LINE ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->lpm_last_vfp_line) + sync_cfg |=DSI_LPM_LAST_VFP_LINE ; +/* enable frame generator */ + fg_en =1 << fg_id; + sync_cfg |=FRAME_GEN_EN (fg_en); +if (ctrl_cfg->tx_ctrl_cfg.tx_always_use_hact) + sync_cfg |=ALWAYS_USE_HACT (fg_en); +if (ctrl_cfg->tx_ctrl_cfg.tx_hact_wait_stop) + sync_cfg |=HACT_WAIT_STOP (fg_en); + +/* MIPI_TX_HS_CTRL*/ + ctrl =HS_CTRL_EN |TX_SOURCE ;/* type:DSI,source:LCD */ +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->eotp_en) + ctrl |=DSI_EOTP_EN ; +if (ctrl_cfg->tx_ctrl_cfg.tx_dsi_cfg->hfp_blank_en) + ctrl |=DSI_CMD_HFP_EN ; + ctrl |=LCD_VC (fg_id); + ctrl |=ACTIVE_LANES (ctrl_cfg->active_lanes -1 ); +/*67 ns stop time*/ + ctrl |=HSEXIT_CNT (0x43 ); + +kmb_write_mipi (MIPI_TXm_HS_SYNC_CFG (ctrl_no), sync_cfg); +kmb_write_mipi (MIPI_TXm_HS_CTRL (ctrl_no), ctrl); +} +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *dev_priv,struct mipi_ctrl_cfg *ctrl_cfg) {
@@ -596,8 +645,7 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_priv,/* set frame specific parameters */ mipi_tx_fg_cfg (dev_priv, frame_id, ctrl_cfg->active_lanes, bits_per_pclk, - word_count, - ctrl_cfg->lane_rate_mbps, + word_count, ctrl_cfg->lane_rate_mbps, ctrl_cfg->tx_ctrl_cfg.frames[frame_id]); active_vchannels++;
@@ -612,6 +660,9 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_priv,return -EINVAL ;/*Multi-Channel FIFO Configuration*/ mipi_tx_multichannel_fifo_cfg (ctrl_cfg->active_lanes, frame_id); + +/*Frame Generator Enable */ +mipi_tx_ctrl_cfg (frame_id, ctrl_cfg);return ret; }
drivers/gpu/drm/kmb/kmb_regs.h +28 -1
@@ -398,7 +398,35 @@#define MIPI_CTRL_HS_BASE_ADDR (0x400)#define MIPI_TX_HS_CTRL (0x0) +#define MIPI_TXm_HS_CTRL (M ) (MIPI_TX_HS_CTRL + (0x400*M)) +#define HS_CTRL_EN (1 << 0) +#define HS_CTRL_CSIDSIN (1 << 2)/*1:CSI 0:DSI*/ +#define TX_SOURCE (1 << 3)/*1:LCD, 0:DMA*/ +#define ACTIVE_LANES (n) ((n) << 4) +#define LCD_VC (ch) ((ch) << 8) +#define DSI_EOTP_EN (1 << 11) +#define DSI_CMD_HFP_EN (1 << 12) +#define CRC_EN (1 << 14) +#define HSEXIT_CNT (n) ((n) << 16) +#define HSCLKIDLE_CNT (1 << 24)#define MIPI_TX_HS_SYNC_CFG (0x8) +#define MIPI_TXm_HS_SYNC_CFG (M ) (MIPI_TX_HS_SYNC_CFG \ + + (0x400*M)) +#define LINE_SYNC_PKT_ENABLE (1 << 0) +#define FRAME_COUNTER_ACTIVE (1 << 1) +#define LINE_COUNTER_ACTIVE (1 << 2) +#define DSI_V_BLANKING (1 << 4) +#define DSI_HSA_BLANKING (1 << 5) +#define DSI_HBP_BLANKING (1 << 6) +#define DSI_HFP_BLANKING (1 << 7) +#define DSI_SYNC_PULSE_EVENTN (1 << 8) +#define DSI_LPM_FIRST_VSA_LINE (1 << 9) +#define DSI_LPM_LAST_VFP_LINE (1 << 10) +#define WAIT_ALL_SECT (1 << 11) +#define WAIT_TRIG_POS (1 << 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 + \ (0x400*M) + (0x2C*N) + (8*O))
@@ -454,7 +482,6 @@#define MIPI_TX_HS_LLP_H_FRONTPORCH0 (0x15c)#define MIPI_TXm_HS_LLP_H_FRONTPORCHn (M ,N ) (MIPI_TX_HS_LLP_H_FRONTPORCH0 \ + (0x400*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 \ + (0x400*M))
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 14/59 drm/kmb: Correct address offsets for mipi registers
In reply to Anitha ChrisanthusMipi HS registers start at an additional offset of 0x400 which needs to be added at the register macro definition and not at the read/write function level.
v2: replaced calculations with macro to make code simpler
--- drivers/gpu/drm/kmb/kmb_dsi.c | 16 +++--- drivers/gpu/drm/kmb/kmb_regs.h | 116 ++++++++++++++++++++++++----------------- 2 files changed, 75 insertions(+), 57 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +8 -8
@@ -443,20 +443,20 @@ static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *dev_priv,*REG_VSYNC_WIDTH0: [15:0]-VSA for channel0, [31:16]-VSA for channel1 *REG_VSYNC_WIDTH1: [15:0]-VSA for channel2, [31:16]-VSA for channel3 */ - offset = (frame_gen %2 ) *16 ; - reg_adr =MIPI_TXm_HS_VSYNC_WIDTHn (ctrl_no, frame_gen); + offset = (frame_gen %2 )*16 ; + reg_adr =MIPI_TXm_HS_VSYNC_WIDTHn (ctrl_no, frame_gen/2 );kmb_write_bits_mipi (reg_adr, offset,16 , fg_cfg->vsync_width); -/*v backporch - same register config like vsync width */ - reg_adr =MIPI_TXm_HS_V_BACKPORCHESn (ctrl_no, frame_gen); +/*v backporch - same register config like vsync width*/ + reg_adr =MIPI_TXm_HS_V_BACKPORCHESn (ctrl_no, frame_gen/2 );kmb_write_bits_mipi (reg_adr, offset,16 , fg_cfg->v_backporch); -/*v frontporch - same register config like vsync width */ - reg_adr =MIPI_TXm_HS_V_FRONTPORCHESn (ctrl_no, frame_gen); +/*v frontporch - same register config like vsync width*/ + reg_adr =MIPI_TXm_HS_V_FRONTPORCHESn (ctrl_no, frame_gen/2 );kmb_write_bits_mipi (reg_adr, offset,16 , fg_cfg->v_frontporch); -/*v active - same register config like vsync width */ - reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen); +/*v active - same register config like vsync width*/ + reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen/2 );kmb_write_bits_mipi (reg_adr, offset,16 , fg_cfg->v_active);/*hsyc width */
drivers/gpu/drm/kmb/kmb_regs.h +67 -49
159 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 15/59 drm/kmb: Part5 of Mipi Tx Intitialization
In reply to Anitha ChrisanthusThis is part1 of DPHY initialization.
v2: remove kmb_write() as the function provides no benefit over calling writel() directly.
--- drivers/gpu/drm/kmb/kmb_drv.h | 5 - drivers/gpu/drm/kmb/kmb_dsi.c | 346 ++++++++++++++++++++++++++++++++++++++--- drivers/gpu/drm/kmb/kmb_dsi.h | 10 ++ drivers/gpu/drm/kmb/kmb_regs.h | 48 +++++- 4 files changed, 376 insertions(+), 33 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.h +0 -5
@@ -84,11 +84,6 @@ static inline void kmb_write_bits(struct kmb_drm_private *lcd, }#endif -static inline void kmb_write (void *reg,u32 value) -{ -writel (value, reg); -} -static inline void kmb_write_lcd (unsigned int reg,u32 value) {writel (value, (LCD_BASE_ADDR + reg));
drivers/gpu/drm/kmb/kmb_dsi.c +321 -25
450 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +10 -0
@@ -58,6 +58,11 @@ struct kmb_connector {#define MIPI_D_LANES_PER_DPHY 2#define MIPI_CTRL_2LANE_MAX_MC_FIFO_LOC 255#define MIPI_CTRL_4LANE_MAX_MC_FIFO_LOC 511 +#define MIPI_DPHY_D_LANES 2/* 2 Data Lanes per D-PHY*/ +#define MIPI_DPHY_DEFAULT_BIT_RATES 63 + +/*DPHY Tx test codes */ +#define TEST_CODE_MULTIPLE_PHY_CTRL 0x03enum mipi_ctrl_num {MIPI_CTRL0 =0 ,
@@ -194,6 +199,11 @@ enum mipi_dsi_data_type {DSI_LP_DT_RESERVED_3F =0x3f }; +enum dphy_mode { +MIPI_DPHY_SLAVE =0 , +MIPI_DPHY_MASTER +}; +struct mipi_data_type_params {uint8_t size_constraint_pixels;uint8_t size_constraint_bytes;
drivers/gpu/drm/kmb/kmb_regs.h +45 -3
65 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 16/59 drm/kmb: Part6 of Mipi Tx Initialization
In reply to Anitha ChrisanthusThis is part2 of DPHY initialization- sets up DPHY PLLs.
v2: simplified mipi_tx_get_vco_params() based on review
v3: added WARN_ON for invalid freq
v4: fixed bug in mipi_tx_get_vco_params
--- drivers/gpu/drm/kmb/kmb_dsi.c | 194 +++++++++++++++++++++++++++++++++++++++-- drivers/gpu/drm/kmb/kmb_regs.h | 2 + 2 files changed, 189 insertions(+), 7 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +187 -7
@@ -48,11 +48,33 @@#define MIPI_TX_CFG_CLK_KHZ 24000/*DPHY Tx test codes*/ -#define TEST_CODE_HS_FREQ_RANGE_CFG 0x44 -#define TEST_CODE_PLL_ANALOG_PROG 0x1F -#define TEST_CODE_SLEW_RATE_OVERRIDE_CTRL 0xA0 -#define TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL 0xA3 -#define TEST_CODE_SLEW_RATE_DDL_CYCLES 0xA4 +#define TEST_CODE_PLL_PROPORTIONAL_CHARGE_PUMP_CTRL 0x0E +#define TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL 0x0F +#define TEST_CODE_PLL_VCO_CTRL 0x12 +#define TEST_CODE_PLL_GMP_CTRL 0x13 +#define TEST_CODE_PLL_PHASE_ERR_CTRL 0x14 +#define TEST_CODE_PLL_LOCK_FILTER 0x15 +#define TEST_CODE_PLL_UNLOCK_FILTER 0x16 +#define TEST_CODE_PLL_INPUT_DIVIDER 0x17 +#define TEST_CODE_PLL_FEEDBACK_DIVIDER 0x18 +#define PLL_FEEDBACK_DIVIDER_HIGH (1 << 7) +#define TEST_CODE_PLL_OUTPUT_CLK_SEL 0x19 +#define PLL_N_OVR_EN (1 << 4) +#define PLL_M_OVR_EN (1 << 5) +#define TEST_CODE_PLL_CHARGE_PUMP_BIAS 0x1C +#define TEST_CODE_PLL_LOCK_DETECTOR 0x1D +#define TEST_CODE_HS_FREQ_RANGE_CFG 0x44 +#define TEST_CODE_PLL_ANALOG_PROG 0x1F +#define TEST_CODE_SLEW_RATE_OVERRIDE_CTRL 0xA0 +#define TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL 0xA3 +#define TEST_CODE_SLEW_RATE_DDL_CYCLES 0xA4 + +/* D-Phy params */ +#define PLL_N_MIN 0 +#define PLL_N_MAX 15 +#define PLL_M_MIN 62 +#define PLL_M_MAX 623 +#define PLL_FVCO_MAX 1250/* * These are added here only temporarily for testing,
@@ -800,8 +822,158 @@ static inline void set_test_mode_src_osc_freq_target_hi_bits(u32 dphy_no,test_mode_send (dphy_no,TEST_CODE_SLEW_RATE_DDL_CYCLES , data); } +struct vco_params { +u32 freq; +u32 range; +u32 divider; +}; + +static struct vco_params vco_table[] = { + {52 ,0x3f ,8 }, + {80 ,0x39 ,8 }, + {105 ,0x2f ,4 }, + {160 ,0x29 ,4 }, + {210 ,0x1f ,2 }, + {320 ,0x19 ,2 }, + {420 ,0x0f ,1 }, + {630 ,0x09 ,1 }, + {1100 ,0x03 ,1 }, + {0xffff ,0x01 ,1 }, +}; + +static void mipi_tx_get_vco_params (struct vco_params *vco) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (vco_table); i++) { +if (vco->freq < vco_table[i].freq) { + *vco = vco_table[i]; +return ; + } + } +WARN_ONCE (1 ,"Invalid vco freq = %u for PLL setup\n" , vco->freq); +} + +static void mipi_tx_pll_setup (u32 dphy_no,u32 ref_clk_mhz,u32 target_freq_mhz) +{ +/* pll_ref_clk: - valid range: 2~64 MHz; Typically 24 MHz +* Fvco: - valid range: 320~1250 MHz (Gen3 D-PHY) +* Fout: - valid range: 40~1250 MHz (Gen3 D-PHY) +* n: - valid range [0 15] +* N: - N = n + 1 +* -valid range: [1 16] +* -conditions: - (pll_ref_clk / N) >= 2 MHz +* -(pll_ref_clk / N) <= 8 MHz +* m: valid range [62 623] +* M: - M = m + 2 +* -valid range [64 625] +* -Fvco = (M/N) * pll_ref_clk +*/ +struct vco_params vco_p = { + .range =0 , + .divider =1 , + }; +u32 best_n =0 , best_m =0 ; +u32 n =0 , m =0 , div =0 , delta, freq =0 , t_freq; +u32 best_freq_delta =3000 ; + + vco_p.freq = target_freq_mhz; +mipi_tx_get_vco_params (&vco_p); +/*search pll n parameter */ +for (n =PLL_N_MIN ; n <=PLL_N_MAX ; n++) { +/*calculate the pll input frequency division ratio +* multiply by 1000 for precision - +* no floating point, add n for rounding +*/ + div = ((ref_clk_mhz *1000 ) + n)/(n+1 ); +/*found a valid n parameter */ +if ((div <2000 || div >8000 )) +continue ; +/*search pll m parameter */ +for (m =PLL_M_MIN ; m <=PLL_M_MAX ; m++) { +/*calculate the Fvco(DPHY PLL output frequency) +* using the current n,m params +*/ + freq = div * (m +2 ); + freq /=1000 ; +/* trim the potential pll freq to max supported*/ +if (freq >PLL_FVCO_MAX ) +continue ; + + delta =abs (freq - target_freq_mhz); +/*select the best (closest to target pll freq) +* n,m parameters so far +*/ +if (delta < best_freq_delta) { + best_n = n; + best_m = m; + best_freq_delta = delta; + } + } + } + +/*Program vco_cntrl parameter +*PLL_VCO_Control[5:0] = pll_vco_cntrl_ovr, +* PLL_VCO_Control[6] = pll_vco_cntrl_ovr_en +*/ +test_mode_send (dphy_no,TEST_CODE_PLL_VCO_CTRL , (vco_p.range + | (1 <<6 ))); + +/*Program m, n pll parameters */ + +/*PLL_Input_Divider_Ratio[3:0] = pll_n_ovr */ +test_mode_send (dphy_no,TEST_CODE_PLL_INPUT_DIVIDER , (best_n &0x0f )); + +/* m - low nibble PLL_Loop_Divider_Ratio[4:0] = pll_m_ovr[4:0] */ +test_mode_send (dphy_no,TEST_CODE_PLL_FEEDBACK_DIVIDER , + (best_m &0x1f )); + +/*m -high nibble PLL_Loop_Divider_Ratio[4:0] = pll_m_ovr[9:5] */ +test_mode_send (dphy_no,TEST_CODE_PLL_FEEDBACK_DIVIDER , + ((best_m >>5 ) &0x1f ) |PLL_FEEDBACK_DIVIDER_HIGH ); + +/*enable overwrite of n,m parameters :pll_n_ovr_en, pll_m_ovr_en*/ +test_mode_send (dphy_no,TEST_CODE_PLL_OUTPUT_CLK_SEL , + (PLL_N_OVR_EN |PLL_M_OVR_EN )); + +/*Program Charge-Pump parameters */ + +/*pll_prop_cntrl-fixed values for prop_cntrl from DPHY doc */ + t_freq = target_freq_mhz * vco_p.divider; +test_mode_send (dphy_no,TEST_CODE_PLL_PROPORTIONAL_CHARGE_PUMP_CTRL , + ((t_freq >1150 ) ?0x0C :0x0B )); + +/*pll_int_cntrl-fixed value for int_cntrl from DPHY doc */ +test_mode_send (dphy_no,TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL , +0x00 ); + +/*pll_gmp_cntrl-fixed value for gmp_cntrl from DPHY doci */ +test_mode_send (dphy_no,TEST_CODE_PLL_GMP_CTRL ,0x10 ); + +/*pll_cpbias_cntrl-fixed value for cpbias_cntrl from DPHY doc */ +test_mode_send (dphy_no,TEST_CODE_PLL_CHARGE_PUMP_BIAS ,0x10 ); + +/*PLL Lock Configuration */ + +/*pll_th1 -Lock Detector Phase error threshold, +* document gives fixed value +*/ +test_mode_send (dphy_no,TEST_CODE_PLL_PHASE_ERR_CTRL ,0x02 ); + +/*pll_th2 - Lock Filter length, document gives fixed value */ +test_mode_send (dphy_no,TEST_CODE_PLL_LOCK_FILTER ,0x60 ); + +/*pll_th3- PLL Unlocking filter, document gives fixed value */ +test_mode_send (dphy_no,TEST_CODE_PLL_UNLOCK_FILTER ,0x03 ); + +/*pll_lock_sel-PLL Lock Detector Selection, document gives +* fixed value +*/ +test_mode_send (dphy_no,TEST_CODE_PLL_LOCK_DETECTOR ,0x02 ); +} +static void dphy_init_sequence (struct mipi_ctrl_cfg *cfg,u32 dphy_no, -enum dphy_mode mode) +enum dphy_mode mode) {u32 test_code =0 ;u32 test_data =0 , val;
@@ -904,7 +1076,15 @@ static void dphy_init_sequence(struct mipi_ctrl_cfg *cfg, u32 dphy_no,/*Set PLL regulator in bypass */ test_mode_send (dphy_no,TEST_CODE_PLL_ANALOG_PROG ,0x01 ); -/*TODO - PLL Parameters Setup */ +/* PLL Parameters Setup */ +mipi_tx_pll_setup (dphy_no, cfg->ref_clk_khz/1000 , + cfg->lane_rate_mbps/2 ); + +/*Set clksel */ +kmb_write_bits_mipi (DPHY_INIT_CTRL1 ,18 ,2 ,0x01 ); + +/*Set pll_shadow_control */ +kmb_write_bits_mipi (DPHY_INIT_CTRL1 ,16 ,1 ,0x01 ); }/*Send NORMAL OPERATION test code */
drivers/gpu/drm/kmb/kmb_regs.h +2 -0
@@ -524,6 +524,7 @@/* D-PHY regs */ #define DPHY_ENABLE (0x100)#define DPHY_INIT_CTRL0 (0x104) +#define DPHY_INIT_CTRL1 (0x108)#define SHUTDOWNZ 0#define RESETZ 12#define DPHY_INIT_CTRL2 (0x10c)
@@ -533,6 +534,7 @@#define CLR_DPHY_INIT_CTRL0 (dphy, offset) \ kmb_clr_bit_mipi(DPHY_INIT_CTRL0, \ (dphy+offset)) +#define DPHY_INIT_CTRL2 (0x10c)#define DPHY_FREQ_CTRL0_3 (0x11c)#define SET_DPHY_FREQ_CTRL0_3 (dphy, val) \ kmb_write_bits_mipi(DPHY_FREQ_CTRL0_3 \
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 17/59 drm/kmb: Part7 of Mipi Tx Initialization
In reply to Anitha ChrisanthusThis completes the DPHY initialization and Tx initialization.
v2: minor code review changes
--- drivers/gpu/drm/kmb/kmb_dsi.c | 65 ++++++++++++++++++++++++++++++++++++++---- drivers/gpu/drm/kmb/kmb_dsi.h | 18 ++++++++++++ drivers/gpu/drm/kmb/kmb_regs.h | 15 ++++++++-- 3 files changed, 91 insertions(+), 7 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +60 -5
@@ -48,6 +48,7 @@#define MIPI_TX_CFG_CLK_KHZ 24000/*DPHY Tx test codes*/ +#define TEST_CODE_FSM_CONTROL 0x03#define TEST_CODE_PLL_PROPORTIONAL_CHARGE_PUMP_CTRL 0x0E#define TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL 0x0F#define TEST_CODE_PLL_VCO_CTRL 0x12
@@ -1081,10 +1082,10 @@ static void dphy_init_sequence(struct mipi_ctrl_cfg *cfg, u32 dphy_no, cfg->lane_rate_mbps/2);/*Set clksel */ -kmb_write_bits_mipi (DPHY_INIT_CTRL1 ,18 ,2 ,0x01 ); +kmb_write_bits_mipi (DPHY_INIT_CTRL1 ,PLL_CLKSEL_0 ,2 ,0x01 );/*Set pll_shadow_control */ -kmb_write_bits_mipi (DPHY_INIT_CTRL1 ,16 ,1 ,0x01 ); +kmb_set_bit_mipi (DPHY_INIT_CTRL1 ,PLL_SHADOW_CTRL ); }/*Send NORMAL OPERATION test code */
@@ -1107,7 +1108,48 @@ static void dphy_init_sequence(struct mipi_ctrl_cfg *cfg, u32 dphy_no,/* enable DATA LANES */ kmb_write_bits_mipi (DPHY_ENABLE , dphy_no *2 ,2 , - ((1 << cfg->active_lanes) -1 )); + ((1 << cfg->active_lanes) -1 )); + +/*Take D-PHY out of shutdown mode */ +/* deassert SHUTDOWNZ signal*/ +SET_DPHY_INIT_CTRL0 (dphy_no,SHUTDOWNZ ); +/*deassert RSTZ signal */ +SET_DPHY_INIT_CTRL0 (dphy_no,RESETZ ); +} + +static void dphy_wait_fsm (u32 dphy_no,enum dphy_tx_fsm fsm_state) +{ +enum dphy_tx_fsm val =DPHY_TX_POWERDWN ; + +do { +test_mode_send (dphy_no,TEST_CODE_FSM_CONTROL ,0x80 ); +/*TODO-need to add a time out and return failure */ + val =GET_TEST_DOUT0_3 (dphy_no); + }while (val != fsm_state); + +} + +static u32 wait_init_done (u32 dphy_no,u32 active_lanes) +{ +u32 stopstatedata =0 ; +u32 data_lanes = (1 << active_lanes) -1 ; + +do { + stopstatedata =GET_STOPSTATE_DATA (dphy_no); +/*TODO-need to add a time out and return failure */ + }while (stopstatedata != data_lanes); + +return 0 ; +} + +static u32 wait_pll_lock (u32 dphy_no) +{ +do { + ; +/*TODO-need to add a time out and return failure */ + }while (!GET_PLL_LOCK (dphy_no)); + +return 0 ; }static u32 mipi_tx_init_dphy (struct mipi_ctrl_cfg *cfg)
@@ -1133,9 +1175,22 @@ static u32 mipi_tx_init_dphy(struct mipi_ctrl_cfg *cfg)*/ /*PHY #N+1 ('slave') */ dphy_init_sequence (cfg, dphy_no +1 ,MIPI_DPHY_SLAVE ); -/*TODO PHY #N master */ + +dphy_wait_fsm (dphy_no +1 ,DPHY_TX_LOCK ); + +/*PHY #N master*/ +dphy_init_sequence (cfg, dphy_no,MIPI_DPHY_MASTER ); +/* wait for DPHY init to complete */ +wait_init_done (dphy_no,MIPI_DPHY_D_LANES ); +wait_init_done (dphy_no +1 , + cfg->active_lanes -MIPI_DPHY_D_LANES ); +wait_pll_lock (dphy_no); +wait_pll_lock (dphy_no +1 ); + }else {/* Single DPHY */ +dphy_init_sequence (cfg, dphy_no,MIPI_DPHY_MASTER ); +wait_init_done (dphy_no, cfg->active_lanes); +wait_pll_lock (dphy_no); } -/*TODO- Single DPHY */ return 0 ; }
drivers/gpu/drm/kmb/kmb_dsi.h +18 -0
@@ -204,12 +204,30 @@ enum dphy_mode {MIPI_DPHY_MASTER }; +enum dphy_tx_fsm { +DPHY_TX_POWERDWN =0 , +DPHY_TX_BGPON , +DPHY_TX_TERMCAL , +DPHY_TX_TERMCALUP , +DPHY_TX_OFFSETCAL , +DPHY_TX_LOCK , +DPHY_TX_SRCAL , +DPHY_TX_IDLE , +DPHY_TX_ULP , +DPHY_TX_LANESTART , +DPHY_TX_CLKALIGN , +DPHY_TX_DDLTUNNING , +DPHY_TX_ULP_FORCE_PLL , +DPHY_TX_LOCK_LOSS +}; +struct mipi_data_type_params {uint8_t size_constraint_pixels;uint8_t size_constraint_bytes;uint8_t pixels_per_pclk;uint8_t bits_per_pclk; }; +struct mipi_tx_dsi_cfg {uint8_t hfp_blank_en;/*horizontal front porch blanking enable */ uint8_t eotp_en;/*End of transmission packet enable */
drivers/gpu/drm/kmb/kmb_regs.h +13 -2
@@ -524,9 +524,11 @@/* D-PHY regs */ #define DPHY_ENABLE (0x100)#define DPHY_INIT_CTRL0 (0x104) -#define DPHY_INIT_CTRL1 (0x108)#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 (dphy, offset) \ kmb_set_bit_mipi(DPHY_INIT_CTRL0, \
@@ -540,6 +542,12 @@kmb_write_bits_mipi (DPHY_FREQ_CTRL0_3 \ + ((dphy/4 )*4 ), (dphy %4 ) *8 , \ 6, val) + +#define MIPI_DPHY_STAT0_3 (0x134) +#define GET_STOPSTATE_DATA (dphy) \ + (((kmb_read_mipi(MIPI_DPHY_STAT0_3 + \ + (dphy/4)*4)) \ + >> (((dphy % 4)*8)+4)) & 0x03)#define DPHY_TEST_CTRL0 (0x154)#define SET_DPHY_TEST_CTRL0 (dphy) kmb_set_bit_mipi(DPHY_TEST_CTRL0, \ (dphy))
@@ -558,8 +566,11 @@#define SET_TEST_DIN0_3 (dphy, val) kmb_write_mipi(DPHY_TEST_DIN0_3 + \ 4, ((val) << (((dphy)%4)*8)))#define DPHY_TEST_DOUT0_3 (0x168) -#define GET_TEST_DOUT0_3 (dphy) (readl(DPHY_TEST_DOUT0_3 + 4) \ +#define GET_TEST_DOUT0_3 (dphy) (kmb_read_mipi(DPHY_TEST_DOUT0_3 + 4) \ >> (((dphy)%4)*8) & 0xff) +#define DPHY_PLL_LOCK (0x188) +#define GET_PLL_LOCK (dphy) (kmb_read_mipi(DPHY_PLL_LOCK) \ + & (1 << (dphy - MIPI_DPHY6)))#define DPHY_CFG_CLK_EN (0x18c)#define MIPI_TX_MSS_LCD_MIPI_CFG (0x04)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 18/59 drm/kmb: Part8 of Mipi Tx Initialization
In reply to Anitha ChrisanthusThis initializes the interrupts for DSI. This is the final part of mipi DSI initialization.
--- drivers/gpu/drm/kmb/kmb_drv.c | 1 + drivers/gpu/drm/kmb/kmb_drv.h | 30 +++++++++++----- drivers/gpu/drm/kmb/kmb_dsi.c | 46 ++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 13 +++++++ drivers/gpu/drm/kmb/kmb_regs.h | 81 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 163 insertions(+), 8 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +1 -0
@@ -77,6 +77,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)if (ret && ret != -ENODEV )return ret; +spin_lock_init (&lcd->irq_lock); ret =kmb_setup_crtc (drm);if (ret <0 ) {DRM_ERROR ("failed to create crtc\n" );
drivers/gpu/drm/kmb/kmb_drv.h +22 -8
@@ -32,14 +32,15 @@#define KMB_MAX_HEIGHT 16384/*max height in pixels */ struct kmb_drm_private { -struct drm_device drm; -void __iomem *mmio; -unsigned char n_layers; -struct clk *clk; -struct drm_fbdev_cma *fbdev; -struct drm_crtc crtc; -struct kmb_plane *plane; -struct drm_atomic_state *state; +struct drm_device drm; +void __iomem *mmio; +unsigned char n_layers; +struct clk *clk; +struct drm_fbdev_cma *fbdev; +struct drm_crtc crtc; +struct kmb_plane *plane; +struct drm_atomic_state *state; +spinlock_t irq_lock; };static inline struct kmb_drm_private *to_kmb (const struct drm_device *dev)
@@ -131,6 +132,19 @@ static inline void kmb_clr_bit_mipi(unsigned int reg, u32 offset) kmb_write_mipi(reg, reg_val & (~(1 << offset))); } +static inline void kmb_set_bitmask_mipi (unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_mipi (reg); + +kmb_write_mipi (reg, (reg_val | mask)); +} + +static inline void kmb_clr_bitmask_mipi (unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_mipi (reg); + +kmb_write_mipi (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_dsi.c +46 -0
68 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +13 -0
@@ -315,6 +315,19 @@ struct mipi_ctrl_cfg {uint32_t data_if;/*MIPI_IF_DMA or MIPI_IF_PARALLEL */ struct mipi_tx_ctrl_cfg tx_ctrl_cfg; }; + +/*structure for storing user specified interrupts that are enabled */ +union mipi_irq_cfg { +uint8_t value; +struct { +uint8_t line_compare :1 ; +uint8_t dma_event :1 ; +uint8_t frame_done :1 ; +uint8_t ctrl_error :1 ; +uint8_t dphy_error :1 ; + } irq_cfg; +}; +void kmb_dsi_init (struct drm_device *dev);void kmb_plane_destroy (struct drm_plane *plane);
drivers/gpu/drm/kmb/kmb_regs.h +81 -0
87 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
Anitha Chrisanthus
maintainerPATCH 19/59 drm/kmb: Added ioremap/iounmap for register access
In reply to Anitha ChrisanthusRegister physical addresses are remapped and the register mmio addresses for lcd,mipi and msscam are saved in drm_private. All register reads/writes are updated to get the mmio offset from this structure. We are using hardcoded values for register physical addresses and this will be modified to read from device tree in the future.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 56 +++--- drivers/gpu/drm/kmb/kmb_drv.c | 103 ++++++++--- drivers/gpu/drm/kmb/kmb_drv.h | 64 ++++--- drivers/gpu/drm/kmb/kmb_dsi.c | 401 +++++++++++++++++++++------------------- drivers/gpu/drm/kmb/kmb_plane.c | 35 ++-- drivers/gpu/drm/kmb/kmb_regs.h | 106 ++++++----- 6 files changed, 437 insertions(+), 328 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +35 -21
@@ -52,21 +52,26 @@ static void kmb_crtc_cleanup(struct drm_crtc *crtc)static int kmb_crtc_enable_vblank (struct drm_crtc *crtc) { +struct drm_device *dev = crtc->dev; +/*clear interrupt */ -kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/*set which interval to generate vertical interrupt */ -kmb_write_lcd (LCD_VSTATUS_COMPARE ,LCD_VSTATUS_COMPARE_VSYNC ); +kmb_write_lcd (dev->dev_private,LCD_VSTATUS_COMPARE , +LCD_VSTATUS_COMPARE_VSYNC );/* enable vertical interrupt */ -kmb_write_lcd (LCD_INT_ENABLE ,LCD_INT_VERT_COMP ); +kmb_write_lcd (dev->dev_private,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; +/*clear interrupt */ -kmb_write_lcd (LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/* disable vertical interrupt */ -kmb_write_lcd (LCD_INT_ENABLE ,0 ); +kmb_write_lcd (dev->dev_private,LCD_INT_ENABLE ,0 );/* TBD * set the BIT2 (VERTICAL_COMPARE_INTERRUPT) of the LCD_INT_ENABLE register
@@ -89,6 +94,7 @@ static const struct drm_crtc_funcs kmb_crtc_funcs = {static void kmb_crtc_mode_set_nofb (struct drm_crtc *crtc) {struct drm_display_mode *m = &crtc->state->adjusted_mode; +struct drm_device *dev = crtc->dev;struct videomode vm;int vsync_start_offset;int vsync_end_offset;
@@ -104,30 +110,38 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; -kmb_write_lcd (LCD_V_ACTIVEHEIGHT , m->crtc_vdisplay -1 ); -kmb_write_lcd (LCD_V_BACKPORCH , vm.vback_porch -1 ); -kmb_write_lcd (LCD_V_FRONTPORCH , vm.vfront_porch -1 ); -kmb_write_lcd (LCD_VSYNC_WIDTH , vm.vsync_len -1 ); -kmb_write_lcd (LCD_H_ACTIVEWIDTH , m->crtc_hdisplay -1 ); -kmb_write_lcd (LCD_H_BACKPORCH , vm.hback_porch -1 ); -kmb_write_lcd (LCD_H_FRONTPORCH , vm.hfront_porch -1 ); -kmb_write_lcd (LCD_HSYNC_WIDTH , vm.hsync_len -1 ); +kmb_write_lcd (dev->dev_private,LCD_V_ACTIVEHEIGHT , + m->crtc_vdisplay -1 ); +kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH , vm.vback_porch -1 ); +kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH , vm.vfront_porch -1 ); +kmb_write_lcd (dev->dev_private,LCD_VSYNC_WIDTH , vm.vsync_len -1 ); +kmb_write_lcd (dev->dev_private,LCD_H_ACTIVEWIDTH , + m->crtc_hdisplay -1 ); +kmb_write_lcd (dev->dev_private,LCD_H_BACKPORCH , vm.hback_porch -1 ); +kmb_write_lcd (dev->dev_private,LCD_H_FRONTPORCH , vm.hfront_porch -1 ); +kmb_write_lcd (dev->dev_private,LCD_HSYNC_WIDTH , vm.hsync_len -1 );if (m->flags ==DRM_MODE_FLAG_INTERLACE ) { -kmb_write_lcd (LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); -kmb_write_lcd (LCD_V_BACKPORCH_EVEN , vm.vback_porch -1 ); -kmb_write_lcd (LCD_V_FRONTPORCH_EVEN , vm.vfront_porch -1 ); -kmb_write_lcd (LCD_V_ACTIVEHEIGHT_EVEN , m->crtc_vdisplay -1 ); -kmb_write_lcd (LCD_VSYNC_START_EVEN , vsync_start_offset); -kmb_write_lcd (LCD_VSYNC_END_EVEN , vsync_end_offset); +kmb_write_lcd (dev->dev_private, +LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); +kmb_write_lcd (dev->dev_private, +LCD_V_BACKPORCH_EVEN , vm.vback_porch -1 ); +kmb_write_lcd (dev->dev_private, +LCD_V_FRONTPORCH_EVEN , vm.vfront_porch -1 ); +kmb_write_lcd (dev->dev_private, +LCD_V_ACTIVEHEIGHT_EVEN , m->crtc_vdisplay -1 ); +kmb_write_lcd (dev->dev_private,LCD_VSYNC_START_EVEN , + vsync_start_offset); +kmb_write_lcd (dev->dev_private,LCD_VSYNC_END_EVEN , + vsync_end_offset); }/* enable VL1 layer as default */ ctrl =LCD_CTRL_ENABLE |LCD_CTRL_VL1_ENABLE ; ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE |LCD_CTRL_OUTPUT_ENABLED ; -kmb_write_lcd (LCD_CONTROL , ctrl); +kmb_write_lcd (dev->dev_private,LCD_CONTROL , ctrl); -kmb_write_lcd (LCD_TIMING_GEN_TRIG ,ENABLE ); +kmb_write_lcd (dev->dev_private,LCD_TIMING_GEN_TRIG ,ENABLE );/* TBD */ /* set clocks here */
drivers/gpu/drm/kmb/kmb_drv.c +77 -26
170 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.h +39 -25
111 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.c +212 -189
787 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c +18 -17
@@ -221,7 +221,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, struct drm_plane_state *state) {struct drm_framebuffer *fb = plane->state->fb; -struct kmb_drm_private *lcd; +struct kmb_drm_private *dev_p;dma_addr_t addr;unsigned int width;unsigned int height;
@@ -235,23 +235,23 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,if (!fb)return ; - lcd = plane->dev->dev_private; + dev_p = plane->dev->dev_private; 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; -kmb_write_lcd (LCD_LAYERn_WIDTH (plane_id), src_w-1 ); -kmb_write_lcd (LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); -kmb_write_lcd (LCD_LAYERn_COL_START (plane_id), crtc_x); -kmb_write_lcd (LCD_LAYERn_ROW_START (plane_id), crtc_y); +kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w-1 ); +kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); +kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x); +kmb_write_lcd (dev_p,LCD_LAYERn_ROW_START (plane_id), crtc_y); val =set_pixel_format (fb->format->format); val |=set_bits_per_pixel (fb->format);/*CHECKME Leon drvr sets it to 50 try this for now */ val |=LCD_LAYER_FIFO_50 ; -kmb_write_lcd (LCD_LAYERn_CFG (plane_id), val); +kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val);switch (plane_id) {case LAYER_0 :
@@ -271,7 +271,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, ctrl |=LCD_CTRL_ENABLE ; ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE |LCD_CTRL_OUTPUT_ENABLED ; -kmb_write_lcd (LCD_CONTROL , ctrl); +kmb_write_lcd (dev_p,LCD_CONTROL , ctrl);/*TBD check visible? */
@@ -280,24 +280,25 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, | LCD_DMA_LAYER_CONT_UPDATE | LCD_DMA_LAYER_AXI_BURST_1;/* disable DMA first */ -kmb_write_lcd (LCD_LAYERn_DMA_CFG (plane_id), ~LCD_DMA_LAYER_ENABLE ); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), + ~LCD_DMA_LAYER_ENABLE ); addr =drm_fb_cma_get_gem_addr (fb, plane->state, plane_id); -kmb_write_lcd (LCD_LAYERn_DMA_START_ADDR (plane_id), addr); -kmb_write_lcd (LCD_LAYERn_DMA_START_SHADOW (plane_id), addr); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), addr); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_SHADOW (plane_id), addr); width = fb->width; height = fb->height; dma_len = width * height * fb->format->cpp[plane_id]; -kmb_write_lcd (LCD_LAYERn_DMA_LEN (plane_id), dma_len); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len); -kmb_write_lcd (LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), - fb->pitches[plane_id]); -kmb_write_lcd (LCD_LAYERn_DMA_LINE_WIDTH (plane_id), +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), + fb->pitches[plane_id]); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), (width*fb->format->cpp[plane_id]));/* enable DMA */ -kmb_write_lcd (LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg);/* FIXME no doc on how to set output format - may need to change * this later
@@ -310,7 +311,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, out_format |=LCD_OUTF_MIPI_RGB_MODE ;/* pixel format from LCD_LAYER_CFG */ out_format |= ((val >>9 ) &0x1F ); -kmb_write_lcd (LCD_OUT_FORMAT_CFG , out_format); +kmb_write_lcd (dev_p,LCD_OUT_FORMAT_CFG , out_format); }static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {
drivers/gpu/drm/kmb/kmb_regs.h +56 -50
158 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 20/59 drm/kmb: Register IRQ for LCD
In reply to Anitha ChrisanthusThis code is commented out until firmware is updated to redirect LCD IRQ from MSSCPU to A53.
--- drivers/gpu/drm/kmb/kmb_drv.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +14 -3
@@ -48,12 +48,16 @@#include "kmb_plane.h" #include "kmb_dsi.h" +/*IRQ handler*/ +static irqreturn_t kmb_isr (int irq,void *arg); +static int kmb_load (struct drm_device *drm,unsigned long flags) {struct kmb_drm_private *dev_p = drm->dev_private;struct platform_device *pdev =to_platform_device (drm->dev);/*struct resource *res;*/ /*u32 version;*/ +/*int irq_lcd, irq_mipi; */ int ret;/* TBD - not sure if clock_get needs to be called here */
@@ -104,6 +108,12 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) dev_p->msscam_mmio =ioremap_cache (MSS_CAM_BASE_ADDR ,MSS_CAM_MMIO_SIZE ); +/*TODO - register irqs here - section 17.3 in databook +* lists LCD at 79 under MSS CPU - firmware has to redirect it to A53 +* May be 33 for LCD and 34 for MIPI? Will wait till firmware +* finalizes the IRQ numbers for redirection +*/ +/*TBD read and check for correct product version here */ /* Get the optional framebuffer memory resource */
@@ -151,7 +161,7 @@ static void kmb_setup_mode_config(struct drm_device *drm) drm->mode_config.funcs = &kmb_mode_config_funcs; } -static irqreturn_t kmb_irq (int irq,void *arg) +static irqreturn_t kmb_isr (int irq,void *arg) {struct drm_device *dev = (struct drm_device *)arg;unsigned long status, val;
@@ -196,8 +206,9 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver kmb_driver = { .driver_features =DRIVER_HAVE_IRQ |DRIVER_GEM | -DRIVER_MODESET |DRIVER_ATOMIC , - .irq_handler = kmb_irq, +DRIVER_MODESET | +DRIVER_ATOMIC , + .irq_handler = kmb_isr, .irq_preinstall = kmb_irq_reset, .irq_uninstall = kmb_irq_reset, .gem_free_object_unlocked = drm_gem_cma_free_object,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 21/59 drm/kmb: IRQ handlers for LCD and mipi dsi
In reply to Anitha ChrisanthusAdded handlers for lcd and mipi, it only finds and clears the interrupt as of now, more functionality can be added as needed.
--- drivers/gpu/drm/kmb/kmb_drv.c | 51 ++++++++++++++++++++++++++++++++++++------ drivers/gpu/drm/kmb/kmb_drv.h | 2 ++ drivers/gpu/drm/kmb/kmb_dsi.c | 37 ++++++++++++++++++++++++++++-- drivers/gpu/drm/kmb/kmb_dsi.h | 1 + drivers/gpu/drm/kmb/kmb_regs.h | 35 +++++++++++++++++++++-------- 5 files changed, 108 insertions(+), 18 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +44 -7
@@ -57,7 +57,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)struct platform_device *pdev =to_platform_device (drm->dev);/*struct resource *res;*/ /*u32 version;*/ -/*int irq_lcd, irq_mipi; */ +int irq_lcd, irq_mipi;int ret;/* TBD - not sure if clock_get needs to be called here */
@@ -108,11 +108,29 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) dev_p->msscam_mmio =ioremap_cache (MSS_CAM_BASE_ADDR ,MSS_CAM_MMIO_SIZE ); -/*TODO - register irqs here - section 17.3 in databook -* lists LCD at 79 under MSS CPU - firmware has to redirect it to A53 -* May be 33 for LCD and 34 for MIPI? Will wait till firmware -* finalizes the IRQ numbers for redirection +/* register irqs here - section 17.3 in databook +* lists LCD at 79 and 82 for MIPI under MSS CPU - +* firmware has to redirect it to A53 */ + irq_lcd =platform_get_irq_byname (pdev,"irq_lcd" ); +if (irq_lcd <0 ) { +DRM_ERROR ("irq_lcd not found" ); +return irq_lcd; + } +pr_info ("irq_lcd platform_get_irq = %d\n" , irq_lcd); + ret =request_irq (irq_lcd, kmb_isr,IRQF_SHARED ,"irq_lcd" , dev_p); + dev_p->irq_lcd = irq_lcd; + + irq_mipi =platform_get_irq_byname (pdev,"irq_mipi" ); +if (irq_mipi <0 ) { +DRM_ERROR ("irq_mipi not found" ); +return irq_mipi; + } +pr_info ("irq_mipi platform_get_irq = %d\n" , irq_mipi); + ret =request_irq (irq_mipi, kmb_isr,IRQF_SHARED ,"irq_mipi" , dev_p); + dev_p->irq_mipi = irq_mipi; + +/*TBD read and check for correct product version here */
@@ -161,9 +179,9 @@ static void kmb_setup_mode_config(struct drm_device *drm) drm->mode_config.funcs = &kmb_mode_config_funcs; } -static irqreturn_t kmb_isr (int irq,void *arg) + +static irqreturn_t handle_lcd_irq (struct drm_device *dev) { -struct drm_device *dev = (struct drm_device *)arg;unsigned long status, val; status =kmb_read_lcd (dev->dev_private,LCD_INT_STATUS );
@@ -192,10 +210,29 @@ static irqreturn_t kmb_isr(int irq, void *arg)break ; } } +return IRQ_HANDLED ; +} +static irqreturn_t handle_mipi_irq (struct drm_device *dev) +{ +mipi_tx_handle_irqs (dev->dev_private);return IRQ_HANDLED ; } +static irqreturn_t kmb_isr (int irq,void *arg) +{ +struct drm_device *dev = (struct drm_device *)arg; +struct kmb_drm_private *dev_p = dev->dev_private; +irqreturn_t ret =IRQ_NONE ; + +if (irq == dev_p->irq_lcd) + ret =handle_lcd_irq (dev); +else if (irq == dev_p->irq_mipi) + ret =handle_mipi_irq (dev); + +return ret; +} +static void kmb_irq_reset (struct drm_device *drm) {kmb_write_lcd (drm->dev_private,LCD_INT_CLEAR ,0xFFFF );
drivers/gpu/drm/kmb/kmb_drv.h +2 -0
@@ -43,6 +43,8 @@ struct kmb_drm_private {struct kmb_plane *plane;struct drm_atomic_state *state;spinlock_t irq_lock; +int irq_lcd; +int irq_mipi; };static inline struct kmb_drm_private *to_kmb (const struct drm_device *dev)
drivers/gpu/drm/kmb/kmb_dsi.c +35 -2
@@ -1234,7 +1234,7 @@ static void mipi_tx_init_irqs(struct kmb_drm_private *dev_p,SET_MIPI_TX_HS_IRQ_CLEAR (dev_p,MIPI_CTRL6 ,MIPI_TX_HS_IRQ_ALL );/*global interrupts */ SET_MIPI_CTRL_IRQ_CLEAR0 (dev_p,MIPI_CTRL6 ,MIPI_HS_IRQ ); -SET_MIPI_CTRL_IRQ_CLEAR0 (dev_p,MIPI_CTRL6 ,MIPI_DHY_ERR_IRQ ); +SET_MIPI_CTRL_IRQ_CLEAR0 (dev_p,MIPI_CTRL6 ,MIPI_DPHY_ERR_IRQ );SET_MIPI_CTRL_IRQ_CLEAR1 (dev_p,MIPI_CTRL6 ,MIPI_HS_RX_EVENT_IRQ );/*enable interrupts */
@@ -1250,7 +1250,7 @@ static void mipi_tx_init_irqs(struct kmb_drm_private *dev_p,/*enable user enabled interrupts */ if (cfg->irq_cfg.dphy_error) -SET_MIPI_CTRL_IRQ_ENABLE0 (dev_p,MIPI_CTRL6 ,MIPI_DHY_ERR_IRQ ); +SET_MIPI_CTRL_IRQ_ENABLE0 (dev_p,MIPI_CTRL6 ,MIPI_DPHY_ERR_IRQ );if (cfg->irq_cfg.line_compare)SET_HS_IRQ_ENABLE (dev_p,MIPI_CTRL6 ,MIPI_TX_HS_IRQ_LINE_COMPARE );
@@ -1260,6 +1260,39 @@ static void mipi_tx_init_irqs(struct kmb_drm_private *dev_p,spin_unlock_irqrestore (&dev_p->irq_lock, irqflags); } + +void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p) +{ +uint32_t irq_ctrl_stat_0, hs_stat, hs_enable; +uint32_t irq_ctrl_enabled_0; + + irq_ctrl_stat_0 =MIPI_GET_IRQ_STAT0 (dev_p); + irq_ctrl_enabled_0 =MIPI_GET_IRQ_ENABLED0 (dev_p); +/*only service enabled interrupts */ + irq_ctrl_stat_0 &= irq_ctrl_enabled_0; + +if (irq_ctrl_stat_0 &MIPI_DPHY_ERR_MASK ) { +if (irq_ctrl_stat_0 & ((1 << (MIPI_DPHY6 +1 )))) +SET_MIPI_CTRL_IRQ_CLEAR0 (dev_p,MIPI_CTRL6 , +MIPI_DPHY_ERR_IRQ ); + }else if (irq_ctrl_stat_0 &MIPI_HS_IRQ_MASK ) { + hs_stat =GET_MIPI_TX_HS_IRQ_STATUS (dev_p,MIPI_CTRL6 ); + hs_enable =GET_HS_IRQ_ENABLE (dev_p,MIPI_CTRL6 ); + hs_stat &= hs_enable; +/*look for errors */ +if (hs_stat &MIPI_TX_HS_IRQ_ERROR ) { +CLR_HS_IRQ_ENABLE (dev_p,MIPI_CTRL6 , + (hs_stat &MIPI_TX_HS_IRQ_ERROR ) | +MIPI_TX_HS_IRQ_DMA_DONE | +MIPI_TX_HS_IRQ_DMA_IDLE ); + } +/* clear local, then global */ +SET_MIPI_TX_HS_IRQ_CLEAR (dev_p,MIPI_CTRL6 , hs_stat); +SET_MIPI_CTRL_IRQ_CLEAR0 (dev_p,MIPI_CTRL6 ,MIPI_HS_IRQ ); + } + +} +void kmb_dsi_init (struct drm_device *dev) {struct kmb_dsi *kmb_dsi;
drivers/gpu/drm/kmb/kmb_dsi.h +1 -0
@@ -330,6 +330,7 @@ union mipi_irq_cfg {void kmb_dsi_init (struct drm_device *dev);void kmb_plane_destroy (struct drm_plane *plane); +void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);#define to_kmb_connector (x) container_of(x, struct kmb_connector, base)#define to_kmb_host (x) container_of(x, struct kmb_dsi_host, base)
drivers/gpu/drm/kmb/kmb_regs.h +26 -9
@@ -527,15 +527,25 @@/* MIPI IRQ */ #define MIPI_CTRL_IRQ_STATUS0 (0x00) -#define MIPI_DHY_ERR_IRQ 1 +#define MIPI_DPHY_ERR_IRQ 1 +#define MIPI_DPHY_ERR_MASK 0x7FE/*bits 1-10 */ #define MIPI_HS_IRQ 13 +#define MIPI_HS_IRQ_MASK 0x7FE000/*bits 13-22 */ #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 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)
@@ -543,8 +553,10 @@#define SET_MIPI_CTRL_IRQ_CLEAR1 (dev,M ,N ) \ kmb_set_bit_mipi(dev, MIPI_CTRL_IRQ_CLEAR1, M+N)#define MIPI_TX_HS_IRQ_STATUS (0x01c) -#define MIPI_TX_HS_IRQ_STATUSm (M ) \ - (MIPI_TX_HS_IRQ_STATUS + HS_OFFSET(M)) +#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 (1<<1)#define MIPI_TX_HS_IRQ_FRAME_DONE_0 (1<<2)#define MIPI_TX_HS_IRQ_FRAME_DONE_1 (1<<3)
@@ -598,10 +610,15 @@ 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 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, \
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 22/59 drm/kmb: Set hardcoded values to LCD_VSYNC_START
In reply to Anitha ChrisanthusMyriadx code has it set to these values.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +8 -6
@@ -120,6 +120,9 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_H_BACKPORCH , vm.hback_porch -1 );kmb_write_lcd (dev->dev_private,LCD_H_FRONTPORCH , vm.hfront_porch -1 );kmb_write_lcd (dev->dev_private,LCD_HSYNC_WIDTH , vm.hsync_len -1 ); +/*this is hardcoded as 0 in the Myriadx code */ +kmb_write_lcd (dev->dev_private,LCD_VSYNC_START ,0 ); +kmb_write_lcd (dev->dev_private,LCD_VSYNC_END ,0 );if (m->flags ==DRM_MODE_FLAG_INTERLACE ) { kmb_write_lcd(dev->dev_private,
@@ -128,12 +131,11 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) LCD_V_BACKPORCH_EVEN, vm.vback_porch - 1);kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH_EVEN , vm.vfront_porch -1 ); -kmb_write_lcd (dev->dev_private, -LCD_V_ACTIVEHEIGHT_EVEN , m->crtc_vdisplay -1 ); -kmb_write_lcd (dev->dev_private,LCD_VSYNC_START_EVEN , - vsync_start_offset); -kmb_write_lcd (dev->dev_private,LCD_VSYNC_END_EVEN , - vsync_end_offset); +kmb_write_lcd (dev->dev_private,LCD_V_ACTIVEHEIGHT_EVEN , + m->crtc_vdisplay -1 ); +/*this is hardcoded as 10 in the Myriadx code*/ +kmb_write_lcd (dev->dev_private,LCD_VSYNC_START_EVEN ,10 ); +kmb_write_lcd (dev->dev_private,LCD_VSYNC_END_EVEN ,10 ); }/* enable VL1 layer as default */ ctrl =LCD_CTRL_ENABLE |LCD_CTRL_VL1_ENABLE ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 23/59 drm/kmb: Additional register programming to update_plane
In reply to Anitha ChrisanthusThese changes are ported from Myriadx which has additional registers updated for planes. This change does the following reinitialize plane interrupts
program Cb/Cr for planar formats
set LCD_CTRL_VHSYNC_IDLE_LVL
set output format and configure csc
v2: code review changes
--- drivers/gpu/drm/kmb/kmb_drv.h | 16 ++++ drivers/gpu/drm/kmb/kmb_plane.c | 183 ++++++++++++++++++++++++++++++++-------- drivers/gpu/drm/kmb/kmb_regs.h | 72 ++++++++++------ 3 files changed, 210 insertions(+), 61 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.h +16 -0
@@ -112,6 +112,22 @@ 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->lcd_mmio, reg); + +kmb_write_lcd (dev_p->lcd_mmio, 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->lcd_mmio, reg); + +kmb_write_lcd (dev_p->lcd_mmio, 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);
drivers/gpu/drm/kmb/kmb_plane.c +148 -35
234 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_regs.h +46 -26
115 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 24/59 drm/kmb: Add ADV7535 bridge
In reply to Anitha ChrisanthusFind ADV 7535 from the device tree and get the bridge driver and attach it to the DRM and the MIPI encoder.
v2: check for valid encoder node
--- drivers/gpu/drm/kmb/kmb_drv.c | 27 ++++++++++++++++++++++++++- drivers/gpu/drm/kmb/kmb_dsi.c | 26 +++++++++++++++++++++----- drivers/gpu/drm/kmb/kmb_dsi.h | 3 ++- 3 files changed, 49 insertions(+), 7 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +26 -1
@@ -55,10 +55,12 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) {struct kmb_drm_private *dev_p = drm->dev_private;struct platform_device *pdev =to_platform_device (drm->dev); +struct drm_bridge *bridge;/*struct resource *res;*/ /*u32 version;*/ int irq_lcd, irq_mipi;int ret; +struct device_node *encoder_node;/* TBD - not sure if clock_get needs to be called here */ /*
@@ -146,7 +148,30 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; } -kmb_dsi_init (drm); +/* find ADV7535 node and initialize it */ + encoder_node =of_parse_phandle (drm->dev->of_node,"encoder-slave" ,0 ); +if (!encoder_node) { +DRM_ERROR ("failed to get bridge info from DT\n" ); + ret = -EPROBE_DEFER ; + goto setup_fail; + } + +/* Locate drm bridge from the hdmi encoder DT node */ + bridge =of_drm_find_bridge (encoder_node); +if (!bridge) { +DRM_ERROR ("failed to get bridge driver from DT\n" ); + ret = -EPROBE_DEFER ; + goto setup_fail; + } + +of_node_put (encoder_node); + + ret =kmb_dsi_init (drm, bridge); +if (ret) { +DRM_ERROR ("failed to initialize DSI\n" ); + goto setup_fail; + } + ret =drm_irq_install (drm,platform_get_irq (pdev,0 ));if (ret <0 ) {DRM_ERROR ("failed to install IRQ handler\n" );
drivers/gpu/drm/kmb/kmb_dsi.c +21 -5
@@ -31,6 +31,7 @@#include <drm/drm_edid.h> #include <drm/drm_mipi_dsi.h> #include <drm/drm_print.h> +#include <drm/drm_bridge.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/gpio/consumer.h>
@@ -1260,7 +1261,6 @@ static void mipi_tx_init_irqs(struct kmb_drm_private *dev_p,spin_unlock_irqrestore (&dev_p->irq_lock, irqflags); } -void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p) {uint32_t irq_ctrl_stat_0, hs_stat, hs_enable;
@@ -1293,7 +1293,7 @@ void mipi_tx_handle_irqs(struct kmb_drm_private *dev_p) } -void kmb_dsi_init (struct drm_device *dev) +int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge) {struct kmb_dsi *kmb_dsi;struct drm_encoder *encoder;
@@ -1301,21 +1301,27 @@ void kmb_dsi_init(struct drm_device *dev)struct drm_connector *connector;struct kmb_dsi_host *host;struct kmb_drm_private *dev_p = dev->dev_private; +int ret =0 ; kmb_dsi =kzalloc (sizeof (*kmb_dsi),GFP_KERNEL ); -if (!kmb_dsi) -return ; +if (!kmb_dsi) { +DRM_ERROR ("failed to allocate kmb_dsi\n" ); +return -ENOMEM ; + } kmb_connector =kzalloc (sizeof (*kmb_connector),GFP_KERNEL );if (!kmb_connector) {kfree (kmb_dsi); -return ; +DRM_ERROR ("failed to allocate kmb_connector\n" ); +return -ENOMEM ; } kmb_dsi->attached_connector = kmb_connector; connector = &kmb_connector->base; encoder = &kmb_dsi->base; + encoder->possible_crtcs =1 ; + encoder->possible_clones =0 ;drm_encoder_init (dev, encoder, &kmb_dsi_funcs,DRM_MODE_ENCODER_DSI ,"MIPI-DSI" );
@@ -1333,6 +1339,14 @@ void kmb_dsi_init(struct drm_device *dev) connector->encoder = encoder;drm_connector_attach_encoder (connector, encoder); +/* Link drm_bridge to encoder */ + ret =drm_bridge_attach (encoder, bridge,NULL ,0 ); +if (ret) { +DRM_ERROR ("failed to attach bridge to MIPI\n" ); +drm_encoder_cleanup (encoder); +return ret; + } +/* initialize mipi controller */ mipi_tx_init_cntrl (dev_p, &mipi_tx_init_cfg);
@@ -1341,4 +1355,6 @@ void kmb_dsi_init(struct drm_device *dev)/* irq initialization */ mipi_tx_init_irqs (dev_p, &int_cfg, &mipi_tx_init_cfg.tx_ctrl_cfg); + +return 0 ; }
drivers/gpu/drm/kmb/kmb_dsi.h +2 -1
@@ -38,6 +38,7 @@ struct kmb_dsi {struct drm_encoder base;struct kmb_connector *attached_connector;struct kmb_dsi_host *dsi_host; +struct drm_bridge *bridge; };struct kmb_dsi_host {
@@ -328,7 +329,7 @@ union mipi_irq_cfg { } irq_cfg; }; -void kmb_dsi_init (struct drm_device *dev); +int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 25/59 drm/kmb: Display clock enable/disable
In reply to Anitha ChrisanthusGet clock info from DT and enable it during initialization. Also changed name of the driver to "kmb,display" to match other entries in the DT.
v2: fixed error in clk_disable
--- drivers/gpu/drm/kmb/kmb_drv.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +40 -2
@@ -32,6 +32,7 @@#include <linux/of_graph.h> #include <linux/of_reserved_mem.h> #include <linux/pm_runtime.h> +#include <linux/clk.h> #include <drm/drm.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h>
@@ -51,6 +52,25 @@/*IRQ handler*/ static irqreturn_t kmb_isr (int irq,void *arg); +static struct clk *clk_lcd; +static struct clk *clk_mipi; + +static int kmb_display_clk_enable (void ) +{ +clk_prepare_enable (clk_lcd); +clk_prepare_enable (clk_mipi); +return 0 ; +} + +static int kmb_display_clk_disable (void ) +{ +if (clk_lcd) +clk_disable_unprepare (clk_lcd); +if (clk_mipi) +clk_disable_unprepare (clk_mipi); +return 0 ; +} +static int kmb_load (struct drm_device *drm,unsigned long flags) {struct kmb_drm_private *dev_p = drm->dev_private;
@@ -172,6 +192,19 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; } +/* enable display clocks*/ + clk_lcd =clk_get (&pdev->dev,"clk_lcd" ); +if (!clk_lcd) { +DRM_ERROR ("clk_get() failed clk_lcd\n" ); + goto setup_fail; + } + clk_mipi =clk_get (&pdev->dev,"clk_mipi" ); +if (!clk_mipi) { +DRM_ERROR ("clk_get() failed clk_mipi\n" ); + goto setup_fail; + } +kmb_display_clk_enable (); + ret =drm_irq_install (drm,platform_get_irq (pdev,0 ));if (ret <0 ) {DRM_ERROR ("failed to install IRQ handler\n" );
@@ -397,6 +430,11 @@ static void kmb_drm_unbind(struct device *dev)of_reserved_mem_device_release (drm->dev);drm_mode_config_cleanup (drm); +/*release clks */ +kmb_display_clk_disable (); +clk_put (clk_lcd); +clk_put (clk_mipi); +drm_dev_put (drm); drm->dev_private =NULL ;dev_set_drvdata (dev,NULL );
@@ -435,8 +473,8 @@ static int kmb_remove(struct platform_device *pdev)return 0 ; } -static const struct of_device_id kmb_of_match[] = { - {.compatible ="lcd" }, +static const struct of_device_id kmb_of_match[] = { + {.compatible ="kmb,display" }, {}, };
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 26/59 drm/kmb: rebase to newer kernel version
In reply to Anitha Chrisanthuscleanup code
--- drivers/gpu/drm/kmb/kmb_drv.c | 5 +++-- drivers/gpu/drm/kmb/kmb_drv.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +3 -2
@@ -301,8 +301,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops);static struct drm_driver kmb_driver = { .driver_features =DRIVER_HAVE_IRQ |DRIVER_GEM | -DRIVER_MODESET | -DRIVER_ATOMIC , +DRIVER_MODESET |DRIVER_ATOMIC , .irq_handler = kmb_isr, .irq_preinstall = kmb_irq_reset, .irq_uninstall = kmb_irq_reset,
@@ -378,6 +377,8 @@ static int kmb_drm_bind(struct device *dev)if (ret) goto err_register; +drm_fbdev_generic_setup (drm,32 ); +return 0 ; err_register:
drivers/gpu/drm/kmb/kmb_drv.h +0 -1
@@ -38,7 +38,6 @@ struct kmb_drm_private {void __iomem *msscam_mmio;unsigned char n_layers;struct clk *clk; -struct drm_fbdev_cma *fbdev;struct drm_crtc crtc;struct kmb_plane *plane;struct drm_atomic_state *state;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 27/59 drm/kmb: minor name change to match device tree
In reply to Anitha Chrisanthusname change
--- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/kmb/kmb_drv.c +1 -1
@@ -475,7 +475,7 @@ static int kmb_remove(struct platform_device *pdev) }static const struct of_device_id kmb_of_match[] = { - {.compatible ="kmb,display" }, + {.compatible ="intel,kmb_display" }, {}, };
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 28/59 drm/kmb: Changed MMIO size
In reply to Anitha ChrisanthusAlso added debug messages
--- drivers/gpu/drm/kmb/kmb_drv.c | 19 +++++++++++++++++-- drivers/gpu/drm/kmb/kmb_regs.h | 6 +++--- 2 files changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +17 -2
@@ -49,6 +49,7 @@#include "kmb_plane.h" #include "kmb_dsi.h" +#define DEBUG /*IRQ handler*/ static irqreturn_t kmb_isr (int irq,void *arg);
@@ -331,18 +332,22 @@ static int kmb_drm_bind(struct device *dev)struct kmb_drm_private *lcd;int ret; +DRM_DEBUG ("kmb_bind : ENTER\n" ); drm =drm_dev_alloc (&kmb_driver, dev);if (IS_ERR (drm))return PTR_ERR (drm); +DRM_DEBUG ("kmb_bind : after alloc drm\n" ); lcd =devm_kzalloc (dev,sizeof (*lcd),GFP_KERNEL );if (!lcd)return -ENOMEM ; +DRM_DEBUG ("kmb_bind : after alloc lcd\n" ); drm->dev_private = lcd;dev_set_drvdata (dev, drm);kmb_setup_mode_config (drm); +DRM_DEBUG ("kmb_bind : after kmb_setup_mode_config\n" ); ret =kmb_load (drm,0 );if (ret) goto err_free;
@@ -455,17 +460,27 @@ static int kmb_probe(struct platform_device *pdev) {struct device_node *port;struct component_match *match =NULL ; +int ret;/* there is only one output port inside each device, find it */ +DRM_DEBUG ("%s : ENTER" , __func__); + port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); +DRM_DEBUG ("%s : port = 0x%pOF\n" , __func__, port);if (!port)return -ENODEV ; +DRM_DEBUG ("%s : after get_remote" , __func__); +DRM_DEBUG ("Adding component %pOF\n" , port);drm_of_component_match_add (&pdev->dev, &match, compare_dev, port); +DRM_DEBUG ("%s : after get_match" , __func__);of_node_put (port); -return component_master_add_with_match (&pdev->dev, &kmb_master_ops, - match); + ret =component_master_add_with_match (&pdev->dev, &kmb_master_ops, + match); + +DRM_DEBUG ("%s : EXIT ret=%d\n" , __func__, ret); +return ret; }static int kmb_remove (struct platform_device *pdev)
drivers/gpu/drm/kmb/kmb_regs.h +3 -3
@@ -33,9 +33,9 @@/*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 (0x10000) -#define MIPI_MMIO_SIZE (0x10000) -#define MSS_CAM_MMIO_SIZE (0x10000) +#define LCD_MMIO_SIZE (0x3000) +#define MIPI_MMIO_SIZE (0x4000) +#define MSS_CAM_MMIO_SIZE (0x10)/*************************************************************************** * LCD controller control register defines
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 29/59 drm/kmb: Defer Probe
In reply to Anitha ChrisanthusRegister DSI host first and then defer probe until ADV bridge is initialized.
--- drivers/gpu/drm/kmb/kmb_drv.c | 144 ++++++++++++++---------------------------- drivers/gpu/drm/kmb/kmb_dsi.c | 46 ++++++++++++-- drivers/gpu/drm/kmb/kmb_dsi.h | 3 +- 3 files changed, 89 insertions(+), 104 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +46 -98
@@ -56,6 +56,8 @@ static irqreturn_t kmb_isr(int irq, void *arg);static struct clk *clk_lcd;static struct clk *clk_mipi; +static int probe_deferred; +static int kmb_display_clk_enable (void ) {clk_prepare_enable (clk_lcd);
@@ -76,12 +78,11 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) {struct kmb_drm_private *dev_p = drm->dev_private;struct platform_device *pdev =to_platform_device (drm->dev); -struct drm_bridge *bridge; +/* struct drm_bridge *bridge;*/ /*struct resource *res;*/ /*u32 version;*/ -int irq_lcd, irq_mipi;int ret; -struct device_node *encoder_node; +/* struct device_node *encoder_node;*/ /* TBD - not sure if clock_get needs to be called here */ /*
@@ -93,9 +94,10 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)* TBD call this in the future when device tree is ready, * use hardcoded value for now */ -/*res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -*dev_p->lcd_mmio = devm_ioremap_resource(drm->dev, res); -* +/* +* res = platform_get_resource(pdev, IORESOURCE_MEM, 0); +* dev_p->lcd_mmio = devm_ioremap_resource(drm->dev, res); +*if (IS_ERR(dev_p->lcd_mmio)) { * DRM_ERROR("failed to map control registers area\n"); * ret = PTR_ERR(dev_p->lcd_mmio);
@@ -103,7 +105,10 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)* return ret; *} */ -/* LCD mmio */ +/* LCD mmio */ +if (!probe_deferred) { + probe_deferred =1 ; +if (!request_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ,"kmb-lcd" )) {DRM_ERROR ("failed to reserve LCD registers\n" );return -ENOMEM ;
@@ -113,7 +118,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_ERROR ("failed to map LCD registers\n" );return -ENOMEM ; } -/* Mipi mmio */ if (!request_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ,"kmb-mipi" )) {DRM_ERROR ("failed to reserve MIPI registers\n" );
@@ -126,35 +130,16 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)iounmap (dev_p->lcd_mmio);return -ENOMEM ; } -/*this is only for MIPI_TX_MSS_LCD_MIPI_CFG register */ - dev_p->msscam_mmio =ioremap_cache (MSS_CAM_BASE_ADDR , +if (!dev_p->msscam_mmio) { + dev_p->msscam_mmio =ioremap_cache (MSS_CAM_BASE_ADDR ,MSS_CAM_MMIO_SIZE ); + }/* register irqs here - section 17.3 in databook * lists LCD at 79 and 82 for MIPI under MSS CPU - * firmware has to redirect it to A53 */ - irq_lcd =platform_get_irq_byname (pdev,"irq_lcd" ); -if (irq_lcd <0 ) { -DRM_ERROR ("irq_lcd not found" ); -return irq_lcd; - } -pr_info ("irq_lcd platform_get_irq = %d\n" , irq_lcd); - ret =request_irq (irq_lcd, kmb_isr,IRQF_SHARED ,"irq_lcd" , dev_p); - dev_p->irq_lcd = irq_lcd; - - irq_mipi =platform_get_irq_byname (pdev,"irq_mipi" ); -if (irq_mipi <0 ) { -DRM_ERROR ("irq_mipi not found" ); -return irq_mipi; - } -pr_info ("irq_mipi platform_get_irq = %d\n" , irq_mipi); - ret =request_irq (irq_mipi, kmb_isr,IRQF_SHARED ,"irq_mipi" , dev_p); - dev_p->irq_mipi = irq_mipi; - - -/*TBD read and check for correct product version here */ /* Get the optional framebuffer memory resource */
@@ -169,52 +154,35 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; } -/* find ADV7535 node and initialize it */ - encoder_node =of_parse_phandle (drm->dev->of_node,"encoder-slave" ,0 ); -if (!encoder_node) { -DRM_ERROR ("failed to get bridge info from DT\n" ); - ret = -EPROBE_DEFER ; - goto setup_fail; - } - -/* Locate drm bridge from the hdmi encoder DT node */ - bridge =of_drm_find_bridge (encoder_node); -if (!bridge) { -DRM_ERROR ("failed to get bridge driver from DT\n" ); - ret = -EPROBE_DEFER ; - goto setup_fail; - } - -of_node_put (encoder_node); - - ret =kmb_dsi_init (drm, bridge); -if (ret) { +/* ret = kmb_dsi_init(drm, bridge);*/ + ret =kmb_dsi_init (drm); +if (ret == -EPROBE_DEFER ) { +DRM_INFO ("%s: wait for external bridge driver DT" , __func__); +return -EPROBE_DEFER ; + }else if (ret) {DRM_ERROR ("failed to initialize DSI\n" ); goto setup_fail; } - +}/* enable display clocks*/ clk_lcd =clk_get (&pdev->dev,"clk_lcd" );if (!clk_lcd) {DRM_ERROR ("clk_get() failed clk_lcd\n" ); goto setup_fail; } +DRM_INFO ("%s : %d\n" , __func__, __LINE__); clk_mipi =clk_get (&pdev->dev,"clk_mipi" );if (!clk_mipi) {DRM_ERROR ("clk_get() failed clk_mipi\n" ); goto setup_fail; } +DRM_INFO ("%s : %d\n" , __func__, __LINE__);kmb_display_clk_enable (); - ret =drm_irq_install (drm,platform_get_irq (pdev,0 )); -if (ret <0 ) { -DRM_ERROR ("failed to install IRQ handler\n" ); - goto irq_fail; - } +DRM_INFO ("%s : %d\n" , __func__, __LINE__);return 0 ; -irq_fail:drm_crtc_cleanup (&dev_p->crtc); setup_fail:of_reserved_mem_device_release (drm->dev);
@@ -349,40 +317,38 @@ static int kmb_drm_bind(struct device *dev)kmb_setup_mode_config (drm);DRM_DEBUG ("kmb_bind : after kmb_setup_mode_config\n" ); ret =kmb_load (drm,0 ); -if (ret) +DRM_INFO ("%s : %d ret = %d\n" , __func__, __LINE__, ret); +if (ret == -EPROBE_DEFER ) { +DRM_INFO ("kmb_bind: wait for external bridge driver DT\n" ); +return -EPROBE_DEFER ; + }else if (ret) goto err_free; +DRM_INFO ("%s : %d\n" , __func__, __LINE__);/* Set the CRTC's port so that the encoder component can find it */ lcd->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); - - ret =component_bind_all (dev, drm); -if (ret) { -DRM_ERROR ("Failed to bind all components\n" ); - goto err_unload; - } - - ret =pm_runtime_set_active (dev); -if (ret) - goto err_pm_active; - -pm_runtime_enable (dev); - +DRM_INFO ("crtc port = %pOF\n" , lcd->crtc.port); ret =drm_vblank_init (drm, drm->mode_config.num_crtc);if (ret <0 ) {DRM_ERROR ("failed to initialise vblank\n" ); goto err_vblank; } +DRM_INFO ("%s : %d\n" , __func__, __LINE__);drm_mode_config_reset (drm); +DRM_INFO ("%s : %d\n" , __func__, __LINE__);drm_kms_helper_poll_init (drm); +DRM_INFO ("%s : %d\n" , __func__, __LINE__); ret =drm_dev_register (drm,0 ); +DRM_INFO ("%s : %d ret = %d\n" , __func__, __LINE__, ret); lcd->n_layers =KMB_MAX_PLANES ;if (ret) goto err_register;drm_fbdev_generic_setup (drm,32 ); +DRM_INFO ("%s : %d\n" , __func__, __LINE__);return 0 ;
@@ -390,9 +356,7 @@ static int kmb_drm_bind(struct device *dev)drm_kms_helper_poll_fini (drm); err_vblank:pm_runtime_disable (drm->dev); -err_pm_active:component_unbind_all (dev, drm); -err_unload:of_node_put (lcd->crtc.port); lcd->crtc.port =NULL ;drm_irq_uninstall (drm);
@@ -451,16 +415,10 @@ static const struct component_master_ops kmb_master_ops = { .unbind = kmb_drm_unbind, }; -static int compare_dev (struct device *dev,void *data) -{ -return dev->of_node == data; -} -static int kmb_probe (struct platform_device *pdev) {struct device_node *port; -struct component_match *match =NULL ; -int ret; +int ret =0 ;/* there is only one output port inside each device, find it */ DRM_DEBUG ("%s : ENTER" , __func__);
@@ -469,18 +427,8 @@ static int kmb_probe(struct platform_device *pdev)DRM_DEBUG ("%s : port = 0x%pOF\n" , __func__, port);if (!port)return -ENODEV ; - -DRM_DEBUG ("%s : after get_remote" , __func__); -DRM_DEBUG ("Adding component %pOF\n" , port); -drm_of_component_match_add (&pdev->dev, &match, compare_dev, port); -DRM_DEBUG ("%s : after get_match" , __func__); -of_node_put (port); - - ret =component_master_add_with_match (&pdev->dev, &kmb_master_ops, - match); -DRM_DEBUG ("%s : EXIT ret=%d\n" , __func__, ret); -return ret; +return kmb_drm_bind (&pdev->dev); }static int kmb_remove (struct platform_device *pdev)
@@ -532,13 +480,13 @@ static int __maybe_unused kmb_pm_resume(struct device *dev) 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 ="Keembay_Display" , - .pm = &kmb_pm_ops, - .of_match_table = kmb_of_match, - }, + .probe = kmb_probe, + .remove = kmb_remove, + .driver = { + .name ="kmb_display" , + .pm = &kmb_pm_ops, + .of_match_table = kmb_of_match, + }, };module_platform_driver (kmb_platform_driver);
drivers/gpu/drm/kmb/kmb_dsi.c +41 -5
85 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +2 -1
@@ -329,7 +329,8 @@ union mipi_irq_cfg { } irq_cfg; }; -int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge); +//int kmb_dsi_init(struct drm_device *dev, struct drm_bridge *bridge); +int kmb_dsi_init (struct drm_device *dev);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 30/59 drm/kmb: call bridge init in the very beginning
In reply to Anitha Chrisanthusof probe and return probe_defer early on, so that all the other initializations can be done after adv driver is loaded successfully.
--- drivers/gpu/drm/kmb/kmb_drv.c | 81 ++++++++++++++---------- drivers/gpu/drm/kmb/kmb_dsi.c | 144 ++++++++++++++++++++++++++---------------- drivers/gpu/drm/kmb/kmb_dsi.h | 6 +- 3 files changed, 141 insertions(+), 90 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +47 -34
@@ -57,11 +57,24 @@ static struct clk *clk_lcd;static struct clk *clk_mipi;static int probe_deferred; +struct drm_bridge *adv_bridge;static int kmb_display_clk_enable (void ) { -clk_prepare_enable (clk_lcd); -clk_prepare_enable (clk_mipi); +int ret; + + ret =clk_prepare_enable (clk_lcd); +if (ret) { +DRM_ERROR ("Failed to enable LCD clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (clk_mipi); +if (ret) { +DRM_ERROR ("Failed to enable MIPI clock: %d\n" , ret); +return ret; + } +DRM_INFO ("SUCCESS : enabled LCD MIPI clocks\n" );return 0 ; }
@@ -106,8 +119,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)*} */ /* LCD mmio */ -if (!probe_deferred) { - probe_deferred =1 ; + probe_deferred =1 ;if (!request_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ,"kmb-lcd" )) {DRM_ERROR ("failed to reserve LCD registers\n" );
@@ -140,9 +152,10 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)* lists LCD at 79 and 82 for MIPI under MSS CPU - * firmware has to redirect it to A53 */ -/*TBD read and check for correct product version here */ -/* Get the optional framebuffer memory resource */ +/*TBD read and check for correct product version here */ + +/* Get the optional framebuffer memory resource */ ret =of_reserved_mem_device_init (drm->dev);if (ret && ret != -ENODEV )return ret;
@@ -154,8 +167,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; } -/* ret = kmb_dsi_init(drm, bridge);*/ - ret =kmb_dsi_init (drm); + ret =kmb_dsi_init (drm, adv_bridge);if (ret == -EPROBE_DEFER ) {DRM_INFO ("%s: wait for external bridge driver DT" , __func__);return -EPROBE_DEFER ;
@@ -163,7 +175,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_ERROR ("failed to initialize DSI\n" ); goto setup_fail; } -}/* enable display clocks*/ clk_lcd =clk_get (&pdev->dev,"clk_lcd" );if (!clk_lcd) {
@@ -177,10 +188,9 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; }DRM_INFO ("%s : %d\n" , __func__, __LINE__); -kmb_display_clk_enable (); - -DRM_INFO ("%s : %d\n" , __func__, __LINE__); + ret =kmb_display_clk_enable (); +DRM_INFO ("%s : %d clk enabling ret=%d\n" , __func__, __LINE__, ret);return 0 ;drm_crtc_cleanup (&dev_p->crtc);
@@ -287,7 +297,7 @@ static struct drm_driver kmb_driver = { .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .fops = &fops, - .name = "kmb", + .name = "kmb_display", .desc = "KEEMBAY DISPLAY DRIVER ", .date = "20190122", .major = 1,
@@ -296,26 +306,27 @@ static struct drm_driver kmb_driver = {static int kmb_drm_bind (struct device *dev) { -struct drm_device *drm; +struct drm_device *drm =NULL ;struct kmb_drm_private *lcd;int ret; -DRM_DEBUG ("kmb_bind : ENTER\n" ); +DRM_DEBUG ("%s : ENTER" , __func__); drm =drm_dev_alloc (&kmb_driver, dev);if (IS_ERR (drm))return PTR_ERR (drm); -DRM_DEBUG ("kmb_bind : after alloc drm\n" ); +DRM_DEBUG ("%s : after alloc drm" , __func__); lcd =devm_kzalloc (dev,sizeof (*lcd),GFP_KERNEL );if (!lcd)return -ENOMEM ; -DRM_DEBUG ("kmb_bind : after alloc lcd\n" ); +DRM_DEBUG ("%s : after alloc lcd" , __func__); drm->dev_private = lcd; -dev_set_drvdata (dev, drm);kmb_setup_mode_config (drm); -DRM_DEBUG ("kmb_bind : after kmb_setup_mode_config\n" ); +dev_set_drvdata (dev, drm); + +/* load the driver */ ret =kmb_load (drm,0 );DRM_INFO ("%s : %d ret = %d\n" , __func__, __LINE__, ret);if (ret == -EPROBE_DEFER ) {
@@ -356,7 +367,6 @@ static int kmb_drm_bind(struct device *dev)drm_kms_helper_poll_fini (drm); err_vblank:pm_runtime_disable (drm->dev); -component_unbind_all (dev, drm);of_node_put (lcd->crtc.port); lcd->crtc.port =NULL ;drm_irq_uninstall (drm);
@@ -374,9 +384,9 @@ static void kmb_drm_unbind(struct device *dev)struct drm_device *drm =dev_get_drvdata (dev);struct kmb_drm_private *dev_p = drm->dev_private; +dump_stack ();drm_dev_unregister (drm);drm_kms_helper_poll_fini (drm); -component_unbind_all (dev, drm);of_node_put (dev_p->crtc.port); dev_p->crtc.port =NULL ;pm_runtime_get_sync (drm->dev);
@@ -384,12 +394,15 @@ static void kmb_drm_unbind(struct device *dev)pm_runtime_put_sync (drm->dev);pm_runtime_disable (drm->dev); +DRM_INFO ("%s : %d\n" , __func__, __LINE__);if (dev_p->lcd_mmio) { +DRM_INFO ("%s : %d\n" , __func__, __LINE__);iounmap (dev_p->lcd_mmio);release_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ); }if (dev_p->mipi_mmio) { +DRM_INFO ("%s : %d\n" , __func__, __LINE__);iounmap (dev_p->mipi_mmio);release_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); }
@@ -397,6 +410,7 @@ static void kmb_drm_unbind(struct device *dev)if (dev_p->msscam_mmio)iounmap (dev_p->msscam_mmio); +DRM_INFO ("%s : %d\n" , __func__, __LINE__);of_reserved_mem_device_release (drm->dev);drm_mode_config_cleanup (drm);
@@ -408,32 +422,31 @@ static void kmb_drm_unbind(struct device *dev)drm_dev_put (drm); drm->dev_private =NULL ;dev_set_drvdata (dev,NULL ); +DRM_INFO ("%s : %d\n" , __func__, __LINE__); } -static const struct component_master_ops kmb_master_ops = { - .bind = kmb_drm_bind, - .unbind = kmb_drm_unbind, -}; -static int kmb_probe (struct platform_device *pdev) { -struct device_node *port; -int ret =0 ; +struct device *device =get_device (&pdev->dev);/* there is only one output port inside each device, find it */ DRM_DEBUG ("%s : ENTER" , __func__); - port =of_graph_get_remote_node (pdev->dev.of_node,0 ,0 ); -DRM_DEBUG ("%s : port = 0x%pOF\n" , __func__, port); -if (!port) -return -ENODEV ; -DRM_DEBUG ("%s : EXIT ret=%d\n" , __func__, ret); + adv_bridge =kmb_dsi_host_bridge_init (device); +if (adv_bridge ==ERR_PTR (-EPROBE_DEFER )) +return -EPROBE_DEFER ; +else if (adv_bridge <0 ) { +DRM_ERROR (" PROBE failed\n" ); +return -EINVAL ; + } +return kmb_drm_bind (&pdev->dev); }static int kmb_remove (struct platform_device *pdev) { -component_master_del (&pdev->dev, &kmb_master_ops); +// component_master_del(&pdev->dev, &kmb_master_ops); +kmb_drm_unbind (&pdev->dev);return 0 ; }
drivers/gpu/drm/kmb/kmb_dsi.c +91 -53
240 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +3 -3
@@ -42,7 +42,7 @@ struct kmb_dsi { };struct kmb_dsi_host { -struct mipi_dsi_host base; +struct mipi_dsi_host *base;struct kmb_dsi *kmb_dsi;struct mipi_dsi_device *device; };
@@ -329,8 +329,8 @@ union mipi_irq_cfg { } irq_cfg; }; -//int kmb_dsi_init(struct drm_device *dev, struct drm_bridge *bridge); -int kmb_dsi_init (struct drm_device *dev); +struct drm_bridge *kmb_dsi_host_bridge_init (struct device *dev); +int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 31/59 drm/kmb: Cleanup probe functions
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
- Removed deprecated code blocks within probe functions
- In kmb_remove, unregister MIPI DSI host
- In kmb_probe, if kmb_load fails, then unregister MIPI DSI host
- Change kmb_dsi_host_bridge_init to return error codes using ERR_PTR
- Do clock intitialization earlier
- Rename kmb_drm_unbind to kmb_drm_unload.
- Get mmio info from device tree
--- drivers/gpu/drm/kmb/kmb_drv.c | 336 +++++++++++++++++++++++------------------- drivers/gpu/drm/kmb/kmb_drv.h | 1 + drivers/gpu/drm/kmb/kmb_dsi.c | 85 ++++------- 3 files changed, 218 insertions(+), 204 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +186 -150
@@ -50,18 +50,18 @@#include "kmb_dsi.h" #define DEBUG +/*IRQ handler*/ static irqreturn_t kmb_isr (int irq,void *arg);static struct clk *clk_lcd;static struct clk *clk_mipi; -static int probe_deferred;struct drm_bridge *adv_bridge;static int kmb_display_clk_enable (void ) { -int ret; +int ret =0 ; ret =clk_prepare_enable (clk_lcd);if (ret) {
@@ -87,86 +87,142 @@ static int kmb_display_clk_disable(void)return 0 ; } +static void __iomem *kmb_map_mmio (struct platform_device *pdev,char *name) +{ +struct resource *res; +u32 size; +void __iomem *mem; + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM , name); +if (!res) { +DRM_ERROR ("failed to get resource for %s\n" , name); +return ERR_PTR (-ENOMEM ); + } + size =resource_size (res); +if (!request_mem_region (res->start, size, name)) { +DRM_ERROR ("failed to reserve %s registers\n" , name); +return ERR_PTR (-ENOMEM ); + } + mem =ioremap_cache (res->start, size); +if (!mem) { +DRM_ERROR ("failed to ioremap %s registers\n" , name); +release_mem_region (res->start, size); +return ERR_PTR (-ENOMEM ); + } +return mem; +} +static int kmb_load (struct drm_device *drm,unsigned long flags) {struct kmb_drm_private *dev_p = drm->dev_private;struct platform_device *pdev =to_platform_device (drm->dev); -/* struct drm_bridge *bridge;*/ -/*struct resource *res;*/ /*u32 version;*/ -int ret; -/* struct device_node *encoder_node;*/ - -/* TBD - not sure if clock_get needs to be called here */ -/* -*dev_p->clk = devm_clk_get(drm->dev, "pxlclk"); -*if (IS_ERR(dev_p->clk)) -* return PTR_ERR(dev_p->clk); -*/ -/* -* TBD call this in the future when device tree is ready, -* use hardcoded value for now -*/ -/* -* res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -* dev_p->lcd_mmio = devm_ioremap_resource(drm->dev, res); - -*if (IS_ERR(dev_p->lcd_mmio)) { -* DRM_ERROR("failed to map control registers area\n"); -* ret = PTR_ERR(dev_p->lcd_mmio); -* dev_p->lcd_mmio = NULL; -* return ret; -*} -*/ -/* LCD mmio */ - probe_deferred =1 ; +int ret =0 ; -if (!request_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ,"kmb-lcd" )) { -DRM_ERROR ("failed to reserve LCD registers\n" ); -return -ENOMEM ; - } - dev_p->lcd_mmio =ioremap_cache (LCD_BASE_ADDR ,LCD_MMIO_SIZE ); -if (!dev_p->lcd_mmio) { +/* Map LCD MMIO registers */ + dev_p->lcd_mmio =kmb_map_mmio (pdev,"lcd_regs" ); +if (IS_ERR (dev_p->lcd_mmio)) {DRM_ERROR ("failed to map LCD registers\n" );return -ENOMEM ; } -/* Mipi mmio */ -if (!request_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ,"kmb-mipi" )) { -DRM_ERROR ("failed to reserve MIPI registers\n" ); + +/* Map MIPI MMIO registers */ + dev_p->mipi_mmio =kmb_map_mmio (pdev,"mipi_regs" ); + +if (IS_ERR (dev_p->mipi_mmio)) { +DRM_ERROR ("failed to map MIPI registers\n" );iounmap (dev_p->lcd_mmio);return -ENOMEM ; } - dev_p->mipi_mmio =ioremap_cache (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); -if (!dev_p->mipi_mmio) { -DRM_ERROR ("failed to map MIPI registers\n" ); + +/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and MSS_CAM_CLK_CTRL +* register +*/ + dev_p->msscam_mmio =kmb_map_mmio (pdev,"msscam_regs" ); +if (IS_ERR (dev_p->msscam_mmio)) { +DRM_ERROR ("failed to map MSSCAM registers\n" );iounmap (dev_p->lcd_mmio); +iounmap (dev_p->mipi_mmio);return -ENOMEM ; } -/*this is only for MIPI_TX_MSS_LCD_MIPI_CFG register */ -if (!dev_p->msscam_mmio) { - dev_p->msscam_mmio =ioremap_cache (MSS_CAM_BASE_ADDR , -MSS_CAM_MMIO_SIZE ); + +/* enable display clocks*/ + clk_lcd =clk_get (&pdev->dev,"clk_lcd" ); +if (!clk_lcd) { +DRM_ERROR ("clk_get() failed clk_lcd\n" ); + goto setup_fail; + } +DRM_INFO ("%s : %d\n" , __func__, __LINE__); + + clk_mipi =clk_get (&pdev->dev,"clk_mipi" ); +if (!clk_mipi) { +DRM_ERROR ("clk_get() failed clk_mipi\n" ); + goto setup_fail; } +DRM_INFO ("%s : %d\n" , __func__, __LINE__); + ret =kmb_display_clk_enable (); -/* register irqs here - section 17.3 in databook +/* set LCD clock to 200 Mhz*/ +DRM_INFO ("Get clk_lcd before set = %ld\n" ,clk_get_rate (clk_lcd)); + ret =clk_set_rate (clk_lcd,200000000 ); +DRM_INFO ("Setting LCD clock tp 200Mhz ret = %d\n" , ret); +DRM_INFO ("Get clk_lcd after set = %ld\n" ,clk_get_rate (clk_lcd)); +/* set MIPI clock to 24 Mhz*/ +DRM_INFO ("Get clk_mipi before set = %ld\n" ,clk_get_rate (clk_mipi)); + ret =clk_set_rate (clk_mipi,24000000 ); +DRM_INFO ("Setting MIPI clock tp 24Mhz ret = %d\n" , ret); +DRM_INFO ("Get clk_mipi after set = %ld\n" ,clk_get_rate (clk_mipi)); + +#ifdef WIP +/* Register irqs here - section 17.3 in databook * lists LCD at 79 and 82 for MIPI under MSS CPU - * firmware has to redirect it to A53 */ +DRM_INFO ("platform_get_irq_byname %pOF\n" , drm->dev->of_node); + +/* Allocate LCD interrupt resources, enable interrupt line, +* and setup IRQ handling +*/ + irq_lcd =platform_get_irq_byname (pdev,"irq_lcd" ); +if (irq_lcd <0 ) { +DRM_ERROR ("irq_lcd not found" ); +return irq_lcd; + } + +pr_info ("irq_lcd platform_get_irq = %d\n" , irq_lcd); + + ret =request_irq (irq_lcd, kmb_isr,IRQF_SHARED ,"irq_lcd" , dev_p); + dev_p->irq_lcd = irq_lcd; + +/* Allocate MIPI interrupt resources, enable interrupt line, +* and setup IRQ handling +*/ + irq_mipi =platform_get_irq_byname (pdev,"irq_mipi" ); +if (irq_mipi <0 ) { +DRM_ERROR ("irq_mipi not found" ); +return irq_mipi; + } -/*TBD read and check for correct product version here */ +pr_info ("irq_mipi platform_get_irq = %d\n" , irq_mipi); + ret =request_irq (irq_mipi, kmb_isr,IRQF_SHARED ,"irq_mipi" , dev_p); + dev_p->irq_mipi = irq_mipi; +#endif +/* TBD read and check for correct product version here */ -/* Get the optional framebuffer memory resource */ +/* Get the optional framebuffer memory resource */ ret =of_reserved_mem_device_init (drm->dev);if (ret && ret != -ENODEV )return ret;spin_lock_init (&dev_p->irq_lock); + ret =kmb_setup_crtc (drm);if (ret <0 ) {DRM_ERROR ("failed to create crtc\n" ); goto setup_fail; } +/* Initialize MIPI DSI */ ret =kmb_dsi_init (drm, adv_bridge);if (ret == -EPROBE_DEFER ) {DRM_INFO ("%s: wait for external bridge driver DT" , __func__);
@@ -175,26 +231,23 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_ERROR ("failed to initialize DSI\n" ); goto setup_fail; } -/* enable display clocks*/ - clk_lcd =clk_get (&pdev->dev,"clk_lcd" ); -if (!clk_lcd) { -DRM_ERROR ("clk_get() failed clk_lcd\n" ); - goto setup_fail; - } +DRM_INFO ("%s : %d\n" , __func__, __LINE__); - clk_mipi =clk_get (&pdev->dev,"clk_mipi" ); -if (!clk_mipi) { -DRM_ERROR ("clk_get() failed clk_mipi\n" ); - goto setup_fail; +#ifdef WIP + ret =drm_irq_install (drm,platform_get_irq (pdev,0 )); +if (ret <0 ) { +DRM_ERROR ("failed to install IRQ handler\n" ); + goto irq_fail; } -DRM_INFO ("%s : %d\n" , __func__, __LINE__); - ret =kmb_display_clk_enable (); - -DRM_INFO ("%s : %d clk enabling ret=%d\n" , __func__, __LINE__, ret); +#endif return 0 ; +#ifdef WIP +irq_fail:drm_crtc_cleanup (&dev_p->crtc); +#endif setup_fail: +DRM_INFO ("%s : %d\n" , __func__, __LINE__);of_reserved_mem_device_release (drm->dev);return ret;
@@ -304,62 +357,113 @@ static struct drm_driver kmb_driver = { .minor = 0, }; -static int kmb_drm_bind (struct device *dev) +static void kmb_drm_unload (struct device *dev) { +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *dev_p = drm->dev_private; + +dump_stack (); +drm_dev_unregister (drm); +drm_kms_helper_poll_fini (drm); +of_node_put (dev_p->crtc.port); + dev_p->crtc.port =NULL ; +pm_runtime_get_sync (drm->dev); +drm_irq_uninstall (drm); +pm_runtime_put_sync (drm->dev); +pm_runtime_disable (drm->dev); + +if (dev_p->lcd_mmio) { +iounmap (dev_p->lcd_mmio); +release_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ); + } + +if (dev_p->mipi_mmio) { +iounmap (dev_p->mipi_mmio); +release_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); + } + +if (dev_p->msscam_mmio) +iounmap (dev_p->msscam_mmio); + +of_reserved_mem_device_release (drm->dev); +drm_mode_config_cleanup (drm); + +/*release clks */ +kmb_display_clk_disable (); +clk_put (clk_lcd); +clk_put (clk_mipi); + +drm_dev_put (drm); + drm->dev_private =NULL ; +dev_set_drvdata (dev,NULL ); + +/* Unregister DSI host */ +mipi_dsi_host_unregister (dsi_host); +} + +static int kmb_probe (struct platform_device *pdev) +{ +struct device *dev =get_device (&pdev->dev);struct drm_device *drm =NULL ;struct kmb_drm_private *lcd; -int ret; +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 procees +* 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); + } -DRM_DEBUG ("%s : ENTER" , __func__); +/* Create DRM device */ drm =drm_dev_alloc (&kmb_driver, dev);if (IS_ERR (drm))return PTR_ERR (drm); -DRM_DEBUG ("%s : after alloc drm" , __func__); lcd =devm_kzalloc (dev,sizeof (*lcd),GFP_KERNEL );if (!lcd)return -ENOMEM ; -DRM_DEBUG ("%s : after alloc lcd" , __func__); drm->dev_private = lcd; -kmb_setup_mode_config (drm);dev_set_drvdata (dev, drm); -/* load the driver */ +/* Load driver */ ret =kmb_load (drm,0 ); -DRM_INFO ("%s : %d ret = %d\n" , __func__, __LINE__, ret);if (ret == -EPROBE_DEFER ) { -DRM_INFO ("kmb_bind: wait for external bridge driver DT\n" ); +DRM_INFO ("wait for external bridge driver DT\n" );return -EPROBE_DEFER ; }else if (ret) goto err_free; -DRM_INFO ("%s : %d\n" , __func__, __LINE__);/* Set the CRTC's port so that the encoder component can find it */ lcd->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); -DRM_INFO ("crtc port = %pOF\n" , lcd->crtc.port); + ret =drm_vblank_init (drm, drm->mode_config.num_crtc);if (ret <0 ) { -DRM_ERROR ("failed to initialise vblank\n" ); +DRM_ERROR ("failed to initialize vblank\n" ); goto err_vblank; } -DRM_INFO ("%s : %d\n" , __func__, __LINE__);drm_mode_config_reset (drm); -DRM_INFO ("%s : %d\n" , __func__, __LINE__);drm_kms_helper_poll_init (drm); -DRM_INFO ("%s : %d\n" , __func__, __LINE__); +/* Register graphics device with the kernel */ ret =drm_dev_register (drm,0 ); -DRM_INFO ("%s : %d ret = %d\n" , __func__, __LINE__, ret); lcd->n_layers =KMB_MAX_PLANES ;if (ret) goto err_register;drm_fbdev_generic_setup (drm,32 ); -DRM_INFO ("%s : %d\n" , __func__, __LINE__);return 0 ;
@@ -367,86 +471,18 @@ static int kmb_drm_bind(struct device *dev)drm_kms_helper_poll_fini (drm); err_vblank:pm_runtime_disable (drm->dev); -of_node_put (lcd->crtc.port); - lcd->crtc.port =NULL ; -drm_irq_uninstall (drm); -of_reserved_mem_device_release (drm->dev); err_free:drm_mode_config_cleanup (drm);dev_set_drvdata (dev,NULL );drm_dev_put (drm); +mipi_dsi_host_unregister (dsi_host);return ret; } -static void kmb_drm_unbind (struct device *dev) -{ -struct drm_device *drm =dev_get_drvdata (dev); -struct kmb_drm_private *dev_p = drm->dev_private; - -dump_stack (); -drm_dev_unregister (drm); -drm_kms_helper_poll_fini (drm); -of_node_put (dev_p->crtc.port); - dev_p->crtc.port =NULL ; -pm_runtime_get_sync (drm->dev); -drm_irq_uninstall (drm); -pm_runtime_put_sync (drm->dev); -pm_runtime_disable (drm->dev); - -DRM_INFO ("%s : %d\n" , __func__, __LINE__); -if (dev_p->lcd_mmio) { -DRM_INFO ("%s : %d\n" , __func__, __LINE__); -iounmap (dev_p->lcd_mmio); -release_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ); - } - -if (dev_p->mipi_mmio) { -DRM_INFO ("%s : %d\n" , __func__, __LINE__); -iounmap (dev_p->mipi_mmio); -release_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); - } - -if (dev_p->msscam_mmio) -iounmap (dev_p->msscam_mmio); - -DRM_INFO ("%s : %d\n" , __func__, __LINE__); -of_reserved_mem_device_release (drm->dev); -drm_mode_config_cleanup (drm); - -/*release clks */ -kmb_display_clk_disable (); -clk_put (clk_lcd); -clk_put (clk_mipi); - -drm_dev_put (drm); - drm->dev_private =NULL ; -dev_set_drvdata (dev,NULL ); -DRM_INFO ("%s : %d\n" , __func__, __LINE__); -} - -static int kmb_probe (struct platform_device *pdev) -{ -struct device *device =get_device (&pdev->dev); - -/* there is only one output port inside each device, find it */ -DRM_DEBUG ("%s : ENTER" , __func__); - - adv_bridge =kmb_dsi_host_bridge_init (device); -if (adv_bridge ==ERR_PTR (-EPROBE_DEFER )) -return -EPROBE_DEFER ; -else if (adv_bridge <0 ) { -DRM_ERROR (" PROBE failed\n" ); -return -EINVAL ; - } - -return kmb_drm_bind (&pdev->dev); -} -static int kmb_remove (struct platform_device *pdev) { -// component_master_del(&pdev->dev, &kmb_master_ops); -kmb_drm_unbind (&pdev->dev); +kmb_drm_unload (&pdev->dev);return 0 ; }
drivers/gpu/drm/kmb/kmb_drv.h +1 -0
@@ -31,6 +31,7 @@#define KMB_MAX_WIDTH 16384/*max width in pixels */ #define KMB_MAX_HEIGHT 16384/*max height in pixels */ +extern struct mipi_dsi_host *dsi_host;struct kmb_drm_private {struct drm_device drm;void __iomem *lcd_mmio;
drivers/gpu/drm/kmb/kmb_dsi.c +31 -54
264 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
Anitha Chrisanthus
maintainerPATCH 32/59 drm/kmb: Revert dsi_host back to a static variable
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
revert dsi_host to static and instead add dsi_host_unregister.
--- drivers/gpu/drm/kmb/kmb_drv.c | 6 +++--- drivers/gpu/drm/kmb/kmb_drv.h | 1 - drivers/gpu/drm/kmb/kmb_dsi.c | 9 +++++++-- drivers/gpu/drm/kmb/kmb_dsi.h | 1 + 4 files changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +3 -3
@@ -398,7 +398,7 @@ static void kmb_drm_unload(struct device *dev)dev_set_drvdata (dev,NULL );/* Unregister DSI host */ -mipi_dsi_host_unregister (dsi_host); +dsi_host_unregister (); }static int kmb_probe (struct platform_device *pdev)
@@ -434,7 +434,7 @@ static int kmb_probe(struct platform_device *pdev) drm->dev_private = lcd;kmb_setup_mode_config (drm); -dev_set_drvdata (dev, drm); +dev_set_drvdata (dev, drm);/* Load driver */ ret =kmb_load (drm,0 );
@@ -475,7 +475,7 @@ static int kmb_probe(struct platform_device *pdev)drm_mode_config_cleanup (drm);dev_set_drvdata (dev,NULL );drm_dev_put (drm); -mipi_dsi_host_unregister (dsi_host); +dsi_host_unregister ();return ret; }
drivers/gpu/drm/kmb/kmb_drv.h +0 -1
@@ -31,7 +31,6 @@#define KMB_MAX_WIDTH 16384/*max width in pixels */ #define KMB_MAX_HEIGHT 16384/*max height in pixels */ -extern struct mipi_dsi_host *dsi_host;struct kmb_drm_private {struct drm_device drm;void __iomem *lcd_mmio;
drivers/gpu/drm/kmb/kmb_dsi.c +7 -2
@@ -79,7 +79,7 @@#define PLL_M_MAX 623#define PLL_FVCO_MAX 1250 -struct mipi_dsi_host *dsi_host; +static struct mipi_dsi_host *dsi_host;static struct mipi_dsi_device *dsi_device;/*
@@ -357,8 +357,13 @@ struct drm_bridge *kmb_dsi_host_bridge_init(struct device *dev)return bridge; } +void dsi_host_unregister (void ) +{ +mipi_dsi_host_unregister (dsi_host); +} +u32 mipi_get_datatype_params (u32 data_type,u32 data_mode, -struct mipi_data_type_params *params) +struct mipi_data_type_params *params) {struct mipi_data_type_params data_type_parameters;
drivers/gpu/drm/kmb/kmb_dsi.h +1 -0
@@ -333,6 +333,7 @@ struct drm_bridge *kmb_dsi_host_bridge_init(struct device *dev);int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p); +void dsi_host_unregister (void );#define to_kmb_connector (x) container_of(x, struct kmb_connector, base)#define to_kmb_host (x) container_of(x, struct kmb_dsi_host, base)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 33/59 drm/kmb: Initialize clocks for clk_msscam, clk_mipi_ecfg, & clk_mipi_cfg.
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
Note that we enable clk_msscam but do not set clk_msscam. However, we do enable and set clk_mipi_ecfg and clk_mipi_cfg.
Verify that LCD and MIPI clocks are set successfully.
--- drivers/gpu/drm/kmb/kmb_drv.c | 112 +++++++++++++++++++++++++++++++++++++----- drivers/gpu/drm/kmb/kmb_drv.h | 2 + 2 files changed, 102 insertions(+), 12 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +100 -12
@@ -56,6 +56,9 @@ static irqreturn_t kmb_isr(int irq, void *arg);static struct clk *clk_lcd;static struct clk *clk_mipi; +static struct clk *clk_msscam; +static struct clk *clk_mipi_ecfg; +static struct clk *clk_mipi_cfg;struct drm_bridge *adv_bridge;
@@ -74,6 +77,24 @@ static int kmb_display_clk_enable(void)DRM_ERROR ("Failed to enable MIPI clock: %d\n" , ret);return ret; } + + ret =clk_prepare_enable (clk_msscam); +if (ret) { +DRM_ERROR ("Failed to enable MSSCAM clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (clk_mipi_ecfg); +if (ret) { +DRM_ERROR ("Failed to enable MIPI_ECFG clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (clk_mipi_cfg); +if (ret) { +DRM_ERROR ("Failed to enable MIPI_CFG clock: %d\n" , ret); +return ret; + }DRM_INFO ("SUCCESS : enabled LCD MIPI clocks\n" );return 0 ; }
@@ -84,6 +105,12 @@ static int kmb_display_clk_disable(void)clk_disable_unprepare (clk_lcd);if (clk_mipi)clk_disable_unprepare (clk_mipi); +if (clk_msscam) +clk_disable_unprepare (clk_msscam); +if (clk_mipi_ecfg) +clk_disable_unprepare (clk_mipi_ecfg); +if (clk_mipi_cfg) +clk_disable_unprepare (clk_mipi_cfg);return 0 ; }
@@ -118,6 +145,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)struct platform_device *pdev =to_platform_device (drm->dev);/*u32 version;*/ int ret =0 ; +unsigned long clk;/* Map LCD MMIO registers */ dev_p->lcd_mmio =kmb_map_mmio (pdev,"lcd_regs" );
@@ -128,7 +156,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)/* Map MIPI MMIO registers */ dev_p->mipi_mmio =kmb_map_mmio (pdev,"mipi_regs" ); -if (IS_ERR (dev_p->mipi_mmio)) {DRM_ERROR ("failed to map MIPI registers\n" );iounmap (dev_p->lcd_mmio);
@@ -146,33 +173,94 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)return -ENOMEM ; } -/* enable display clocks*/ +/* Enable display clocks*/ clk_lcd =clk_get (&pdev->dev,"clk_lcd" ); -if (!clk_lcd) { +if (IS_ERR (clk_lcd)) {DRM_ERROR ("clk_get() failed clk_lcd\n" ); goto setup_fail; } -DRM_INFO ("%s : %d\n" , __func__, __LINE__); clk_mipi =clk_get (&pdev->dev,"clk_mipi" ); -if (!clk_mipi) { +if (IS_ERR (clk_mipi)) {DRM_ERROR ("clk_get() failed clk_mipi\n" ); goto setup_fail; } -DRM_INFO ("%s : %d\n" , __func__, __LINE__); + + clk_msscam =clk_get (&pdev->dev,"clk_msscam" ); +if (IS_ERR (clk_msscam)) { +DRM_ERROR ("clk_get() failed clk_msscam\n" ); + goto setup_fail; + } + + clk_mipi_ecfg =clk_get (&pdev->dev,"clk_mipi_ecfg" ); +if (IS_ERR (clk_mipi_ecfg)) { +DRM_ERROR ("clk_get() failed clk_mipi_ecfg\n" ); + goto setup_fail; + } + + clk_mipi_cfg =clk_get (&pdev->dev,"clk_mipi_cfg" ); +if (IS_ERR (clk_mipi_cfg)) { +DRM_ERROR ("clk_get() failed clk_mipi_cfg\n" ); + goto setup_fail; + } + ret =kmb_display_clk_enable (); -/* set LCD clock to 200 Mhz*/ +/* Set LCD clock to 200 Mhz*/ DRM_INFO ("Get clk_lcd before set = %ld\n" ,clk_get_rate (clk_lcd)); - ret =clk_set_rate (clk_lcd,200000000 ); -DRM_INFO ("Setting LCD clock tp 200Mhz ret = %d\n" , ret); + ret =clk_set_rate (clk_lcd,KMB_LCD_DEFAULT_CLK ); +if (clk_get_rate (clk_lcd) !=KMB_LCD_DEFAULT_CLK ) { +DRM_ERROR ("failed to set to clk_lcd to %d\n" , +KMB_LCD_DEFAULT_CLK ); + goto setup_fail; + } +DRM_INFO ("Setting LCD clock to %d Mhz ret = %d\n" , +KMB_LCD_DEFAULT_CLK /1000000 , ret);DRM_INFO ("Get clk_lcd after set = %ld\n" ,clk_get_rate (clk_lcd)); -/* set MIPI clock to 24 Mhz*/ + +/* Set MIPI clock to 24 Mhz*/ DRM_INFO ("Get clk_mipi before set = %ld\n" ,clk_get_rate (clk_mipi)); - ret =clk_set_rate (clk_mipi,24000000 ); -DRM_INFO ("Setting MIPI clock tp 24Mhz ret = %d\n" , ret); + ret =clk_set_rate (clk_mipi,KMB_MIPI_DEFAULT_CLK ); +if (clk_get_rate (clk_mipi) !=KMB_MIPI_DEFAULT_CLK ) { +DRM_ERROR ("failed to set to clk_mipi to %d\n" , +KMB_MIPI_DEFAULT_CLK ); + goto setup_fail; + } +DRM_INFO ("Setting MIPI clock to %d Mhz ret = %d\n" , +KMB_MIPI_DEFAULT_CLK /1000000 , ret);DRM_INFO ("Get clk_mipi after set = %ld\n" ,clk_get_rate (clk_mipi)); + clk =clk_get_rate (clk_mipi_ecfg); +if (clk !=KMB_MIPI_DEFAULT_CLK ) { +/* Set MIPI_ECFG clock to 24 Mhz*/ +DRM_INFO ("Get clk_mipi_ecfg before set = %ld\n" , clk); + ret =clk_set_rate (clk_mipi_ecfg,KMB_MIPI_DEFAULT_CLK ); + clk =clk_get_rate (clk_mipi_ecfg); +if (clk !=KMB_MIPI_DEFAULT_CLK ) { +DRM_ERROR ("failed to set to clk_mipi_ecfg to %d\n" , +KMB_MIPI_DEFAULT_CLK ); + goto setup_fail; + } +DRM_INFO ("Setting MIPI_ECFG clock tp %d Mhz ret = %d\n" , +KMB_MIPI_DEFAULT_CLK /1000000 , ret); +DRM_INFO ("Get clk_mipi_ecfg after set = %ld\n" , clk); + } + + clk =clk_get_rate (clk_mipi_cfg); +if (clk !=KMB_MIPI_DEFAULT_CLK ) { +/* Set MIPI_CFG clock to 24 Mhz*/ +DRM_INFO ("Get clk_mipi_cfg before set = %ld\n" , clk); + ret =clk_set_rate (clk_mipi_cfg,24000000 ); + clk =clk_get_rate (clk_mipi_cfg); +if (clk !=KMB_MIPI_DEFAULT_CLK ) { +DRM_ERROR ("failed to set to clk_mipi_cfg to %d\n" , +KMB_MIPI_DEFAULT_CLK ); + goto setup_fail; + } +DRM_INFO ("Setting MIPI_CFG clock tp 24Mhz ret = %d\n" , ret); +DRM_INFO ("Get clk_mipi_cfg after set = %ld\n" , clk); + } +#ifdef WIP /* Register irqs here - section 17.3 in databook * lists LCD at 79 and 82 for MIPI under MSS CPU -
drivers/gpu/drm/kmb/kmb_drv.h +2 -0
@@ -30,6 +30,8 @@#define KMB_MAX_WIDTH 16384/*max width in pixels */ #define KMB_MAX_HEIGHT 16384/*max height in pixels */ +#define KMB_LCD_DEFAULT_CLK 200000000 +#define KMB_MIPI_DEFAULT_CLK 24000000struct kmb_drm_private {struct drm_device drm;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 34/59 drm/kmb: Enable MSS_CAM_CLK_CTRL for LCD and MIPI
In reply to Anitha ChrisanthusEnable clocks for LCD, mipi common and mipi tx0 Renamed MSS_CAM_CLK_CTRL and also fixed bug in the call to set this register.
--- drivers/gpu/drm/kmb/kmb_drv.c | 8 ++++---- drivers/gpu/drm/kmb/kmb_drv.h | 14 ++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.c | 6 ++++-- drivers/gpu/drm/kmb/kmb_regs.h | 7 ++++++- 4 files changed, 28 insertions(+), 7 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +4 -4
@@ -261,6 +261,9 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_INFO ("Get clk_mipi_cfg after set = %ld\n" , clk); } +/* enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */ +kmb_set_bitmask_msscam (dev_p,MSS_CAM_CLK_CTRL ,LCD |MIPI_COMMON | +MIPI_TX0 );#ifdef WIP /* Register irqs here - section 17.3 in databook * lists LCD at 79 and 82 for MIPI under MSS CPU -
@@ -312,10 +315,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)/* Initialize MIPI DSI */ ret =kmb_dsi_init (drm, adv_bridge); -if (ret == -EPROBE_DEFER ) { -DRM_INFO ("%s: wait for external bridge driver DT" , __func__); -return -EPROBE_DEFER ; - }else if (ret) { +if (ret) {DRM_ERROR ("failed to initialize DSI\n" ); goto setup_fail; }
drivers/gpu/drm/kmb/kmb_drv.h +14 -0
@@ -108,6 +108,20 @@ static inline void kmb_write_msscam(struct kmb_drm_private *dev_p,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);
drivers/gpu/drm/kmb/kmb_dsi.c +4 -2
@@ -814,9 +814,11 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_p, active_vchannels++;/*connect lcd to mipi */ -kmb_write_msscam (dev_p,MSS_CAM_BASE_ADDR + -MIPI_TX_MSS_LCD_MIPI_CFG ,1 ); +kmb_write_msscam (dev_p,MSS_LCD_MIPI_CFG ,1 ); +/*stop iterating as only one virtual channel shall be used for +* LCD connection +*/ break ; }
drivers/gpu/drm/kmb/kmb_regs.h +6 -1
@@ -697,6 +697,11 @@ & (1 << (dphy - MIPI_DPHY6)))#define DPHY_CFG_CLK_EN (0x18c) -#define MIPI_TX_MSS_LCD_MIPI_CFG (0x04) +#define MSS_LCD_MIPI_CFG (0x04) +#define MSS_CAM_CLK_CTRL (0x10) +#define LCD (1<<1) +#define MIPI_COMMON (1<<2) +#define MIPI_TX0 (1<<9) +#define BIT_MASK_16 (0xffff)#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 35/59 drm/kmb: Remove declaration of irq_lcd/irq_mipi
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
Made it conditionally compiled.
--- drivers/gpu/drm/kmb/kmb_drv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +5 -2
@@ -143,7 +143,10 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) {struct kmb_drm_private *dev_p = drm->dev_private;struct platform_device *pdev =to_platform_device (drm->dev); +#ifdef WIP /*u32 version;*/ +int irq_lcd, irq_mipi; +#endif int ret =0 ;unsigned long clk;
@@ -297,9 +300,9 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)pr_info ("irq_mipi platform_get_irq = %d\n" , irq_mipi); ret =request_irq (irq_mipi, kmb_isr,IRQF_SHARED ,"irq_mipi" , dev_p); dev_p->irq_mipi = irq_mipi; -#endif -/* TBD read and check for correct product version here */ +/* TBD read and check for correct product version here */ +#endif /* Get the optional framebuffer memory resource */ ret =of_reserved_mem_device_init (drm->dev);if (ret && ret != -ENODEV )
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 36/59 drm/kmb: Enable MIPI TX HS Test Pattern Generation
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
Added test pattern generator function. Enable this at compile time to test if mipi is working. mipi->hdmi section
--- drivers/gpu/drm/kmb/kmb_dsi.c | 31 +++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 7 +++++++ drivers/gpu/drm/kmb/kmb_regs.h | 11 +++++++++++ 3 files changed, 49 insertions(+)
drivers/gpu/drm/kmb/kmb_dsi.c +31 -0
@@ -764,6 +764,32 @@ static void mipi_tx_ctrl_cfg(struct kmb_drm_private *dev_p, u8 fg_id,kmb_write_mipi (dev_p,MIPI_TXm_HS_CTRL (ctrl_no), ctrl); } +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +static void mipi_tx_hs_tp_gen (struct kmb_drm_private *dev_p,int vc, +int tp_sel,u32 stripe_width,u32 color0,u32 color1) +{ +u32 ctrl_no =MIPI_CTRL6 ; + +/* Select test pattern mode on the virtual channel */ +kmb_write_mipi (dev_p,MIPI_TXm_HS_TEST_PAT_CTRL (ctrl_no), +TP_SEL_VCm (vc, tp_sel)); + +if (tp_sel ==MIPI_TX_HS_TP_V_STRIPES || + tp_sel ==MIPI_TX_HS_TP_H_STRIPES ) { +kmb_write_mipi (dev_p,MIPI_TXm_HS_TEST_PAT_CTRL (ctrl_no), +TP_STRIPE_WIDTH (stripe_width)); + } + +/* Configure test pattern colors */ +kmb_write_mipi (dev_p,MIPI_TX_HS_TEST_PAT_COLOR0 , color0); +kmb_write_mipi (dev_p,MIPI_TX_HS_TEST_PAT_COLOR1 , color1); + +/* Enable test pattern generation on the virtual channel */ +kmb_write_mipi (dev_p,MIPI_TXm_HS_TEST_PAT_CTRL (ctrl_no), +TP_EN_VCm (vc)); +} +#endif +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *dev_p,struct mipi_ctrl_cfg *ctrl_cfg) {
@@ -827,6 +853,11 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_p,/*Multi-Channel FIFO Configuration*/ mipi_tx_multichannel_fifo_cfg (dev_p, ctrl_cfg->active_lanes, frame_id); +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (dev_p,0 ,MIPI_TX_HS_TP_WHOLE_FRAME_COLOR0 ,0 , +0xffffffff ,0 ); +#endif +/*Frame Generator Enable */ mipi_tx_ctrl_cfg (dev_p, frame_id, ctrl_cfg);return ret;
drivers/gpu/drm/kmb/kmb_dsi.h +7 -0
@@ -200,6 +200,13 @@ enum mipi_dsi_data_type {DSI_LP_DT_RESERVED_3F =0x3f }; +enum mipi_tx_hs_tp_sel { +MIPI_TX_HS_TP_WHOLE_FRAME_COLOR0 =0 , +MIPI_TX_HS_TP_WHOLE_FRAME_COLOR1 , +MIPI_TX_HS_TP_V_STRIPES , +MIPI_TX_HS_TP_H_STRIPES , +}; +enum dphy_mode {MIPI_DPHY_SLAVE =0 ,MIPI_DPHY_MASTER
drivers/gpu/drm/kmb/kmb_regs.h +11 -0
@@ -645,6 +645,17 @@ 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 ) ((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_TX_HS_TEST_PAT_COLOR1 (0x238) +/* D-PHY regs */ #define DPHY_ENABLE (0x100)#define DPHY_INIT_CTRL0 (0x104)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 37/59 drm/kmb: Set MSS_CAM_RSTN_CTRL along with enable
In reply to Anitha ChrisanthusAlso moved num_planes init before load, time out for dsi fixed kmb regs read/write to only pass dev_p and few other minor changes.
--- drivers/gpu/drm/kmb/kmb_drv.c | 32 ++++++++++++++------------------ drivers/gpu/drm/kmb/kmb_drv.h | 34 +++++++++++++++++----------------- drivers/gpu/drm/kmb/kmb_dsi.c | 37 ++++++++++++++++++++++++++++--------- drivers/gpu/drm/kmb/kmb_plane.c | 27 +++++++++++++++++---------- drivers/gpu/drm/kmb/kmb_regs.h | 1 + 5 files changed, 77 insertions(+), 54 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +14 -18
@@ -78,11 +78,12 @@ static int kmb_display_clk_enable(void)return ret; } - ret =clk_prepare_enable (clk_msscam); +/* ret = clk_prepare_enable(clk_msscam); if (ret) { DRM_ERROR("Failed to enable MSSCAM clock: %d\n", ret); return ret; } +*/ ret =clk_prepare_enable (clk_mipi_ecfg);if (ret) {
@@ -136,6 +137,8 @@ static void __iomem *kmb_map_mmio(struct platform_device *pdev, char *name)release_mem_region (res->start, size);return ERR_PTR (-ENOMEM ); } +DRM_INFO ("%s : %d mapped %s mmio size = %d\n" , __func__, __LINE__, + name, size);return mem; }
@@ -150,13 +153,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)int ret =0 ;unsigned long clk; -/* Map LCD MMIO registers */ - dev_p->lcd_mmio =kmb_map_mmio (pdev,"lcd_regs" ); -if (IS_ERR (dev_p->lcd_mmio)) { -DRM_ERROR ("failed to map LCD registers\n" ); -return -ENOMEM ; - } -/* Map MIPI MMIO registers */ dev_p->mipi_mmio =kmb_map_mmio (pdev,"mipi_regs" );if (IS_ERR (dev_p->mipi_mmio)) {
@@ -165,6 +161,13 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)return -ENOMEM ; } +/* Map LCD MMIO registers */ + dev_p->lcd_mmio =kmb_map_mmio (pdev,"lcd_regs" ); +if (IS_ERR (dev_p->lcd_mmio)) { +DRM_ERROR ("failed to map LCD registers\n" ); +return -ENOMEM ; + } +/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and MSS_CAM_CLK_CTRL * register */
@@ -189,12 +192,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) goto setup_fail; } - clk_msscam =clk_get (&pdev->dev,"clk_msscam" ); -if (IS_ERR (clk_msscam)) { -DRM_ERROR ("clk_get() failed clk_msscam\n" ); - goto setup_fail; - } - clk_mipi_ecfg =clk_get (&pdev->dev,"clk_mipi_ecfg" );if (IS_ERR (clk_mipi_ecfg)) {DRM_ERROR ("clk_get() failed clk_mipi_ecfg\n" );
@@ -215,7 +212,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)if (clk_get_rate (clk_lcd) !=KMB_LCD_DEFAULT_CLK ) {DRM_ERROR ("failed to set to clk_lcd to %d\n" ,KMB_LCD_DEFAULT_CLK ); - goto setup_fail; }DRM_INFO ("Setting LCD clock to %d Mhz ret = %d\n" ,KMB_LCD_DEFAULT_CLK /1000000 , ret);
@@ -265,8 +261,8 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) }/* enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */ -kmb_set_bitmask_msscam (dev_p,MSS_CAM_CLK_CTRL ,LCD |MIPI_COMMON | -MIPI_TX0 ); +kmb_set_bitmask_msscam (dev_p,MSS_CAM_CLK_CTRL ,0xfff ); +kmb_set_bitmask_msscam (dev_p,MSS_CAM_RSTN_CTRL ,0xfff );#ifdef WIP /* Register irqs here - section 17.3 in databook * lists LCD at 79 and 82 for MIPI under MSS CPU -
@@ -528,6 +524,7 @@ static int kmb_probe(struct platform_device *pdev)dev_set_drvdata (dev, drm);/* Load driver */ + lcd->n_layers =KMB_MAX_PLANES ; ret =kmb_load (drm,0 );if (ret == -EPROBE_DEFER ) {DRM_INFO ("wait for external bridge driver DT\n" );
@@ -550,7 +547,6 @@ static int kmb_probe(struct platform_device *pdev)/* Register graphics device with the kernel */ ret =drm_dev_register (drm,0 ); - lcd->n_layers =KMB_MAX_PLANES ;if (ret) goto err_register;
drivers/gpu/drm/kmb/kmb_drv.h +17 -17
@@ -28,9 +28,9 @@#include "kmb_regs.h" -#define KMB_MAX_WIDTH 16384/*max width in pixels */ -#define KMB_MAX_HEIGHT 16384/*max height in pixels */ -#define KMB_LCD_DEFAULT_CLK 200000000 +#define KMB_MAX_WIDTH 1920/*max width in pixels */ +#define KMB_MAX_HEIGHT 1080/*max height in pixels */ +#define KMB_LCD_DEFAULT_CLK 24000000#define KMB_MIPI_DEFAULT_CLK 24000000struct kmb_drm_private {
@@ -130,17 +130,17 @@ static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p, unsigned int 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->lcd_mmio, reg); +u32 reg_val =kmb_read_lcd (dev_p, reg); -kmb_write_lcd (dev_p->lcd_mmio, reg, (reg_val | mask)); +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->lcd_mmio, reg); +u32 reg_val =kmb_read_lcd (dev_p, reg); -kmb_write_lcd (dev_p->lcd_mmio, reg, (reg_val & (~mask))); +kmb_write_lcd (dev_p, reg, (reg_val & (~mask))); }static inline u32 kmb_read_mipi (struct kmb_drm_private *dev_p,unsigned int reg)
@@ -151,46 +151,46 @@ static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p, unsigned int 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->mipi_mmio, reg); +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->mipi_mmio, reg, reg_val); +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->mipi_mmio, reg); +u32 reg_val =kmb_read_mipi (dev_p, reg); -kmb_write_mipi (dev_p->mipi_mmio, reg, reg_val | (1 << offset)); +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->mipi_mmio, reg); +u32 reg_val =kmb_read_mipi (dev_p, reg); -kmb_write_mipi (dev_p->mipi_mmio, reg, reg_val & (~(1 << offset))); +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->mipi_mmio, reg); +u32 reg_val =kmb_read_mipi (dev_p, reg); -kmb_write_mipi (dev_p->mipi_mmio, reg, (reg_val | mask)); +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->mipi_mmio, reg); +u32 reg_val =kmb_read_mipi (dev_p, reg); -kmb_write_mipi (dev_p->mipi_mmio, reg, (reg_val & (~mask))); +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);
drivers/gpu/drm/kmb/kmb_dsi.c +28 -9
@@ -227,12 +227,12 @@ kmb_dsi_mode_valid(struct drm_connector *connector,static int kmb_dsi_get_modes (struct drm_connector *connector) { -struct drm_display_mode *mode; -struct kmb_connector *kmb_connector =to_kmb_connector (connector); +int num_modes =0 ; - mode =drm_mode_duplicate (connector->dev, kmb_connector->fixed_mode); -drm_mode_probed_add (connector, mode); -return 1 ; + num_modes =drm_add_modes_noedid (connector, + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); +return num_modes; }static void kmb_dsi_connector_destroy (struct drm_connector *connector)
@@ -502,6 +502,8 @@ static u32 mipi_tx_fg_section_cfg_regs(struct kmb_drm_private *dev_p, cfg |= ((ph_cfg->data_mode &MIPI_TX_SECT_DM_MASK ) <<MIPI_TX_SECT_DM_SHIFT );/* bits [24:25] */ cfg |=MIPI_TX_SECT_DMA_PACKED ; +DRM_INFO ("%s : %d ctrl=%d frame_id=%d section=%d cfg=%x\n" , + __func__, __LINE__, ctrl_no, frame_id, section, cfg);kmb_write_mipi (dev_p, (MIPI_TXm_HS_FGn_SECTo_PH (ctrl_no, frame_id, section)), cfg);/*unpacked bytes */
@@ -574,7 +576,7 @@ static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *dev_p,u32 ppl_llp_ratio;u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; -/*Get system clock for blanking period cnfigurations */ +/*Get system clock for blanking period cnfigurations*/ /*TODO need to get system clock from clock driver */ /* Assume 700 Mhz system clock for now */ sysclk =700 ;
@@ -593,6 +595,7 @@ static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *dev_p, reg_adr =MIPI_TXm_HS_FGn_NUM_LINES (ctrl_no, frame_gen);kmb_write_mipi (dev_p, reg_adr, fg_cfg->v_active); +DRM_INFO ("%s : %d\n" , __func__, __LINE__);/*vsync width */ /* *there are 2 registers for vsync width -VSA in lines for channels 0-3
@@ -646,6 +649,7 @@ static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *dev_p, reg_adr =MIPI_TXm_HS_LLP_H_BACKPORCHn (ctrl_no, frame_gen);kmb_write_mipi (dev_p, reg_adr, fg_cfg->h_backporch * (fg_cfg->bpp /8 )); +DRM_INFO ("%s : %d\n" , __func__, __LINE__);/* llp h frontporch */ reg_adr =MIPI_TXm_HS_LLP_H_FRONTPORCHn (ctrl_no, frame_gen); kmb_write_mipi(dev_p, reg_adr,
@@ -807,13 +811,11 @@ static u32 mipi_tx_init_cntrl(struct kmb_drm_private *dev_p,* set mipitxcctrlcfg */ -DRM_INFO ("%s : %d\n" , __func__, __LINE__);for (frame_id =0 ; frame_id <4 ; frame_id++) {/* find valid frame, assume only one valid frame */ if (ctrl_cfg->tx_ctrl_cfg.frames[frame_id] ==NULL )continue ; -DRM_INFO ("%s : %d\n" , __func__, __LINE__);/* Frame Section configuration */ /*TODO - assume there is only one valid section in a frame, so * bits_per_pclk and word_count are only set once
@@ -1231,13 +1233,18 @@ static void dphy_wait_fsm(struct kmb_drm_private *dev_p, u32 dphy_no, enum dphy_tx_fsm fsm_state) {enum dphy_tx_fsm val =DPHY_TX_POWERDWN ; +int i =0 ;do {test_mode_send (dev_p, dphy_no,TEST_CODE_FSM_CONTROL ,0x80 );/*TODO-need to add a time out and return failure */ val =GET_TEST_DOUT0_3 (dev_p, dphy_no); + i++; +if (i >50000 ) { +DRM_INFO ("%s: timing out\n" , __func__); +break ; + } }while (val != fsm_state); - } static u32 wait_init_done(struct kmb_drm_private *dev_p, u32 dphy_no,
@@ -1245,10 +1252,16 @@ static u32 wait_init_done(struct kmb_drm_private *dev_p, u32 dphy_no, {u32 stopstatedata =0 ;u32 data_lanes = (1 << active_lanes) -1 ; +int i =0 ;do { stopstatedata =GET_STOPSTATE_DATA (dev_p, dphy_no);/*TODO-need to add a time out and return failure */ + i++; +if (i >50000 ) { +DRM_INFO ("%s: timing out" , __func__); +break ; + } }while (stopstatedata != data_lanes);return 0 ;
@@ -1256,9 +1269,15 @@ static u32 wait_init_done(struct kmb_drm_private *dev_p, u32 dphy_no,static u32 wait_pll_lock (struct kmb_drm_private *dev_p,u32 dphy_no) { +int i =0 ;do { ;/*TODO-need to add a time out and return failure */ + i++; +if (i >50000 ) { +DRM_INFO ("wait_pll_lock: timing out\n" ); +break ; + } }while (!GET_PLL_LOCK (dev_p, dphy_no));return 0 ;
drivers/gpu/drm/kmb/kmb_plane.c +17 -10
@@ -498,7 +498,7 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm)struct kmb_plane *plane =NULL ;struct kmb_plane *primary =NULL ;int i =0 ; -int ret; +int ret =0 ;enum drm_plane_type plane_type;const uint32_t *plane_formats;int num_plane_formats;
@@ -507,11 +507,13 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm) plane =devm_kzalloc (drm->dev,sizeof (*plane),GFP_KERNEL ); -if (!plane) +if (!plane) { +DRM_ERROR ("Failed to allocate plane\n" );return ERR_PTR (-ENOMEM ); + } plane_type = (i ==0 ) ?DRM_PLANE_TYPE_PRIMARY : -DRM_PLANE_TYPE_OVERLAY ; +DRM_PLANE_TYPE_OVERLAY ;if (i <2 ) { plane_formats = kmb_formats_v; num_plane_formats =ARRAY_SIZE (kmb_formats_v);
@@ -520,13 +522,16 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm) 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 ) + 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_ERROR ("drm_universal_plane_init -failed with ret=%d" + , ret); goto cleanup; + }drm_plane_helper_add (&plane->base_plane, &kmb_plane_helper_funcs);
@@ -537,6 +542,8 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm) plane->id = i; } -cleanup:return primary; +cleanup: +kfree (plane); +return ERR_PTR (ret); }
drivers/gpu/drm/kmb/kmb_regs.h +1 -0
@@ -713,6 +713,7 @@#define LCD (1<<1)#define MIPI_COMMON (1<<2)#define MIPI_TX0 (1<<9) +#define MSS_CAM_RSTN_CTRL (0x14)#define BIT_MASK_16 (0xffff)#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 38/59 drm/kmb: Mipi DPHY initialization changes
In reply to Anitha ChrisanthusFix test_mode_send and dphy_wait_fsm for 2-lane MIPI
- Fix test_mode_send when sending normal mode test codes
- Change dphy_wait_fsm to check for IDLE status rather than LOCK status for 2-lane MIPI
--- drivers/gpu/drm/kmb/kmb_crtc.c | 23 +- drivers/gpu/drm/kmb/kmb_drv.c | 90 ++-- drivers/gpu/drm/kmb/kmb_drv.h | 23 +- drivers/gpu/drm/kmb/kmb_dsi.c | 904 +++++++++++++++++++++++++++++----------- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 59 ++- drivers/gpu/drm/kmb/kmb_regs.h | 34 +- 7 files changed, 840 insertions(+), 295 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +17 -6
@@ -41,6 +41,7 @@#include "kmb_drv.h" #include "kmb_plane.h" #include "kmb_regs.h" +#include "kmb_dsi.h" static void kmb_crtc_cleanup (struct drm_crtc *crtc) {
@@ -93,23 +94,33 @@ static const struct drm_crtc_funcs kmb_crtc_funcs = {static void kmb_crtc_mode_set_nofb (struct drm_crtc *crtc) { -struct drm_display_mode *m = &crtc->state->adjusted_mode;struct drm_device *dev = crtc->dev; +#ifdef LCD_TEST +struct drm_display_mode *m = &crtc->state->adjusted_mode;struct videomode vm;int vsync_start_offset;int vsync_end_offset;unsigned int ctrl =0 ; - +#endif +/* initialize mipi */ +kmb_dsi_hw_init (dev); +#ifdef LCD_TEST vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; - vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; +//vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; + vm.hfront_porch =0 ; vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; +DRM_INFO ("%s : %dactive height= %d vbp=%d vfp=%d vsync-w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d\n" , + __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 (dev->dev_private,LCD_V_ACTIVEHEIGHT , m->crtc_vdisplay -1 );kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH , vm.vback_porch -1 );
@@ -144,7 +155,7 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_CONTROL , ctrl);kmb_write_lcd (dev->dev_private,LCD_TIMING_GEN_TRIG ,ENABLE ); - +#endif /* TBD */ /* set clocks here */ }
@@ -156,7 +167,7 @@ static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,clk_prepare_enable (lcd->clk);kmb_crtc_mode_set_nofb (crtc); -drm_crtc_vblank_on (crtc); +// drm_crtc_vblank_on(crtc); } static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -167,7 +178,7 @@ static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,/* always disable planes on the CRTC that is being turned off */ drm_atomic_helper_disable_planes_on_crtc (old_state, false); -drm_crtc_vblank_off (crtc); +// drm_crtc_vblank_off(crtc); clk_disable_unprepare (lcd->clk); }
drivers/gpu/drm/kmb/kmb_drv.c +62 -28
223 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.h +22 -1
@@ -28,16 +28,19 @@#include "kmb_regs.h" +/*#define FCCTEST*/ #define KMB_MAX_WIDTH 1920/*max width in pixels */ #define KMB_MAX_HEIGHT 1080/*max height in pixels */ -#define KMB_LCD_DEFAULT_CLK 24000000 +#define KMB_LCD_DEFAULT_CLK 250000000#define KMB_MIPI_DEFAULT_CLK 24000000 +#define KMB_MIPI_DEFAULT_CFG_CLK 24000000struct kmb_drm_private {struct drm_device drm;void __iomem *lcd_mmio;void __iomem *mipi_mmio;void __iomem *msscam_mmio; +void __iomem *cpr_mmio;unsigned char n_layers;struct clk *clk;struct drm_crtc crtc;
@@ -88,12 +91,23 @@ static inline void kmb_write_bits(struct kmb_drm_private *lcd, reg_val |= (value << offset);writel (reg_val, lcd->mmio + reg); } +static inline void kmb_write (unsigned int reg,u32 value) +{ +writel (value, reg); +} + +static inline u32 kmb_read (unsigned int reg) +{ +return readl (reg); +}#endif static inline void kmb_write_lcd (struct kmb_drm_private *dev_p,unsigned int reg,u32 value) { +#ifdef LCD_TEST writel (value, (dev_p->lcd_mmio + reg)); +#endif } static inline void kmb_write_mipi(struct kmb_drm_private *dev_p,
@@ -124,23 +138,30 @@ static inline void kmb_set_bitmask_msscam(struct kmb_drm_private *dev_p,static inline u32 kmb_read_lcd (struct kmb_drm_private *dev_p,unsigned int reg) { +#ifdef LCD_TEST return readl (dev_p->lcd_mmio + reg); +#endif +return 0 ; }static inline void kmb_set_bitmask_lcd (struct kmb_drm_private *dev_p,unsigned int reg,u32 mask) { +#ifdef LCD_TEST u32 reg_val =kmb_read_lcd (dev_p, reg);kmb_write_lcd (dev_p, reg, (reg_val | mask)); +#endif }static inline void kmb_clr_bitmask_lcd (struct kmb_drm_private *dev_p,unsigned int reg,u32 mask) { +#ifdef LCD_TEST u32 reg_val =kmb_read_lcd (dev_p, reg);kmb_write_lcd (dev_p, reg, (reg_val & (~mask))); +#endif }static inline u32 kmb_read_mipi (struct kmb_drm_private *dev_p,unsigned int reg)
drivers/gpu/drm/kmb/kmb_dsi.c +651 -253
1,524 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +1 -1
@@ -63,7 +63,6 @@ struct kmb_connector {#define MIPI_DPHY_DEFAULT_BIT_RATES 63/*DPHY Tx test codes */ -#define TEST_CODE_MULTIPLE_PHY_CTRL 0x03enum mipi_ctrl_num {MIPI_CTRL0 =0 ,
@@ -341,6 +340,7 @@ int kmb_dsi_init(struct drm_device *dev, struct drm_bridge *bridge);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);void dsi_host_unregister (void ); +int kmb_dsi_hw_init (struct drm_device *dev);#define to_kmb_connector (x) container_of(x, struct kmb_connector, base)#define to_kmb_host (x) container_of(x, struct kmb_dsi_host, base)
drivers/gpu/drm/kmb/kmb_plane.c +55 -4
112 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_regs.h +32 -2
@@ -29,6 +29,7 @@#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)
@@ -544,6 +545,9 @@#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)
@@ -572,6 +576,7 @@#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))
@@ -649,12 +654,16 @@#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 ) ((M) * 0x04) +#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)
@@ -670,15 +679,25 @@#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))
@@ -700,8 +719,15 @@ 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 + 4) \ + (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) \
@@ -714,6 +740,10 @@#define MIPI_COMMON (1<<2)#define MIPI_TX0 (1<<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)#endif /* __KMB_REGS_H__ */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 39/59 drm/kmb: Fixed driver unload
In reply to Anitha Chrisanthusunmap MSSCAM registers
--- drivers/gpu/drm/kmb/kmb_drv.c | 15 +++------------ drivers/gpu/drm/kmb/kmb_drv.h | 1 - drivers/gpu/drm/kmb/kmb_regs.h | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +3 -12
@@ -179,17 +179,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)iounmap (dev_p->mipi_mmio);return -ENOMEM ; } -/*testing*/ -if (!request_mem_region (CPR_BASE_ADDR ,100 ,"cpr" )) { -DRM_ERROR ("failed to reserve %s registers\n" ,"cpr" ); -return -ENOMEM ; - } - dev_p->cpr_mmio =ioremap_cache (CPR_BASE_ADDR ,0x100 ); -if (!dev_p->cpr_mmio) { -DRM_ERROR ("failed to ioremap %s registers\n" ,"CPR" ); -release_mem_region (CPR_BASE_ADDR ,100 ); -return -ENOMEM ; - }if (IS_ERR (dev_p->msscam_mmio)) {DRM_ERROR ("failed to map MSSCAM registers\n" );
@@ -509,8 +498,10 @@ static void kmb_drm_unload(struct device *dev)release_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); } -if (dev_p->msscam_mmio) +if (dev_p->msscam_mmio) {iounmap (dev_p->msscam_mmio); +release_mem_region (MSS_CAM_BASE_ADDR ,MSS_CAM_MMIO_SIZE ); + }of_reserved_mem_device_release (drm->dev);drm_mode_config_cleanup (drm);
drivers/gpu/drm/kmb/kmb_drv.h +0 -1
@@ -40,7 +40,6 @@ struct kmb_drm_private {void __iomem *lcd_mmio;void __iomem *mipi_mmio;void __iomem *msscam_mmio; -void __iomem *cpr_mmio;unsigned char n_layers;struct clk *clk;struct drm_crtc crtc;
drivers/gpu/drm/kmb/kmb_regs.h +1 -1
@@ -36,7 +36,7 @@#define MSS_CAM_BASE_ADDR (MIPI_BASE_ADDR + 0x10000)#define LCD_MMIO_SIZE (0x3000)#define MIPI_MMIO_SIZE (0x4000) -#define MSS_CAM_MMIO_SIZE (0x10) +#define MSS_CAM_MMIO_SIZE (0x30)/*************************************************************************** * LCD controller control register defines
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 40/59 drm/kmb: Added LCD_TEST config
In reply to Anitha ChrisanthusTo run modetest without ADV driver, enable LCD_TEST and FCC_TEST. Also made front porches 0, and some changes in the plane init.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 13 +++---- drivers/gpu/drm/kmb/kmb_drv.c | 6 +-- drivers/gpu/drm/kmb/kmb_drv.h | 3 +- drivers/gpu/drm/kmb/kmb_dsi.c | 85 +++++++++++++++++++++++++++-------------- drivers/gpu/drm/kmb/kmb_plane.c | 15 ++++++-- 5 files changed, 78 insertions(+), 44 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +5 -8
@@ -100,13 +100,14 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)struct videomode vm;int vsync_start_offset;int vsync_end_offset; -unsigned int ctrl =0 ;#endif /* initialize mipi */ kmb_dsi_hw_init (dev);#ifdef LCD_TEST - vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; - vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; +// vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; + vm.vfront_porch =0 ; +// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; + vm.vback_porch =0 ; vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start;//vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; vm.hfront_porch =0 ;
@@ -149,12 +150,8 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) kmb_write_lcd(dev->dev_private, LCD_VSYNC_END_EVEN, 10); }/* enable VL1 layer as default */ - ctrl =LCD_CTRL_ENABLE |LCD_CTRL_VL1_ENABLE ; - ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE - |LCD_CTRL_OUTPUT_ENABLED ; -kmb_write_lcd (dev->dev_private,LCD_CONTROL , ctrl); -kmb_write_lcd (dev->dev_private,LCD_TIMING_GEN_TRIG ,ENABLE ); +kmb_set_bitmask_lcd (dev->dev_private,LCD_CONTROL ,LCD_CTRL_ENABLE );#endif /* TBD */ /* set clocks here */
drivers/gpu/drm/kmb/kmb_drv.c +3 -3
@@ -236,6 +236,8 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)#endif /* Set MIPI clock to 24 Mhz*/ DRM_INFO ("Get clk_mipi before set = %ld\n" ,clk_get_rate (clk_mipi)); +//#define MIPI_CLK +#ifdef MIPI_CLK ret =clk_set_rate (clk_mipi,KMB_MIPI_DEFAULT_CLK );DRM_INFO ("Get clk_mipi after set = %ld\n" ,clk_get_rate (clk_mipi));if (clk_get_rate (clk_mipi) !=KMB_MIPI_DEFAULT_CLK ) {
@@ -243,6 +245,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags) KMB_MIPI_DEFAULT_CLK); goto setup_fail; } +#endif DRM_INFO ("Setting MIPI clock to %d Mhz ret = %d\n" ,KMB_MIPI_DEFAULT_CLK /1000000 , ret);DRM_INFO ("Get clk_mipi after set = %ld\n" ,clk_get_rate (clk_mipi));
@@ -339,8 +342,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_ERROR ("failed to initialize DSI\n" ); goto setup_fail; } - -DRM_INFO ("%s : %d\n" , __func__, __LINE__);#ifdef WIP ret =drm_irq_install (drm,platform_get_irq (pdev,0 ));if (ret <0 ) {
@@ -355,7 +356,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)drm_crtc_cleanup (&dev_p->crtc);#endif setup_fail: -DRM_INFO ("%s : %d\n" , __func__, __LINE__);of_reserved_mem_device_release (drm->dev);return ret;
drivers/gpu/drm/kmb/kmb_drv.h +2 -1
@@ -28,7 +28,8 @@#include "kmb_regs.h" -/*#define FCCTEST*/ +#define FCCTEST +#define LCD_TEST #define KMB_MAX_WIDTH 1920/*max width in pixels */ #define KMB_MAX_HEIGHT 1080/*max height in pixels */ #define KMB_LCD_DEFAULT_CLK 250000000
drivers/gpu/drm/kmb/kmb_dsi.c +57 -28
203 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c +11 -4
@@ -367,10 +367,14 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,kmb_set_bitmask_lcd (dev_p,LCD_INT_ENABLE , layer_irqs[plane_id]);/*TBD check visible? */ - +/* dma_cfg = LCD_DMA_LAYER_ENABLE | LCD_DMA_LAYER_AUTO_UPDATE | LCD_DMA_LAYER_CONT_UPDATE | LCD_DMA_LAYER_AXI_BURST_1 | LCD_DMA_LAYER_VSTRIDE_EN; +*/ + dma_cfg =LCD_DMA_LAYER_ENABLE + |LCD_DMA_LAYER_AXI_BURST_1 + |LCD_DMA_LAYER_VSTRIDE_EN ;/* disable DMA first */ kmb_write_lcd(dev_p, LCD_LAYERn_DMA_CFG(plane_id),
@@ -447,10 +451,12 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,break ; } - ctrl |=LCD_CTRL_ENABLE ; - ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE - |LCD_CTRL_CONTINUOUS |LCD_CTRL_OUTPUT_ENABLED ; +// ctrl |= LCD_CTRL_ENABLE; +// ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE +// | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED; + ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE + |LCD_CTRL_ONE_SHOT |LCD_CTRL_OUTPUT_ENABLED ;/*LCD is connected to MIPI on kmb * Therefore this bit is required for DSI Tx */
@@ -474,6 +480,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,/* do not interleave RGB channels for mipi Tx compatibility */ out_format |=LCD_OUTF_MIPI_RGB_MODE ;kmb_write_lcd (dev_p,LCD_OUT_FORMAT_CFG , out_format); +// kmb_write_lcd(dev_p, LCD_CONTROL, LCD_CTRL_ENABLE); #endif }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 41/59 drm/kmb: Changes for LCD to Mipi
In reply to Anitha ChrisanthusAlso free dsi resources on driver unload. System clock frequency change for llp ratio calculation.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 21 ++++--- drivers/gpu/drm/kmb/kmb_drv.c | 6 +- drivers/gpu/drm/kmb/kmb_drv.h | 1 + drivers/gpu/drm/kmb/kmb_dsi.c | 135 +++++++++++----------------------------- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 24 +++---- drivers/gpu/drm/kmb/kmb_regs.h | 2 + 7 files changed, 68 insertions(+), 123 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +12 -9
@@ -108,11 +108,14 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) vm.vfront_porch =0 ;// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; vm.vback_porch =0 ; - vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; +// vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; + vm.vsync_len =1 ;//vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; vm.hfront_porch =0 ; - vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; - vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; + vm.hback_porch =0 ; +//vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; + vm.hsync_len =1 ; +// vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end;
@@ -124,13 +127,13 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) vm.hback_porch, vm.hfront_porch, vm.hsync_len);kmb_write_lcd (dev->dev_private,LCD_V_ACTIVEHEIGHT , m->crtc_vdisplay -1 ); -kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH , vm.vback_porch -1 ); -kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH , vm.vfront_porch -1 ); +kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH , vm.vback_porch); +kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH , vm.vfront_porch);kmb_write_lcd (dev->dev_private,LCD_VSYNC_WIDTH , vm.vsync_len -1 );kmb_write_lcd (dev->dev_private,LCD_H_ACTIVEWIDTH , m->crtc_hdisplay -1 ); -kmb_write_lcd (dev->dev_private,LCD_H_BACKPORCH , vm.hback_porch -1 ); -kmb_write_lcd (dev->dev_private,LCD_H_FRONTPORCH , vm.hfront_porch -1 ); +kmb_write_lcd (dev->dev_private,LCD_H_BACKPORCH , vm.hback_porch); +kmb_write_lcd (dev->dev_private,LCD_H_FRONTPORCH , vm.hfront_porch);kmb_write_lcd (dev->dev_private,LCD_HSYNC_WIDTH , vm.hsync_len -1 );/*this is hardcoded as 0 in the Myriadx code */ kmb_write_lcd (dev->dev_private,LCD_VSYNC_START ,0 );
@@ -140,9 +143,9 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 );kmb_write_lcd (dev->dev_private, -LCD_V_BACKPORCH_EVEN , vm.vback_porch -1 ); +LCD_V_BACKPORCH_EVEN , vm.vback_porch);kmb_write_lcd (dev->dev_private, -LCD_V_FRONTPORCH_EVEN , vm.vfront_porch -1 ); +LCD_V_FRONTPORCH_EVEN , vm.vfront_porch);kmb_write_lcd (dev->dev_private,LCD_V_ACTIVEHEIGHT_EVEN , m->crtc_vdisplay -1 );/*this is hardcoded as 10 in the Myriadx code*/
drivers/gpu/drm/kmb/kmb_drv.c +3 -3
@@ -236,7 +236,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)#endif /* Set MIPI clock to 24 Mhz*/ DRM_INFO ("Get clk_mipi before set = %ld\n" ,clk_get_rate (clk_mipi)); -//#define MIPI_CLK +#define MIPI_CLK #ifdef MIPI_CLK ret =clk_set_rate (clk_mipi,KMB_MIPI_DEFAULT_CLK );DRM_INFO ("Get clk_mipi after set = %ld\n" ,clk_get_rate (clk_mipi));
@@ -516,7 +516,7 @@ static void kmb_drm_unload(struct device *dev)dev_set_drvdata (dev,NULL );/* Unregister DSI host */ -dsi_host_unregister (); +kmb_dsi_host_unregister (); }static int kmb_probe (struct platform_device *pdev)
@@ -587,7 +587,7 @@ static int kmb_probe(struct platform_device *pdev)drm_mode_config_cleanup (drm);dev_set_drvdata (dev,NULL );drm_dev_put (drm); -dsi_host_unregister (); +kmb_dsi_host_unregister ();return ret; }
drivers/gpu/drm/kmb/kmb_drv.h +1 -0
@@ -35,6 +35,7 @@#define KMB_LCD_DEFAULT_CLK 250000000#define KMB_MIPI_DEFAULT_CLK 24000000#define KMB_MIPI_DEFAULT_CFG_CLK 24000000 +#define KMB_SYS_CLK_MHZ 500struct kmb_drm_private {struct drm_device drm;
drivers/gpu/drm/kmb/kmb_dsi.c +37 -98
212 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +1 -1
@@ -339,7 +339,7 @@ struct drm_bridge *kmb_dsi_host_bridge_init(struct device *dev);int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p); -void dsi_host_unregister (void ); +void kmb_dsi_host_unregister (void );int kmb_dsi_hw_init (struct drm_device *dev);#define to_kmb_connector (x) container_of(x, struct kmb_connector, base)
drivers/gpu/drm/kmb/kmb_plane.c +12 -12
@@ -290,6 +290,8 @@ unsigned int set_bits_per_pixel(const struct drm_format_info *format) val =LCD_LAYER_32BPP ;break ; } +DRM_INFO ("%s : %d bpp=0x%x\n" , __func__, __LINE__, bpp); + val =LCD_LAYER_24BPP ;return val; }
@@ -372,9 +374,8 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,| LCD_DMA_LAYER_CONT_UPDATE | LCD_DMA_LAYER_AXI_BURST_1 | LCD_DMA_LAYER_VSTRIDE_EN; */ - dma_cfg =LCD_DMA_LAYER_ENABLE - |LCD_DMA_LAYER_AXI_BURST_1 - |LCD_DMA_LAYER_VSTRIDE_EN ; + dma_cfg =LCD_DMA_LAYER_ENABLE |LCD_DMA_LAYER_VSTRIDE_EN + |LCD_DMA_LAYER_AXI_BURST_16 |LCD_DMA_LAYER_CONT_UPDATE ;/* disable DMA first */ kmb_write_lcd(dev_p, LCD_LAYERn_DMA_CFG(plane_id),
@@ -390,14 +391,13 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, width = fb->width; height = fb->height; - dma_len = width * height * fb->format->cpp[0 ]; + dma_len = width * height *1 ;kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len);kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), dma_len); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), - fb->pitches[0 ]); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), width);kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), - (width*fb->format->cpp[0 ])); + (width));/*program Cb/Cr for planar formats*/ if (num_planes >1 ) {
@@ -452,11 +452,11 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, }// ctrl |= LCD_CTRL_ENABLE; -// ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE -// | LCD_CTRL_CONTINUOUS | LCD_CTRL_OUTPUT_ENABLED; - ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE - |LCD_CTRL_ONE_SHOT |LCD_CTRL_OUTPUT_ENABLED ; + |LCD_CTRL_CONTINUOUS |LCD_CTRL_OUTPUT_ENABLED ; + +// ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE +// | LCD_CTRL_ONE_SHOT | LCD_CTRL_OUTPUT_ENABLED; /*LCD is connected to MIPI on kmb * Therefore this bit is required for DSI Tx */
@@ -475,7 +475,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, }/*set background color to white*/ -kmb_write_lcd (dev_p,LCD_BG_COLOUR_LS ,0xffffff ); +// kmb_write_lcd(dev_p, LCD_BG_COLOUR_LS, 0xffffff); /*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 ;
drivers/gpu/drm/kmb/kmb_regs.h +2 -0
@@ -734,8 +734,10 @@ & (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 (1<<1)#define MIPI_COMMON (1<<2)#define MIPI_TX0 (1<<9)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 42/59 drm/kmb: Update LCD programming to match MIPI
In reply to Anitha ChrisanthusMipi input expects the memory layout to be unpacked with 8 bits per pixel in RGB (BRG) order. If the LCD is not configured properly, corrupted output results, changed dma_unpacked to 0 in mipi FG.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 6 +++--- drivers/gpu/drm/kmb/kmb_drv.h | 1 + drivers/gpu/drm/kmb/kmb_dsi.c | 27 +++++++++++++++++---------- drivers/gpu/drm/kmb/kmb_dsi.h | 1 + drivers/gpu/drm/kmb/kmb_plane.c | 37 +++++++++++++++++++++++++++---------- drivers/gpu/drm/kmb/kmb_regs.h | 1 + 6 files changed, 50 insertions(+), 23 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +3 -3
@@ -105,16 +105,16 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)kmb_dsi_hw_init (dev);#ifdef LCD_TEST // vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; - vm.vfront_porch =0 ; + vm.vfront_porch =2 ;// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; - vm.vback_porch =0 ; + vm.vback_porch =2 ;// vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; vm.vsync_len =1 ;//vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; vm.hfront_porch =0 ; vm.hback_porch =0 ;//vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; - vm.hsync_len =1 ; + vm.hsync_len =7 ;// vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start;
drivers/gpu/drm/kmb/kmb_drv.h +1 -0
@@ -50,6 +50,7 @@ struct kmb_drm_private {spinlock_t irq_lock;int irq_lcd;int irq_mipi; +dma_addr_t fb_addr; };static inline struct kmb_drm_private *to_kmb (const struct drm_device *dev)
drivers/gpu/drm/kmb/kmb_dsi.c +17 -10
@@ -45,6 +45,7 @@static int hw_initialized;#define IMAGE_PATH "/home/root/1280x720.pnm"//#define MIPI_TX_TEST_PATTERN_GENERATION +//#define MIPI_DMA //#define RTL_TEST //#define IMG_WIDTH_PX 640 //#define IMG_HEIGHT_LINES 10
@@ -53,6 +54,7 @@ static int hw_initialized;/*MIPI TX CFG*/ //#define MIPI_TX_LANE_DATA_RATE_MBPS 1782 +//#define MIPI_TX_LANE_DATA_RATE_MBPS 800 #define MIPI_TX_LANE_DATA_RATE_MBPS 891//#define MIPI_TX_LANE_DATA_RATE_MBPS 80 #define MIPI_TX_REF_CLK_KHZ 24000
@@ -100,14 +102,14 @@ static struct mipi_dsi_device *dsi_device;* these will eventually go to the device tree sections, * and can be used as a refernce later for device tree additions */ -//#define RES_1920x1080 +#define RES_1920x1080#ifdef RES_1920x1080#define IMG_HEIGHT_LINES 1080#define IMG_WIDTH_PX 1920#define MIPI_TX_ACTIVE_LANES 4#endif -#define RES_1280x720 +//#define RES_1280x720 #ifdef RES_1280x720#define IMG_HEIGHT_LINES 720#define IMG_WIDTH_PX 1280
@@ -117,9 +119,9 @@ struct mipi_tx_frame_section_cfg mipi_tx_frame0_sect_cfg = { .width_pixels = IMG_WIDTH_PX, .height_lines = IMG_HEIGHT_LINES, .data_type = DSI_LP_DT_PPS_RGB888_24B, -//.data_mode = MIPI_DATA_MODE1, - .data_mode = MIPI_DATA_MODE0, - .dma_packed =1 + .data_mode = MIPI_DATA_MODE1, +// .data_mode = MIPI_DATA_MODE0, + .dma_packed =0 };#ifdef RES_1920x1080
@@ -564,12 +566,15 @@ static u32 mipi_tx_fg_section_cfg_regs(struct kmb_drm_private *dev_p, << MIPI_TX_SECT_VC_SHIFT); /* bits [23:22] *//* data mode */ cfg |= ((ph_cfg->data_mode &MIPI_TX_SECT_DM_MASK ) - <<MIPI_TX_SECT_DM_SHIFT );/* bits [24:25] */ - cfg |=MIPI_TX_SECT_DMA_PACKED ; -DRM_INFO ("%s : %d ctrl=%d frame_id=%d section=%d cfg=%x\n" , - __func__, __LINE__, ctrl_no, frame_id, section, cfg); + <<MIPI_TX_SECT_DM_SHIFT );/* bits [24:25]*/ +if (ph_cfg->dma_packed) + cfg |=MIPI_TX_SECT_DMA_PACKED ; +DRM_INFO ("%s : %d ctrl=%d frame_id=%d section=%d cfg=%x packed=%d\n" , + __func__, __LINE__, ctrl_no, frame_id, section, cfg, + ph_cfg->dma_packed);kmb_write_mipi (dev_p, (MIPI_TXm_HS_FGn_SECTo_PH (ctrl_no, frame_id, - section)), cfg); + section)), cfg); +/*unpacked bytes */ /*there are 4 frame generators and each fg has 4 sections *there are 2 registers for unpacked bytes -
@@ -621,6 +626,7 @@ static u32 mipi_tx_fg_section_cfg(struct kmb_drm_private *dev_p, u8 frame_id, ph_cfg.wc = *wc; ph_cfg.data_mode = frame_scfg->data_mode; ph_cfg.data_type = frame_scfg->data_type; + ph_cfg.dma_packed = frame_scfg->dma_packed; ph_cfg.vchannel = frame_id; mipi_tx_fg_section_cfg_regs(dev_p, frame_id, section,
@@ -647,6 +653,7 @@ static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *dev_p,* mipi clock speed in RTL tests */ sysclk =KMB_SYS_CLK_MHZ -50 ; +// sysclk = KMB_SYS_CLK_MHZ; /*ppl-pixel packing layer, llp-low level protocol * frame genartor timing parameters are clocked on the system clock
drivers/gpu/drm/kmb/kmb_dsi.h +1 -0
@@ -282,6 +282,7 @@ struct mipi_tx_frame_sect_phcfg {enum mipi_data_mode data_mode;enum mipi_dsi_data_type data_type;uint8_t vchannel; +uint8_t dma_packed; };struct mipi_tx_frame_cfg {
drivers/gpu/drm/kmb/kmb_plane.c +27 -10
@@ -116,6 +116,7 @@ static const u32 csc_coef_lcd[] = { -179, 125, -226 }; +static unsigned int check_pixel_format (struct drm_plane *plane,u32 format) {int i;
@@ -264,17 +265,21 @@ unsigned int set_pixel_format(u32 format) val =LCD_LAYER_FORMAT_RGBA8888 |LCD_LAYER_BGR_ORDER ;break ; } +DRM_INFO ("%s : %d layer format val=%d\n" , __func__, __LINE__, val);return val; }unsigned int set_bits_per_pixel (const struct drm_format_info *format) { -int i;u32 bpp =0 ;unsigned int val =0 ; -for (i =0 ; i < format->num_planes; i++) - bpp +=8 * format->cpp[i]; +if (format->num_planes >1 ) { + val =LCD_LAYER_8BPP ; +return val; + } + + bpp +=8 *format->cpp[0 ];switch (bpp) {case 8 :
@@ -290,8 +295,8 @@ unsigned int set_bits_per_pixel(const struct drm_format_info *format) val =LCD_LAYER_32BPP ;break ; } -DRM_INFO ("%s : %d bpp=0x%x\n" , __func__, __LINE__, bpp); - val =LCD_LAYER_24BPP ; + +DRM_INFO ("%s : %d bpp=%d val=%d\n" , __func__, __LINE__, bpp, val);return val; }
@@ -347,11 +352,12 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, dev_p = plane->dev->dev_private; - src_w = plane->state->src_w >>16 ; + 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_INFO ("src_w=%d src_h=%d\n" , src_w, src_h);kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w-1 );kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h-1 );kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x);
@@ -361,6 +367,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, val |=set_bits_per_pixel (fb->format);/*CHECKME Leon drvr sets it to 100 try this for now */ val |=LCD_LAYER_FIFO_100 ; + val |=LCD_LAYER_BGR_ORDER ;kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val);/*re-initialize interrupts */
@@ -375,29 +382,33 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,| LCD_DMA_LAYER_VSTRIDE_EN; */ dma_cfg =LCD_DMA_LAYER_ENABLE |LCD_DMA_LAYER_VSTRIDE_EN - |LCD_DMA_LAYER_AXI_BURST_16 |LCD_DMA_LAYER_CONT_UPDATE ; + |LCD_DMA_LAYER_AXI_BURST_16 | +LCD_DMA_LAYER_CONT_PING_PONG_UPDATE ;/* disable DMA first */ kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), ~LCD_DMA_LAYER_ENABLE ); +kmb_write_lcd (dev_p,LCD_FIFO_FLUSH + plane_id*0x400 ,1 );/* pinpong mode is enabled - at the end of DMA transfer, start new * transfer alternatively using main and shadow register settings. * So update both main and shadow registers */ addr =drm_fb_cma_get_gem_addr (fb, plane->state,0 ); + dev_p->fb_addr = addr;kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), addr);kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_SHADOW (plane_id), addr); width = fb->width; height = fb->height; - dma_len = width * height *1 ; + dma_len = width * height * fb->format->cpp[0 ];kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len);kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), dma_len); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), width); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), + fb->pitches[0 ]);kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), - (width)); + (width*fb->format->cpp[0 ]));/*program Cb/Cr for planar formats*/ if (num_planes >1 ) {
@@ -435,6 +446,9 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,/* enable DMA */ kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +DRM_INFO ("%s : %d dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , __func__, + __LINE__, dma_cfg, +kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id)));switch (plane_id) {case LAYER_0 :
@@ -468,6 +482,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,* from the Myriadx tests */ out_format |=LCD_OUTF_FORMAT_RGB888 ; +// out_format |= LCD_OUTF_BGR_ORDER; if (val &LCD_LAYER_PLANAR_STORAGE ) {/*enable CSC if input is planar and output is RGB */
@@ -479,7 +494,9 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,/*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 ; +// out_format |= LCD_OUTF_SYNC_MODE ; kmb_write_lcd (dev_p,LCD_OUT_FORMAT_CFG , out_format); +// kmb_write_lcd(dev_p, LCD_CONTROL, LCD_CTRL_ENABLE); #endif }
drivers/gpu/drm/kmb/kmb_regs.h +1 -0
@@ -370,6 +370,7 @@#define LCD_OUTF_BGR_ORDER (1 << 5)#define LCD_OUTF_Y_ORDER (1 << 6)#define LCD_OUTF_CRCB_ORDER (1 << 7) +#define LCD_OUTF_SYNC_MODE (1 << 11)#define LCD_OUTF_RGB_CONV_MODE (1 << 14)#define LCD_OUTF_MIPI_RGB_MODE (1 << 18)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 43/59 drm/kmb: Changed name of driver to kmb-drm
In reply to Anitha Chrisanthusname change
--- drivers/gpu/drm/kmb/Makefile | 4 ++-- drivers/gpu/drm/kmb/kmb_drv.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/kmb/Makefile +2 -2
@@ -1,2 +1,2 @@ -kmb-display-y := kmb_crtc.o kmb_drv.o kmb_plane.o kmb_dsi.o -obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb-display.o +kmb-drm-y := kmb_crtc.o kmb_drv.o kmb_plane.o kmb_dsi.o +obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb-drm.o
drivers/gpu/drm/kmb/kmb_drv.c +2 -2
@@ -466,7 +466,7 @@ static struct drm_driver kmb_driver = { .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, .fops = &fops, - .name = "kmb_display", + .name = "kmb-drm", .desc = "KEEMBAY DISPLAY DRIVER ", .date = "20190122", .major = 1,
@@ -644,7 +644,7 @@ static struct platform_driver kmb_platform_driver = { .probe = kmb_probe, .remove = kmb_remove, .driver = { - .name = "kmb_display", + .name = "kmb-drm", .pm = &kmb_pm_ops, .of_match_table = kmb_of_match, },
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 44/59 drm/kmb: Mipi settings from input timings
In reply to Anitha ChrisanthusRemoved hardcoded timings, set timings based on the current mode's input timings. Also calculate and set the lane rate based on the timings.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 9 +++- drivers/gpu/drm/kmb/kmb_dsi.c | 93 +++++++++++++++++++++++------------------- drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- 3 files changed, 61 insertions(+), 43 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +8 -1
@@ -102,7 +102,14 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)int vsync_end_offset;#endif /* initialize mipi */ -kmb_dsi_hw_init (dev); +kmb_dsi_hw_init (dev, m); +DRM_INFO ("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);#ifdef LCD_TEST // vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; vm.vfront_porch =2 ;
drivers/gpu/drm/kmb/kmb_dsi.c +52 -41
148 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +1 -1
@@ -341,7 +341,7 @@ int kmb_dsi_init(struct drm_device *dev, struct drm_bridge *bridge);void kmb_plane_destroy (struct drm_plane *plane);void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);void kmb_dsi_host_unregister (void ); -int kmb_dsi_hw_init (struct drm_device *dev); +int kmb_dsi_hw_init (struct drm_device *dev,struct drm_display_mode *mode);#define to_kmb_connector (x) container_of(x, struct kmb_connector, base)#define to_kmb_host (x) container_of(x, struct kmb_dsi_host, base)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 45/59 drm/kmb: Enable LCD interrupts
In reply to Anitha ChrisanthusEnabled vblank interrupts for LCD.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 35 +++++++++++++++-------------------- drivers/gpu/drm/kmb/kmb_drv.c | 41 +++++++++++++++++++++-------------------- drivers/gpu/drm/kmb/kmb_plane.c | 6 +++--- drivers/gpu/drm/kmb/kmb_regs.h | 2 +- 4 files changed, 40 insertions(+), 44 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +15 -20
@@ -61,7 +61,8 @@ static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_VSTATUS_COMPARE ,LCD_VSTATUS_COMPARE_VSYNC );/* enable vertical interrupt */ -kmb_write_lcd (dev->dev_private,LCD_INT_ENABLE ,LCD_INT_VERT_COMP ); +kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , +LCD_INT_VERT_COMP );return 0 ; }
@@ -72,13 +73,9 @@ static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)/*clear interrupt */ kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/* disable vertical interrupt */ -kmb_write_lcd (dev->dev_private,LCD_INT_ENABLE ,0 ); +kmb_clr_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); -/* TBD -* set the BIT2 (VERTICAL_COMPARE_INTERRUPT) of the LCD_INT_ENABLE register -* set the required bit LCD_VSTATUS_COMPARE register -* Not sure if anything needs to be done in the ICB -*/ }static const struct drm_crtc_funcs kmb_crtc_funcs = {
@@ -100,7 +97,7 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)struct videomode vm;int vsync_start_offset;int vsync_end_offset; -#endif +/* initialize mipi */ kmb_dsi_hw_init (dev, m); DRM_INFO("vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d hsync_len=%d\n",
@@ -110,7 +107,6 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) m->crtc_hsync_start - m->crtc_hdisplay, m->crtc_htotal - m->crtc_hsync_end, m->crtc_hsync_end - m->crtc_hsync_start); -#ifdef LCD_TEST // vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; vm.vfront_porch =2 ;// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end;
@@ -174,7 +170,7 @@ static void kmb_crtc_atomic_enable(struct drm_crtc *crtc,clk_prepare_enable (lcd->clk);kmb_crtc_mode_set_nofb (crtc); -// drm_crtc_vblank_on(crtc); +drm_crtc_vblank_on (crtc); } static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,
@@ -185,33 +181,32 @@ static void kmb_crtc_atomic_disable(struct drm_crtc *crtc,/* always disable planes on the CRTC that is being turned off */ drm_atomic_helper_disable_planes_on_crtc (old_state, false); -// drm_crtc_vblank_off(crtc); +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) { -/* TBD */ -/*disable vblank interrupts here -* clear BIT 2 (VERTICAL_COMPARE_INTERRUPT) LCD_INT_ENABLE -*/ +struct drm_device *dev = crtc->dev; + +kmb_clr_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); }static void kmb_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_crtc_state *state) { -/* TBD */ -/*enable vblank interrupts after -* set BIT 2 (VERTICAL_COMPARE_INTERRUPT) LCD_INT_ENABLE -*/ +struct drm_device *dev = crtc->dev; + +kmb_set_bitmask_lcd (dev->dev_private,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 = {
drivers/gpu/drm/kmb/kmb_drv.c +21 -20
115 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c +3 -3
@@ -175,9 +175,9 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane,break ; } -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), - ~LCD_DMA_LAYER_ENABLE ); -kmb_write_lcd (dev_p,LCD_CONTROL , ~ctrl); +kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), +LCD_DMA_LAYER_ENABLE ); +kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , ctrl); }
drivers/gpu/drm/kmb/kmb_regs.h +1 -1
@@ -107,7 +107,7 @@#define LAYER3_DMA_IDLE (1<<24)#define LAYER3_DMA_FIFO_OVERFLOW (1<<25)#define LAYER3_DMA_FIFO_UNDERFLOW (1<<26) - +#define LCD_INT_LAYER (0x07fffff8)#define LCD_INT_ENABLE (0x4 * 0x002)#define LCD_INT_CLEAR (0x4 * 0x003)#define LCD_LINE_COUNT (0x4 * 0x004)
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 46/59 drm/kmb: Enable LCD interrupts during modeset
In reply to Anitha ChrisanthusThe issue was that spurious interrupts were happening before the LCD controller was enabled and system hangs. Fix is to
clear LCD interrupts and disable them before modeset
and re enable them after enabling LCD controller.
--- drivers/gpu/drm/kmb/kmb_crtc.c | 6 +++++- drivers/gpu/drm/kmb/kmb_drv.c | 21 +++------------------ 2 files changed, 8 insertions(+), 19 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +5 -1
@@ -97,6 +97,7 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)struct videomode vm;int vsync_start_offset;int vsync_end_offset; +unsigned int val =0 ;/* initialize mipi */ kmb_dsi_hw_init (dev, m);
@@ -107,6 +108,9 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) 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 (dev->dev_private,LCD_INT_ENABLE ); +kmb_clr_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , val); +kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_CLEAR , ~0x0 );// vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; vm.vfront_porch =2 ;// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end;
@@ -155,9 +159,9 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_VSYNC_START_EVEN ,10 ); kmb_write_lcd(dev->dev_private, LCD_VSYNC_END_EVEN, 10); } -/* enable VL1 layer as default */ kmb_write_lcd (dev->dev_private,LCD_TIMING_GEN_TRIG ,ENABLE );kmb_set_bitmask_lcd (dev->dev_private,LCD_CONTROL ,LCD_CTRL_ENABLE ); +kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , val);#endif /* TBD */ /* set clocks here */
drivers/gpu/drm/kmb/kmb_drv.c +3 -18
@@ -57,8 +57,6 @@ static irqreturn_t kmb_isr(int irq, void *arg);static struct clk *clk_lcd;static struct clk *clk_mipi; -static struct clk *clk_msscam; -static struct clk *clk_pll0out0;static struct clk *clk_mipi_ecfg;static struct clk *clk_mipi_cfg;
@@ -79,12 +77,6 @@ int kmb_display_clk_enable(void)DRM_ERROR ("Failed to enable MIPI clock: %d\n" , ret);return ret; } -/* ret = clk_prepare_enable(clk_msscam); -if (ret) { -DRM_ERROR("Failed to enable MSSCAM clock: %d\n", ret); -return ret; -} -*/ ret =clk_prepare_enable (clk_mipi_ecfg);if (ret) {
@@ -107,8 +99,6 @@ static int kmb_display_clk_disable(void)clk_disable_unprepare (clk_lcd);if (clk_mipi)clk_disable_unprepare (clk_mipi); -if (clk_msscam) -clk_disable_unprepare (clk_msscam);if (clk_mipi_ecfg)clk_disable_unprepare (clk_mipi_ecfg);if (clk_mipi_cfg)
@@ -200,14 +190,6 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_ERROR ("clk_get() failed clk_mipi\n" ); goto setup_fail; } - clk_pll0out0 =clk_get (&pdev->dev,"clk_pll0_out0" ); -if (IS_ERR (clk_pll0out0)) -DRM_ERROR ("clk_get() failed clk_pll0_out0\n" ); - -if (clk_pll0out0) -DRM_INFO ("Get clk_pll0out0 = %ld\n" , -clk_get_rate (clk_pll0out0)); - clk_mipi_ecfg =clk_get (&pdev->dev,"clk_mipi_ecfg" );if (IS_ERR (clk_mipi_ecfg)) {DRM_ERROR ("clk_get() failed clk_mipi_ecfg\n" );
@@ -413,6 +395,9 @@ static irqreturn_t handle_lcd_irq(struct drm_device *dev)break ; } } + +/* clear all interrupts */ +kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_CLEAR , ~0x0 );return IRQ_HANDLED ; }
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 47/59 drm/kmb: Don’t inadvertantly disable LCD controller
In reply to Anitha Chrisanthussetbits instead of write dword for LCD_CONTROL register this was inadvertantly disabling the LCD controller.
--- drivers/gpu/drm/kmb/kmb_plane.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/kmb/kmb_plane.c +4 -1
@@ -178,6 +178,9 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane,kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id),LCD_DMA_LAYER_ENABLE );kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , ctrl); +DRM_INFO ("%s : %d lcd_ctrl = 0x%x lcd_int_enable=0x%x\n" , + __func__, __LINE__,kmb_read_lcd (dev_p,LCD_CONTROL ), +kmb_read_lcd (dev_p,LCD_INT_ENABLE )); }
@@ -476,7 +479,7 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,*/ ctrl |=LCD_CTRL_VHSYNC_IDLE_LVL ; -kmb_write_lcd (dev_p,LCD_CONTROL , ctrl); +kmb_set_bitmask_lcd (dev_p,LCD_CONTROL , ctrl);/* FIXME no doc on how to set output format,these values are taken * from the Myriadx tests
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 48/59 drm/kmb: SWAP R and B LCD Layer order
In reply to Anitha ChrisanthusSet swap bit for the colors to display correctly
when the format is RGB and not set when its BGR.
--- drivers/gpu/drm/kmb/kmb_plane.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +18 -18
@@ -218,54 +218,55 @@ unsigned int set_pixel_format(u32 format) val =LCD_LAYER_FORMAT_NV12 |LCD_LAYER_PLANAR_STORAGE |LCD_LAYER_CRCB_ORDER ;break ; -/* packed formats */ +/* packed formats */ +/* looks hw requires B & G to be swapped when RGB */ case DRM_FORMAT_RGB332 : - val =LCD_LAYER_FORMAT_RGB332 ; + val =LCD_LAYER_FORMAT_RGB332 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_XBGR4444 : - val =LCD_LAYER_FORMAT_RGBX4444 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGBX4444 ;break ;case DRM_FORMAT_ARGB4444 : - val =LCD_LAYER_FORMAT_RGBA4444 ; + val =LCD_LAYER_FORMAT_RGBA4444 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_ABGR4444 : - val =LCD_LAYER_FORMAT_RGBA4444 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGBA4444 ;break ;case DRM_FORMAT_XRGB1555 : - val =LCD_LAYER_FORMAT_XRGB1555 ; + val =LCD_LAYER_FORMAT_XRGB1555 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_XBGR1555 : - val =LCD_LAYER_FORMAT_XRGB1555 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_XRGB1555 ;break ;case DRM_FORMAT_ARGB1555 : - val =LCD_LAYER_FORMAT_RGBA1555 ; + val =LCD_LAYER_FORMAT_RGBA1555 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_ABGR1555 : - val =LCD_LAYER_FORMAT_RGBA1555 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGBA1555 ;break ;case DRM_FORMAT_RGB565 : - val =LCD_LAYER_FORMAT_RGB565 ; + val =LCD_LAYER_FORMAT_RGB565 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_BGR565 : - val =LCD_LAYER_FORMAT_RGB565 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGB565 ;break ;case DRM_FORMAT_RGB888 : - val =LCD_LAYER_FORMAT_RGB888 ; + val =LCD_LAYER_FORMAT_RGB888 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_BGR888 : - val =LCD_LAYER_FORMAT_RGB888 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGB888 ;break ;case DRM_FORMAT_XRGB8888 : - val =LCD_LAYER_FORMAT_RGBX8888 ; + val =LCD_LAYER_FORMAT_RGBX8888 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_XBGR8888 : - val =LCD_LAYER_FORMAT_RGBX8888 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGBX8888 ;break ;case DRM_FORMAT_ARGB8888 : - val =LCD_LAYER_FORMAT_RGBA8888 ; + val =LCD_LAYER_FORMAT_RGBA8888 |LCD_LAYER_BGR_ORDER ;break ;case DRM_FORMAT_ABGR8888 : - val =LCD_LAYER_FORMAT_RGBA8888 |LCD_LAYER_BGR_ORDER ; + val =LCD_LAYER_FORMAT_RGBA8888 ;break ; }DRM_INFO ("%s : %d layer format val=%d\n" , __func__, __LINE__, val);
@@ -370,7 +371,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, val |=set_bits_per_pixel (fb->format);/*CHECKME Leon drvr sets it to 100 try this for now */ val |=LCD_LAYER_FIFO_100 ; - val |=LCD_LAYER_BGR_ORDER ;kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val);/*re-initialize interrupts */
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 49/59 drm/kmb: Disable ping pong mode
In reply to Anitha ChrisanthusDisable ping pong mode otherwise video corruption results, use continuous mode and also fetch the dma
addresses before disabling dma. For now, only initialize the dma and planes once and for next plane updates only update the addresses for dma.
--- drivers/gpu/drm/kmb/kmb_plane.c | 303 ++++++++++++++++++++-------------------- drivers/gpu/drm/kmb/kmb_plane.h | 8 ++ 2 files changed, 159 insertions(+), 152 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +151 -152
@@ -103,11 +103,12 @@ static const u32 kmb_formats_v[] = {#define LCD_INT_GL1 (LAYER3_DMA_DONE | LAYER3_DMA_IDLE | LCD_INT_GL1_ERR)const uint32_t layer_irqs[] = { -LCD_INT_VL0 , -LCD_INT_VL1 , -LCD_INT_GL0 , -LCD_INT_GL1 - }; +LCD_INT_VL0 , +LCD_INT_VL1 , +LCD_INT_GL0 , +LCD_INT_GL1 +}; +/*Conversion (yuv->rgb) matrix from myriadx */ static const u32 csc_coef_lcd[] = {1024 ,0 ,1436 ,
@@ -116,7 +117,6 @@ static const u32 csc_coef_lcd[] = { -179, 125, -226 }; -static unsigned int check_pixel_format (struct drm_plane *plane,u32 format) {int i;
@@ -134,7 +134,6 @@ static int kmb_plane_atomic_check(struct drm_plane *plane,struct drm_framebuffer *fb;int ret; - fb = state->fb;if (!fb || !state->crtc)
@@ -150,7 +149,7 @@ static int kmb_plane_atomic_check(struct drm_plane *plane, }static void kmb_plane_atomic_disable (struct drm_plane *plane, -struct drm_plane_state *state) +struct drm_plane_state *state) {struct kmb_plane *kmb_plane =to_kmb_plane (plane);int ctrl =0 ;
@@ -176,14 +175,13 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane, }kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), -LCD_DMA_LAYER_ENABLE ); +LCD_DMA_LAYER_ENABLE );kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , ctrl);DRM_INFO ("%s : %d lcd_ctrl = 0x%x lcd_int_enable=0x%x\n" , - __func__, __LINE__,kmb_read_lcd (dev_p,LCD_CONTROL ), -kmb_read_lcd (dev_p,LCD_INT_ENABLE )); + __func__, __LINE__,kmb_read_lcd (dev_p,LCD_CONTROL ), +kmb_read_lcd (dev_p,LCD_INT_ENABLE )); } -unsigned int set_pixel_format (u32 format) {unsigned int val =0 ;
@@ -218,8 +216,8 @@ unsigned int set_pixel_format(u32 format) 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 */ +/* 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 ;
@@ -283,7 +281,7 @@ unsigned int set_bits_per_pixel(const struct drm_format_info *format)return val; } - bpp +=8 *format->cpp[0 ]; + bpp +=8 * format->cpp[0 ];switch (bpp) {case 8 :
@@ -330,7 +328,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,#ifdef LCD_TEST struct drm_framebuffer *fb;struct kmb_drm_private *dev_p; -dma_addr_t addr;unsigned int width;unsigned int height;unsigned int dma_len;
@@ -340,6 +337,9 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,unsigned int src_w, src_h, crtc_x, crtc_y;unsigned char plane_id;int num_planes; +/*plane initialization status */ +static int plane_init_status[KMB_MAX_PLANES ] = {0 ,0 ,0 ,0 }; +static dma_addr_t addr[MAX_SUB_PLANES ] = {0 ,0 ,0 };if (!plane || !plane->state || !state)return ;
@@ -352,8 +352,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, kmb_plane =to_kmb_plane (plane); plane_id = kmb_plane->id; - - dev_p = plane->dev->dev_private; src_w = (plane->state->src_w >>16 );
@@ -361,146 +359,145 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, crtc_x = plane->state->crtc_x; crtc_y = plane->state->crtc_y; -DRM_INFO ("src_w=%d src_h=%d\n" , src_w, src_h); -kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w-1 ); -kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); -kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x); -kmb_write_lcd (dev_p,LCD_LAYERn_ROW_START (plane_id), crtc_y); - - val =set_pixel_format (fb->format->format); - val |=set_bits_per_pixel (fb->format); -/*CHECKME Leon drvr sets it to 100 try this for now */ - val |=LCD_LAYER_FIFO_100 ; -kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val); - -/*re-initialize interrupts */ -kmb_clr_bitmask_lcd (dev_p,LCD_INT_ENABLE , layer_irqs[plane_id]); -kmb_set_bitmask_lcd (dev_p,LCD_INT_CLEAR , layer_irqs[plane_id]); -kmb_set_bitmask_lcd (dev_p,LCD_INT_ENABLE , layer_irqs[plane_id]); - -/*TBD check visible? */ -/* -dma_cfg = LCD_DMA_LAYER_ENABLE | LCD_DMA_LAYER_AUTO_UPDATE -| LCD_DMA_LAYER_CONT_UPDATE | LCD_DMA_LAYER_AXI_BURST_1 -| LCD_DMA_LAYER_VSTRIDE_EN; -*/ - dma_cfg =LCD_DMA_LAYER_ENABLE |LCD_DMA_LAYER_VSTRIDE_EN - |LCD_DMA_LAYER_AXI_BURST_16 | -LCD_DMA_LAYER_CONT_PING_PONG_UPDATE ; - -/* disable DMA first */ -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), - ~LCD_DMA_LAYER_ENABLE ); -kmb_write_lcd (dev_p,LCD_FIFO_FLUSH + plane_id*0x400 ,1 ); - -/* pinpong mode is enabled - at the end of DMA transfer, start new -* transfer alternatively using main and shadow register settings. -* So update both main and shadow registers -*/ - addr =drm_fb_cma_get_gem_addr (fb, plane->state,0 ); - dev_p->fb_addr = addr; -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), addr); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_SHADOW (plane_id), addr); - - width = fb->width; - height = fb->height; - dma_len = width * height * fb->format->cpp[0 ]; -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), dma_len); - -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), - fb->pitches[0 ]); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), - (width*fb->format->cpp[0 ])); - -/*program Cb/Cr for planar formats*/ -if (num_planes >1 ) { -if (fb->format->format ==DRM_FORMAT_YUV420 || - fb->format->format ==DRM_FORMAT_YVU420 ) - width /=2 ; - addr =drm_fb_cma_get_gem_addr (fb, plane->state,LAYER_1 ); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_CB_ADR (plane_id), - addr); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_CB_SHADOW (plane_id), - addr); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CB_LINE_VSTRIDE (plane_id), - fb->pitches[LAYER_1 ]); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CB_LINE_WIDTH (plane_id), - (width*fb->format->cpp[0 ])); -if (num_planes ==3 ) { - addr =drm_fb_cma_get_gem_addr (fb, plane->state, -LAYER_2 ); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_START_CR_ADR (plane_id), - addr); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_START_CR_SHADOW (plane_id), - addr); +DRM_INFO + ("%s : %d src_w=%d src_h=%d, fb->format->format=0x%x fb->flags=0x%x" , + __func__, __LINE__, src_w, src_h, fb->format->format, fb->flags); +if (plane_init_status[plane_id] !=INITIALIZED ) { +kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w -1 ); +kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h -1 ); +kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x); +kmb_write_lcd (dev_p,LCD_LAYERn_ROW_START (plane_id), crtc_y); + + val =set_pixel_format (fb->format->format); + val |=set_bits_per_pixel (fb->format); +/*CHECKME Leon drvr sets it to 100 try this for now */ + val |=LCD_LAYER_FIFO_100 ; +kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val); + +/*re-initialize interrupts */ +kmb_clr_bitmask_lcd (dev_p,LCD_INT_ENABLE , + layer_irqs[plane_id]); +kmb_set_bitmask_lcd (dev_p,LCD_INT_CLEAR , layer_irqs[plane_id]); + + dma_cfg =LCD_DMA_LAYER_ENABLE |LCD_DMA_LAYER_VSTRIDE_EN | +LCD_DMA_LAYER_CONT_UPDATE |LCD_DMA_LAYER_AXI_BURST_16 ; + + width = fb->width; + height = fb->height; + dma_len = (width * height * fb->format->cpp[0 ]); +DRM_INFO ("%s : %d dma_len=%d " , __func__, __LINE__, dma_len); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), + dma_len); + +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), + fb->pitches[0 ]); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), + (width * fb->format->cpp[0 ])); + +/*program Cb/Cr for planar formats */ +if (num_planes >1 ) { +if (fb->format->format ==DRM_FORMAT_YUV420 || + fb->format->format ==DRM_FORMAT_YVU420 ) + width /=2 ;kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CR_LINE_VSTRIDE (plane_id), - fb->pitches[LAYER_2 ]); +LCD_LAYERn_DMA_CB_LINE_VSTRIDE (plane_id), + fb->pitches[LAYER_1 ]);kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CR_LINE_WIDTH (plane_id), - (width*fb->format->cpp[0 ])); +LCD_LAYERn_DMA_CB_LINE_WIDTH (plane_id), + (width * fb->format->cpp[0 ])); +if (num_planes ==3 ) { +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_CR_LINE_VSTRIDE + (plane_id), fb->pitches[LAYER_2 ]); +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_CR_LINE_WIDTH + (plane_id), + (width * fb->format->cpp[0 ])); + } } - } -/* enable DMA */ -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); -DRM_INFO ("%s : %d dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , __func__, - __LINE__, dma_cfg, -kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id))); +/* enable DMA */ +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +DRM_INFO ("%s : %d dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , + __func__, __LINE__, dma_cfg, +kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id))); + +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 ; + } -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 ; -// ctrl |= LCD_CTRL_ENABLE; - 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 ; -// ctrl |= LCD_CTRL_PROGRESSIVE | LCD_CTRL_TIM_GEN_ENABLE -// | LCD_CTRL_ONE_SHOT | 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 (dev_p,LCD_CONTROL , ctrl); -kmb_set_bitmask_lcd (dev_p,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 ; -/* FIXME no doc on how to set output format,these values are taken -* from the Myriadx tests -*/ - out_format |=LCD_OUTF_FORMAT_RGB888 ; -// out_format |= LCD_OUTF_BGR_ORDER; +if (val &LCD_LAYER_PLANAR_STORAGE ) { +/*enable CSC if input is planar and output is RGB */ +config_csc (dev_p, plane_id); + } + +/*set background color to white */ +// kmb_write_lcd(dev_p, LCD_BG_COLOUR_LS, 0xffffff); +/*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 (dev_p,LCD_OUT_FORMAT_CFG , out_format); -if (val &LCD_LAYER_PLANAR_STORAGE ) { -/*enable CSC if input is planar and output is RGB */ -config_csc (dev_p, plane_id); +kmb_set_bitmask_lcd (dev_p,LCD_INT_ENABLE , + layer_irqs[plane_id]); + plane_init_status[plane_id] =INITIALIZED ; } -/*set background color to white*/ -// kmb_write_lcd(dev_p, LCD_BG_COLOUR_LS, 0xffffff); -/*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 ; -// out_format |= LCD_OUTF_SYNC_MODE ; -kmb_write_lcd (dev_p,LCD_OUT_FORMAT_CFG , out_format); + addr[Y_PLANE ] =drm_fb_cma_get_gem_addr (fb, plane->state,0 ); + dev_p->fb_addr = (dma_addr_t ) addr; +if (num_planes >1 ) { + addr[U_PLANE ] =drm_fb_cma_get_gem_addr (fb, plane->state, +U_PLANE ); +if (num_planes ==3 ) + addr[V_PLANE ] = +drm_fb_cma_get_gem_addr (fb, plane->state,V_PLANE ); + } +/* disable DMA first */ +kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), +LCD_DMA_LAYER_ENABLE ); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), + addr[Y_PLANE ] + fb->offsets[0 ]); +if (num_planes >1 ) { +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_CB_ADR (plane_id), + addr[U_PLANE ]); +if (num_planes ==3 ) +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_START_CR_ADR (plane_id), + addr[V_PLANE ]); + } +/* Enable DMA */ +kmb_set_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), +LCD_DMA_LAYER_ENABLE ); +DRM_INFO ("%s : %d flipping.....\n" , __func__, __LINE__); +return ; -// kmb_write_lcd(dev_p, LCD_CONTROL, LCD_CTRL_ENABLE); #endif }
@@ -513,6 +510,7 @@ static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = {void kmb_plane_destroy (struct drm_plane *plane) {struct kmb_plane *kmb_plane =to_kmb_plane (plane); +drm_plane_cleanup (plane);kfree (kmb_plane); }
@@ -591,7 +589,7 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm) } plane_type = (i ==0 ) ?DRM_PLANE_TYPE_PRIMARY : -DRM_PLANE_TYPE_OVERLAY ; +DRM_PLANE_TYPE_OVERLAY ;if (i <2 ) { plane_formats = kmb_formats_v; num_plane_formats =ARRAY_SIZE (kmb_formats_v);
@@ -601,13 +599,14 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm) } 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); +POSSIBLE_CRTCS , + &kmb_plane_funcs, plane_formats, + num_plane_formats, +NULL , plane_type,"plane %d" , i);if (ret <0 ) { -DRM_ERROR ("drm_universal_plane_init -failed with ret=%d" - , ret); +DRM_ERROR + ("drm_universal_plane_init -failed with ret=%d" , + ret); goto cleanup; }
drivers/gpu/drm/kmb/kmb_plane.h +8 -0
@@ -36,6 +36,13 @@ enum layer_id { KMB_MAX_PLANES, }; +enum sub_plane_id { +Y_PLANE , +U_PLANE , +V_PLANE , +MAX_SUB_PLANES , +}; +struct kmb_plane {struct drm_plane base_plane;struct kmb_drm_private kmb_dev;
@@ -48,6 +55,7 @@ struct kmb_plane_state { };#define POSSIBLE_CRTCS 1 +#define INITIALIZED 1#define to_kmb_plane (x) container_of(x, struct kmb_plane, base_plane)#define to_kmb_plane_state (x) \
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 50/59 drm/kmb: Do the layer initializations only once
In reply to Anitha ChrisanthusThe issue was video starts fine, but towards the end, the color disappers. Do the layer initializations only once, but update the DMA registers for every frame. Also changed DRM_INFO to DRM_DEBUG.
--- drivers/gpu/drm/kmb/kmb_plane.c | 150 ++++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 84 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +66 -84
@@ -117,6 +117,9 @@ static const u32 csc_coef_lcd[] = { -179, 125, -226 }; +/*plane initialization status */ +static int plane_init_status[KMB_MAX_PLANES ] = {0 ,0 ,0 ,0 }; +static unsigned int check_pixel_format (struct drm_plane *plane,u32 format) {int i;
@@ -177,9 +180,9 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane,kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id),LCD_DMA_LAYER_ENABLE );kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , ctrl); -DRM_INFO ("%s : %d lcd_ctrl = 0x%x lcd_int_enable=0x%x\n" , - __func__, __LINE__,kmb_read_lcd (dev_p,LCD_CONTROL ), -kmb_read_lcd (dev_p,LCD_INT_ENABLE )); +DRM_DEBUG ("%s : %d lcd_ctrl = 0x%x lcd_int_enable=0x%x\n" , + __func__, __LINE__,kmb_read_lcd (dev_p,LCD_CONTROL ), +kmb_read_lcd (dev_p,LCD_INT_ENABLE )); }unsigned int set_pixel_format (u32 format)
@@ -337,8 +340,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,unsigned int src_w, src_h, crtc_x, crtc_y;unsigned char plane_id;int num_planes; -/*plane initialization status */ -static int plane_init_status[KMB_MAX_PLANES ] = {0 ,0 ,0 ,0 };static dma_addr_t addr[MAX_SUB_PLANES ] = {0 ,0 ,0 };if (!plane || !plane->state || !state)
@@ -359,9 +360,56 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, crtc_x = plane->state->crtc_x; crtc_y = plane->state->crtc_y; -DRM_INFO +DRM_DEBUG ("%s : %d src_w=%d src_h=%d, fb->format->format=0x%x fb->flags=0x%x" , __func__, __LINE__, src_w, src_h, fb->format->format, fb->flags); + + width = fb->width; + height = fb->height; + dma_len = (width * height * fb->format->cpp[0 ]); +DRM_DEBUG ("%s : %d dma_len=%d " , __func__, __LINE__, dma_len); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), dma_len); + +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), + fb->pitches[0 ]); +kmb_write_lcd (dev_p,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 ); + dev_p->fb_addr = (dma_addr_t ) addr; +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), + addr[Y_PLANE ] + fb->offsets[0 ]); +/*program Cb/Cr for planar formats */ +if (num_planes >1 ) { +if (fb->format->format ==DRM_FORMAT_YUV420 || + fb->format->format ==DRM_FORMAT_YVU420 ) + width /=2 ; +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_CB_LINE_VSTRIDE (plane_id), + fb->pitches[LAYER_1 ]); +kmb_write_lcd (dev_p, +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 ); +kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_CB_ADR (plane_id), + addr[U_PLANE ]); +if (num_planes ==3 ) { +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_CR_LINE_VSTRIDE (plane_id), + fb->pitches[LAYER_2 ]); +kmb_write_lcd (dev_p, +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 ); +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_START_CR_ADR (plane_id), + addr[V_PLANE ]); + } + }if (plane_init_status[plane_id] !=INITIALIZED ) {kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w -1 );kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h -1 );
@@ -374,55 +422,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, val |=LCD_LAYER_FIFO_100 ;kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val); -/*re-initialize interrupts */ -kmb_clr_bitmask_lcd (dev_p,LCD_INT_ENABLE , - layer_irqs[plane_id]); -kmb_set_bitmask_lcd (dev_p,LCD_INT_CLEAR , layer_irqs[plane_id]); - - dma_cfg =LCD_DMA_LAYER_ENABLE |LCD_DMA_LAYER_VSTRIDE_EN | -LCD_DMA_LAYER_CONT_UPDATE |LCD_DMA_LAYER_AXI_BURST_16 ; - - width = fb->width; - height = fb->height; - dma_len = (width * height * fb->format->cpp[0 ]); -DRM_INFO ("%s : %d dma_len=%d " , __func__, __LINE__, dma_len); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN (plane_id), dma_len); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), - dma_len); - -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), - fb->pitches[0 ]); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), - (width * fb->format->cpp[0 ])); - -/*program Cb/Cr for planar formats */ -if (num_planes >1 ) { -if (fb->format->format ==DRM_FORMAT_YUV420 || - fb->format->format ==DRM_FORMAT_YVU420 ) - width /=2 ; -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CB_LINE_VSTRIDE (plane_id), - fb->pitches[LAYER_1 ]); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CB_LINE_WIDTH (plane_id), - (width * fb->format->cpp[0 ])); -if (num_planes ==3 ) { -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CR_LINE_VSTRIDE - (plane_id), fb->pitches[LAYER_2 ]); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CR_LINE_WIDTH - (plane_id), - (width * fb->format->cpp[0 ])); - } - } - -/* enable DMA */ -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); -DRM_INFO ("%s : %d dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , - __func__, __LINE__, dma_cfg, -kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id))); -switch (plane_id) {case LAYER_0 : ctrl =LCD_CTRL_VL1_ENABLE ;
@@ -464,38 +463,18 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,/* do not interleave RGB channels for mipi Tx compatibility */ out_format |=LCD_OUTF_MIPI_RGB_MODE ;kmb_write_lcd (dev_p,LCD_OUT_FORMAT_CFG , out_format); - -kmb_set_bitmask_lcd (dev_p,LCD_INT_ENABLE , - layer_irqs[plane_id]); plane_init_status[plane_id] = INITIALIZED; } - addr[Y_PLANE ] =drm_fb_cma_get_gem_addr (fb, plane->state,0 ); - dev_p->fb_addr = (dma_addr_t ) addr; -if (num_planes >1 ) { - addr[U_PLANE ] =drm_fb_cma_get_gem_addr (fb, plane->state, -U_PLANE ); -if (num_planes ==3 ) - addr[V_PLANE ] = -drm_fb_cma_get_gem_addr (fb, plane->state,V_PLANE ); - } -/* disable DMA first */ -kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), -LCD_DMA_LAYER_ENABLE ); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), - addr[Y_PLANE ] + fb->offsets[0 ]); -if (num_planes >1 ) { -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_CB_ADR (plane_id), - addr[U_PLANE ]); -if (num_planes ==3 ) -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_START_CR_ADR (plane_id), - addr[V_PLANE ]); - } -/* Enable DMA */ -kmb_set_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), -LCD_DMA_LAYER_ENABLE ); -DRM_INFO ("%s : %d flipping.....\n" , __func__, __LINE__); + 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 (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +DRM_DEBUG ("%s : %d dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , + __func__, __LINE__, dma_cfg, +kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id))); +return ;#endif
@@ -609,6 +588,9 @@ struct kmb_plane *kmb_plane_init(struct drm_device *drm) ret); goto cleanup; } +DRM_DEBUG ("%s : %d plane=%px\n i=%d type=%d" , + __func__, __LINE__, &plane->base_plane, + i, plane_type);drm_plane_helper_add (&plane->base_plane, &kmb_plane_helper_funcs);
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 51/59 drm/kmb: Write to LCD_LAYERn_CFG only once
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
Video artifacts appear during playback as horizontal lines that sporadically appear every few frames. Issue was caused by writing to LCD_LAYERn_CFG register twice during plane updates. Issue is fixed by writing to LCD_LAYERn_CFG only once.
Removed plane_init_status so that there are no initialization dependencies during plane updates.
--- drivers/gpu/drm/kmb/kmb_plane.c | 81 +++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 43 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +38 -43
@@ -118,7 +118,6 @@ static const u32 csc_coef_lcd[] = { };/*plane initialization status */ -static int plane_init_status[KMB_MAX_PLANES ] = {0 ,0 ,0 ,0 };static unsigned int check_pixel_format (struct drm_plane *plane,u32 format) {
@@ -321,7 +320,6 @@ static void config_csc(struct kmb_drm_private *dev_p, int plane_id)kmb_write_lcd (dev_p,LCD_LAYERn_CSC_OFF1 (plane_id), csc_coef_lcd[9 ]);kmb_write_lcd (dev_p,LCD_LAYERn_CSC_OFF2 (plane_id), csc_coef_lcd[10 ]); kmb_write_lcd(dev_p, LCD_LAYERn_CSC_OFF3(plane_id), csc_coef_lcd[11]); - kmb_set_bitmask_lcd(dev_p, LCD_LAYERn_CFG(plane_id), LCD_LAYER_CSC_EN); }#endif
@@ -410,19 +408,27 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, addr[V_PLANE]); } } -if (plane_init_status[plane_id] !=INITIALIZED ) { -kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w -1 ); -kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h -1 ); -kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x); -kmb_write_lcd (dev_p,LCD_LAYERn_ROW_START (plane_id), crtc_y); - - val =set_pixel_format (fb->format->format); - val |=set_bits_per_pixel (fb->format); -/*CHECKME Leon drvr sets it to 100 try this for now */ - val |=LCD_LAYER_FIFO_100 ; -kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val); - -switch (plane_id) { + +kmb_write_lcd (dev_p,LCD_LAYERn_WIDTH (plane_id), src_w-1 ); +kmb_write_lcd (dev_p,LCD_LAYERn_HEIGHT (plane_id), src_h-1 ); +kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x); +kmb_write_lcd (dev_p,LCD_LAYERn_ROW_START (plane_id), crtc_y); + + val =set_pixel_format (fb->format->format); + val |=set_bits_per_pixel (fb->format); +/*CHECKME Leon drvr sets it to 100 try this for now */ + 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 (dev_p, plane_id); + } + +kmb_write_lcd (dev_p,LCD_LAYERn_CFG (plane_id), val); + +switch (plane_id) {case LAYER_0 : ctrl =LCD_CTRL_VL1_ENABLE ;break ;
@@ -435,36 +441,28 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,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 ; + 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 ; +/*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 (dev_p,LCD_CONTROL , ctrl); +kmb_set_bitmask_lcd (dev_p,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 ; +/* FIXME no doc on how to set output format,these values are +* taken from the Myriadx tests +*/ + out_format |=LCD_OUTF_FORMAT_RGB888 ; -if (val &LCD_LAYER_PLANAR_STORAGE ) { -/*enable CSC if input is planar and output is RGB */ -config_csc (dev_p, plane_id); - } - -/*set background color to white */ -// kmb_write_lcd(dev_p, LCD_BG_COLOUR_LS, 0xffffff); -/*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 (dev_p,LCD_OUT_FORMAT_CFG , out_format); - plane_init_status[plane_id] =INITIALIZED ; - } +/* 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 ; +// out_format |= LCD_OUTF_SYNC_MODE; +kmb_write_lcd (dev_p,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 ;
@@ -474,9 +472,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,DRM_DEBUG ("%s : %d dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , __func__, __LINE__, dma_cfg,kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id))); - -return ; -#endif }
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 52/59 drm/kmb: Cleaned up code
In reply to Anitha ChrisanthusFrom: Edmund Dea <[email protected]>
to remove compiler warnings and general clean up
--- drivers/gpu/drm/kmb/kmb_crtc.c | 48 +- drivers/gpu/drm/kmb/kmb_crtc.h | 6 +- drivers/gpu/drm/kmb/kmb_drv.c | 115 +++-- drivers/gpu/drm/kmb/kmb_drv.h | 107 ++-- drivers/gpu/drm/kmb/kmb_dsi.c | 1073 +++++++++++++++++++++------------------ drivers/gpu/drm/kmb/kmb_dsi.h | 84 ++- drivers/gpu/drm/kmb/kmb_plane.c | 155 ++---- drivers/gpu/drm/kmb/kmb_plane.h | 74 ++- drivers/gpu/drm/kmb/kmb_regs.h | 29 +- 9 files changed, 898 insertions(+), 793 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +24 -24
@@ -59,10 +59,10 @@ static int kmb_crtc_enable_vblank(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/*set which interval to generate vertical interrupt */ kmb_write_lcd (dev->dev_private,LCD_VSTATUS_COMPARE , -LCD_VSTATUS_COMPARE_VSYNC ); +LCD_VSTATUS_COMPARE_VSYNC );/* enable vertical interrupt */ kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , -LCD_INT_VERT_COMP ); +LCD_INT_VERT_COMP );return 0 ; }
@@ -74,7 +74,7 @@ static void kmb_crtc_disable_vblank(struct drm_crtc *crtc)kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_VERT_COMP );/* disable vertical interrupt */ kmb_clr_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , -LCD_INT_VERT_COMP ); +LCD_INT_VERT_COMP ); }
@@ -102,38 +102,38 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)/* initialize mipi */ kmb_dsi_hw_init (dev, m);DRM_INFO ("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); + 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 (dev->dev_private,LCD_INT_ENABLE );kmb_clr_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , val);kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_CLEAR , ~0x0 ); -// vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; +// vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; vm.vfront_porch =2 ; -// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; +// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; vm.vback_porch =2 ; -// vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; +// vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; vm.vsync_len =1 ;//vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; vm.hfront_porch =0 ; vm.hback_porch =0 ;//vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; vm.hsync_len =7 ; -// vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; +// vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; -DRM_INFO ("%s : %dactive height= %d vbp=%d vfp=%d vsync-w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d\n" , - __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); +DRM_DEBUG + ("%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 (dev->dev_private,LCD_V_ACTIVEHEIGHT , - m->crtc_vdisplay -1 ); + m->crtc_vdisplay -1 );kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH , vm.vback_porch);kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH , vm.vfront_porch);kmb_write_lcd (dev->dev_private,LCD_VSYNC_WIDTH , vm.vsync_len -1 );
@@ -148,14 +148,14 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)if (m->flags ==DRM_MODE_FLAG_INTERLACE ) {kmb_write_lcd (dev->dev_private, -LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); +LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 );kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH_EVEN , vm.vback_porch);kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH_EVEN , vm.vfront_porch);kmb_write_lcd (dev->dev_private,LCD_V_ACTIVEHEIGHT_EVEN , - m->crtc_vdisplay -1 ); -/*this is hardcoded as 10 in the Myriadx code*/ + m->crtc_vdisplay -1 ); +/*this is hardcoded as 10 in the Myriadx code */ kmb_write_lcd (dev->dev_private,LCD_VSYNC_START_EVEN ,10 );kmb_write_lcd (dev->dev_private,LCD_VSYNC_END_EVEN ,10 ); }
@@ -195,7 +195,7 @@ static void kmb_crtc_atomic_begin(struct drm_crtc *crtc,struct drm_device *dev = crtc->dev;kmb_clr_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , -LCD_INT_VERT_COMP ); +LCD_INT_VERT_COMP ); } static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,
@@ -204,7 +204,7 @@ static void kmb_crtc_atomic_flush(struct drm_crtc *crtc,struct drm_device *dev = crtc->dev;kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_ENABLE , -LCD_INT_VERT_COMP ); +LCD_INT_VERT_COMP );spin_lock_irq (&crtc->dev->event_lock);if (crtc->state->event)
drivers/gpu/drm/kmb/kmb_crtc.h +4 -2
@@ -44,6 +44,9 @@#include <linux/platform_device.h> #include "kmb_drv.h" +#define to_kmb_crtc_state (x) container_of(x, struct kmb_crtc_state, crtc_base) +#define to_kmb_crtc (x) container_of(x, struct kmb_crtc, crtc_base) +struct kmb_crtc {struct drm_crtc crtc_base;struct kmb_drm_private kmb_dev;
@@ -52,8 +55,7 @@ struct kmb_crtc {struct kmb_crtc_state {struct drm_crtc_state crtc_base; }; -#define to_kmb_crtc_state (x) container_of(x, struct kmb_crtc_state, crtc_base) -#define to_kmb_crtc (x) container_of(x, struct kmb_crtc, crtc_base) +extern void kmb_plane_destroy (struct drm_plane *plane);extern struct kmb_plane *kmb_plane_init (struct drm_device *drm);#endif /* __KMB_CRTC_H__ */
drivers/gpu/drm/kmb/kmb_drv.c +62 -53
343 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.h +38 -69
202 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.c +585 -488
1,888 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h +62 -22
115 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c +39 -116
293 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.h +69 -5
34 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Part of the diff is not shown here. View the raw message.
Anitha Chrisanthus
maintainerPATCH 53/59 drm/kmb: disable the LCD layer in EOF irq handler
In reply to Anitha ChrisanthusWhen disabling/enabling LCD layers, the change takes effect immediately and does not wait for EOF (end of frame). If we disable an LCD layer in kmb_plane_atomic_disable, then the frame reappears with incorrect display offsets.
The solution is to mark the plane as disabled when kmb_plane_atomic_disable is called but actually disable the LCD layer when EOF irq is being handled.
Also only enable one plane (video plane0) as there is no use case for multiple planes.
--- drivers/gpu/drm/kmb/kmb_drv.c | 37 +++++++++++++++++++++++++++++++------ drivers/gpu/drm/kmb/kmb_drv.h | 1 + drivers/gpu/drm/kmb/kmb_plane.c | 24 ++++++++---------------- drivers/gpu/drm/kmb/kmb_plane.h | 9 ++++++++- 4 files changed, 48 insertions(+), 23 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +31 -6
@@ -62,6 +62,8 @@ static struct clk *clk_mipi_cfg;struct drm_bridge *adv_bridge; +extern struct layer_status plane_status[KMB_MAX_PLANES ]; +int kmb_display_clk_enable (void ) {int ret =0 ;
@@ -367,25 +369,48 @@ static void kmb_setup_mode_config(struct drm_device *drm)static irqreturn_t handle_lcd_irq (struct drm_device *dev) {unsigned long status, val; +int plane_id; +struct kmb_drm_private *dev_p = dev->dev_private; status =kmb_read_lcd (dev->dev_private,LCD_INT_STATUS );if (status &LCD_INT_EOF ) {/* TODO - handle EOF interrupt? */ -kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_EOF ); +kmb_write_lcd (dev_p,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 (plane_status[plane_id].disable) { +kmb_clr_bitmask_lcd (dev_p, +LCD_LAYERn_DMA_CFG (plane_id), +LCD_DMA_LAYER_ENABLE ); + +kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , + plane_status[plane_id].ctrl); + + plane_status[plane_id].disable = false; + } + } } +if (status &LCD_INT_LINE_CMP ) {/* clear line compare interrupt */ -kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR , -LCD_INT_LINE_CMP ); +kmb_write_lcd (dev_p,LCD_INT_CLEAR ,LCD_INT_LINE_CMP ); } +if (status &LCD_INT_LAYER ) {/* Clear layer interrupts */ -kmb_write_lcd (dev->dev_private,LCD_INT_CLEAR ,LCD_INT_LAYER ); +kmb_write_lcd (dev_p,LCD_INT_CLEAR ,LCD_INT_LAYER ); }if (status &LCD_INT_VERT_COMP ) {/* Read VSTATUS */ - val =kmb_read_lcd (dev->dev_private,LCD_VSTATUS ); + val =kmb_read_lcd (dev_p,LCD_VSTATUS ); val = (val &LCD_VSTATUS_VERTICAL_STATUS_MASK );switch (val) {case LCD_VSTATUS_COMPARE_VSYNC :
@@ -401,7 +426,7 @@ static irqreturn_t handle_lcd_irq(struct drm_device *dev) }/* Clear all interrupts */ -kmb_set_bitmask_lcd (dev->dev_private,LCD_INT_CLEAR , ~0x0 ); +kmb_set_bitmask_lcd (dev_p,LCD_INT_CLEAR ,1 );return IRQ_HANDLED ; }
drivers/gpu/drm/kmb/kmb_drv.h +1 -0
@@ -39,6 +39,7 @@#define crtc_to_kmb_priv (x) container_of(x, struct kmb_drm_private, crtc) +struct kmb_drm_private {struct drm_device drm;void __iomem *lcd_mmio;
drivers/gpu/drm/kmb/kmb_plane.c +8 -16
@@ -41,6 +41,8 @@#include "kmb_regs.h" #include "kmb_drv.h" +struct layer_status plane_status[KMB_MAX_PLANES ]; +const uint32_t layer_irqs[] = {LCD_INT_VL0 ,LCD_INT_VL1 ,
@@ -82,34 +84,24 @@ 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 ctrl =0 ; -struct kmb_drm_private *dev_p; -int plane_id; - - dev_p = plane->dev->dev_private; - plane_id = kmb_plane->id; +int plane_id = kmb_plane->id;switch (plane_id) {case LAYER_0 : - ctrl =LCD_CTRL_VL1_ENABLE ; + plane_status[plane_id].ctrl =LCD_CTRL_VL1_ENABLE ;break ;case LAYER_1 : - ctrl =LCD_CTRL_VL2_ENABLE ; + plane_status[plane_id].ctrl =LCD_CTRL_VL2_ENABLE ;break ;case LAYER_2 : - ctrl =LCD_CTRL_GL1_ENABLE ; + plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE ;break ;case LAYER_3 : - ctrl =LCD_CTRL_GL2_ENABLE ; + plane_status[plane_id].ctrl =LCD_CTRL_GL2_ENABLE ;break ; } -kmb_clr_bitmask_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), -LCD_DMA_LAYER_ENABLE ); -kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , ctrl); -DRM_DEBUG ("%s : %d lcd_ctrl = 0x%x lcd_int_enable=0x%x\n" , - __func__, __LINE__,kmb_read_lcd (dev_p,LCD_CONTROL ), -kmb_read_lcd (dev_p,LCD_INT_ENABLE )); + plane_status[plane_id].disable = true; }unsigned int set_pixel_format (u32 format)
drivers/gpu/drm/kmb/kmb_plane.h +8 -1
@@ -61,9 +61,11 @@ enum layer_id {LAYER_1 ,LAYER_2 , LAYER_3, - KMB_MAX_PLANES, +// KMB_MAX_PLANES, }; +#define KMB_MAX_PLANES 1 +enum sub_plane_id {Y_PLANE , U_PLANE,
@@ -125,6 +127,11 @@ static const u32 csc_coef_lcd[] = {-179 ,125 ,-226 }; +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 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 54/59 drm/kmb: Initialize uninitialized variables
In reply to Anitha Chrisanthusgeneral cleaning
--- drivers/gpu/drm/kmb/kmb_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/kmb/kmb_dsi.c +2 -2
@@ -330,7 +330,7 @@ static struct kmb_dsi_host *kmb_dsi_host_init(struct drm_device *drm,struct drm_bridge *kmb_dsi_host_bridge_init (struct device *dev) { -struct drm_bridge *bridge; +struct drm_bridge *bridge =NULL ;#ifndef FCCTEST struct device_node *encoder_node;#endif
@@ -838,7 +838,7 @@ static void mipi_tx_hs_tp_gen(struct kmb_drm_private *dev_p, int vc,static u32 mipi_tx_init_cntrl (struct kmb_drm_private *dev_p,struct mipi_ctrl_cfg *ctrl_cfg) { -u32 ret; +u32 ret =0 ;u8 active_vchannels =0 ;u8 frame_id, sect;u32 bits_per_pclk =0 ;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 55/59 drm/kmb: Added useful messages in LCD ISR
In reply to Anitha ChrisanthusPrint messages for LCD DMA FIFO errors.
--- drivers/gpu/drm/kmb/kmb_drv.c | 68 +++++++++++++++++++++++++++++++++++------ drivers/gpu/drm/kmb/kmb_plane.h | 2 ++ 2 files changed, 60 insertions(+), 10 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +58 -10
@@ -383,15 +383,15 @@ static irqreturn_t handle_lcd_irq(struct drm_device *dev)* disabled but actually disable the plane when EOF irq is * being handled. */ -for (plane_id =LAYER_0 ; plane_id <KMB_MAX_PLANES ; - plane_id++) { +for (plane_id =LAYER_0 ; plane_id <KMB_MAX_PLANES ; plane_id++) {if (plane_status[plane_id].disable) {kmb_clr_bitmask_lcd (dev_p, -LCD_LAYERn_DMA_CFG (plane_id), -LCD_DMA_LAYER_ENABLE ); +LCD_LAYERn_DMA_CFG + (plane_id), +LCD_DMA_LAYER_ENABLE );kmb_clr_bitmask_lcd (dev_p,LCD_CONTROL , - plane_status[plane_id].ctrl); + plane_status[plane_id].ctrl); plane_status[plane_id].disable = false; }
@@ -403,11 +403,6 @@ static irqreturn_t handle_lcd_irq(struct drm_device *dev)kmb_write_lcd (dev_p,LCD_INT_CLEAR ,LCD_INT_LINE_CMP ); } -if (status &LCD_INT_LAYER ) { -/* Clear layer interrupts */ -kmb_write_lcd (dev_p,LCD_INT_CLEAR ,LCD_INT_LAYER ); - } -if (status &LCD_INT_VERT_COMP ) {/* Read VSTATUS */ val =kmb_read_lcd (dev_p,LCD_VSTATUS );
@@ -425,6 +420,59 @@ static irqreturn_t handle_lcd_irq(struct drm_device *dev) } } +if (status &LCD_INT_DMA_ERR ) { + val = (status &LCD_INT_DMA_ERR ); +/* LAYER0 - VL0 */ +if (val &LAYER0_DMA_FIFO_UNDEFLOW ) +DRM_INFO ("LAYER0:VL0 DMA UNDERFLOW val = 0x%lx" , val); +if (val &LAYER0_DMA_FIFO_OVERFLOW ) +DRM_INFO ("LAYER0:VL0 DMA OVERFLOW val = 0x%lx" , val); +if (val &LAYER0_DMA_CB_FIFO_OVERFLOW ) +DRM_INFO ("LAYER0:VL0 DMA CB OVERFLOW val = 0x%lx" , val); +if (val &LAYER0_DMA_CB_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER0:VL0 DMA CB UNDERFLOW val = 0x%lx" , + val); +if (val &LAYER0_DMA_CR_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER0:VL0 DMA CR UNDERFLOW val = 0x%lx" , + val); +if (val &LAYER0_DMA_CR_FIFO_OVERFLOW ) +DRM_INFO ("LAYER0:VL0 DMA CR OVERFLOW val = 0x%lx" , val); + +/* LAYER1 - VL1 */ +if (val &LAYER1_DMA_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER1:VL1 DMA UNDERFLOW val = 0x%lx" , val); +if (val &LAYER1_DMA_FIFO_OVERFLOW ) +DRM_INFO ("LAYER1:VL1 DMA OVERFLOW val = 0x%lx" , val); +if (val &LAYER1_DMA_CB_FIFO_OVERFLOW ) +DRM_INFO ("LAYER1:VL1 DMA CB OVERFLOW val = 0x%lx" , val); +if (val &LAYER1_DMA_CB_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER1:VL1 DMA CB UNDERFLOW val = 0x%lx" , + val); +if (val &LAYER1_DMA_CR_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER1:VL1 DMA CR UNDERFLOW val = 0x%lx" , + val); +if (val &LAYER1_DMA_CR_FIFO_OVERFLOW ) +DRM_INFO ("LAYER1:VL1 DMA CR OVERFLOW val = 0x%lx" , val); + +/* LAYER2 - GL0 */ +if (val &LAYER2_DMA_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER2:GL0 DMA UNDERFLOW val = 0x%lx" , val); +if (val &LAYER2_DMA_FIFO_OVERFLOW ) +DRM_INFO ("LAYER2:GL0 DMA OVERFLOW val = 0x%lx" , val); + +/* LAYER3 - GL1 */ +if (val &LAYER3_DMA_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER3:GL1 DMA UNDERFLOW val = 0x%lx" , val); +if (val &LAYER3_DMA_FIFO_UNDERFLOW ) +DRM_INFO ("LAYER3:GL1 DMA OVERFLOW val = 0x%lx" , val); + + } + +if (status &LCD_INT_LAYER ) { +/* Clear layer interrupts */ +kmb_write_lcd (dev_p,LCD_INT_CLEAR ,LCD_INT_LAYER ); + } +/* Clear all interrupts */ kmb_set_bitmask_lcd (dev_p,LCD_INT_CLEAR ,1 );return IRQ_HANDLED ;
drivers/gpu/drm/kmb/kmb_plane.h +2 -0
@@ -48,6 +48,8 @@#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 INITIALIZED 1
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 56/59 kmb/drm: Prune unsupported modes
In reply to Anitha ChrisanthusKMB display pipeline is LCD->Mipi->HDMI. Mipi->HDMI converter chip only accepts 4-lane input from mipi.
With 4-lane mipi, KMB hardware can only support 1080p resolution. Therefore, limit supported mode to 1080p.
--- drivers/gpu/drm/kmb/kmb_drv.c | 4 ++-- drivers/gpu/drm/kmb/kmb_drv.h | 8 +++++--- drivers/gpu/drm/kmb/kmb_dsi.c | 11 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 2 ++ 4 files changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +2 -2
@@ -359,8 +359,8 @@ static const struct drm_mode_config_funcs kmb_mode_config_funcs = {static void kmb_setup_mode_config (struct drm_device *drm) {drm_mode_config_init (drm); - drm->mode_config.min_width =0 ; - drm->mode_config.min_height =0 ; + 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 ; drm->mode_config.funcs = &kmb_mode_config_funcs;
drivers/gpu/drm/kmb/kmb_drv.h +5 -3
@@ -28,10 +28,12 @@#include "kmb_regs.h" -#define FCCTEST +//#define FCCTEST #define LCD_TEST -#define KMB_MAX_WIDTH 1920/*max width in pixels */ -#define KMB_MAX_HEIGHT 1080/*max height in pixels */ +#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 250000000#define KMB_MIPI_DEFAULT_CLK 24000000#define KMB_MIPI_DEFAULT_CFG_CLK 24000000
drivers/gpu/drm/kmb/kmb_dsi.c +11 -0
@@ -216,6 +216,17 @@ static enum drm_mode_status kmb_dsi_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + struct drm_device *dev = connector->dev; +struct drm_mode_config *mode_config = &dev->mode_config; + +if (mode->hdisplay < mode_config->min_width || + mode->hdisplay > mode_config->max_width) +return MODE_BAD_HVALUE ; + +if (mode->vdisplay < mode_config->min_height || + mode->vdisplay > mode_config->max_height) +return MODE_BAD_VVALUE ; +return MODE_OK ; }
drivers/gpu/drm/kmb/kmb_plane.c +2 -0
@@ -77,6 +77,8 @@ static int kmb_plane_atomic_check(struct drm_plane *plane,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 ;return 0 ; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Anitha Chrisanthus
maintainerPATCH 57/59 drm/kmb: workaround for dma undeflow issue
In reply to Anitha ChrisanthusInitial issue was that display remains shifted after undeflow, this fix is to recover the dma after underflow so display is clean. Major changes are reduce LCD_CLK to 200Mhz and some changes in the lcd timing params run recovery sequence at the EOF after underflow happens
do nothing in plan_update() during recovery
reenable dma at the vsync interrupt after recovery is done
--- drivers/gpu/drm/kmb/kmb_crtc.c | 27 +++---- drivers/gpu/drm/kmb/kmb_drv.c | 156 +++++++++++++++++++++++++++++++--------- drivers/gpu/drm/kmb/kmb_drv.h | 33 +++++---- drivers/gpu/drm/kmb/kmb_plane.c | 12 +++- drivers/gpu/drm/kmb/kmb_plane.h | 29 ++++---- drivers/gpu/drm/kmb/kmb_regs.h | 7 +- 6 files changed, 188 insertions(+), 76 deletions(-)
drivers/gpu/drm/kmb/kmb_crtc.c +14 -13
@@ -115,25 +115,25 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc) vm.vfront_porch =2 ;// vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; vm.vback_porch =2 ; -// vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; - vm.vsync_len =1 ; +// vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; + vm.vsync_len =8 ;//vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; vm.hfront_porch =0 ; vm.hback_porch =0 ;//vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; - vm.hsync_len =7 ; -// vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; + vm.hsync_len =28 ; +// vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; - vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; - vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; + vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; + vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; -DRM_DEBUG - ("%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); +DRM_DEBUG ("%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 (dev->dev_private,LCD_V_ACTIVEHEIGHT , - m->crtc_vdisplay -1 ); + m->crtc_vdisplay -1 );kmb_write_lcd (dev->dev_private,LCD_V_BACKPORCH , vm.vback_porch);kmb_write_lcd (dev->dev_private,LCD_V_FRONTPORCH , vm.vfront_porch);kmb_write_lcd (dev->dev_private,LCD_VSYNC_WIDTH , vm.vsync_len -1 );
@@ -145,7 +145,8 @@ static void kmb_crtc_mode_set_nofb(struct drm_crtc *crtc)/*this is hardcoded as 0 in the Myriadx code */ kmb_write_lcd (dev->dev_private,LCD_VSYNC_START ,0 );kmb_write_lcd (dev->dev_private,LCD_VSYNC_END ,0 ); - +/* back ground color */ +kmb_write_lcd (dev->dev_private,LCD_BG_COLOUR_LS ,0x4 );if (m->flags ==DRM_MODE_FLAG_INTERLACE ) {kmb_write_lcd (dev->dev_private,LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 );
drivers/gpu/drm/kmb/kmb_drv.c +124 -32
255 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.h +18 -15
@@ -34,28 +34,31 @@#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 250000000 +#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 crtc_to_kmb_priv (x) container_of(x, struct kmb_drm_private, crtc) - +#define ICAM_MMIO 0x3b100000 +#define ICAM_LCD_OFFSET 0x1080 +#define ICAM_MMIO_SIZE 0x2000struct kmb_drm_private { -struct drm_device drm; -void __iomem *lcd_mmio; -void __iomem *mipi_mmio; -void __iomem *msscam_mmio; -unsigned char n_layers; -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; -dma_addr_t fb_addr; +struct drm_device drm; +void __iomem *lcd_mmio; +void __iomem *mipi_mmio; +void __iomem *msscam_mmio; +void __iomem *icamlcd_mmio; +unsigned char n_layers; +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; +dma_addr_t fb_addr; };static inline struct kmb_drm_private *to_kmb (const struct drm_device *dev)
drivers/gpu/drm/kmb/kmb_plane.c +10 -2
@@ -42,7 +42,6 @@#include "kmb_drv.h" struct layer_status plane_status[KMB_MAX_PLANES ]; -const uint32_t layer_irqs[] = {LCD_INT_VL0 ,LCD_INT_VL1 ,
@@ -267,13 +266,17 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, fb = plane->state->fb;if (!fb)return ; - num_planes = fb->format->num_planes; kmb_plane =to_kmb_plane (plane); plane_id = kmb_plane->id; dev_p = plane->dev->dev_private; +if (under_flow || flush_done) { +DRM_DEBUG ("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;
@@ -393,6 +396,11 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg);DRM_DEBUG ("dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , dma_cfg,kmb_read_lcd (dev_p,LCD_LAYERn_DMA_CFG (plane_id))); + +kmb_set_bitmask_lcd (dev_p,LCD_INT_CLEAR ,LCD_INT_EOF | +LCD_INT_DMA_ERR ); +kmb_set_bitmask_lcd (dev_p,LCD_INT_ENABLE ,LCD_INT_EOF | +LCD_INT_DMA_ERR );#endif }
drivers/gpu/drm/kmb/kmb_plane.h +16 -13
@@ -28,19 +28,22 @@#include "kmb_drv.h" -#define LCD_INT_VL0_ERR (LAYER0_DMA_FIFO_UNDEFLOW | \ - 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) +extern int under_flow; +extern int 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)
drivers/gpu/drm/kmb/kmb_regs.h +6 -1
@@ -86,7 +86,7 @@#define LAYER0_DMA_DONE (1<<3)#define LAYER0_DMA_IDLE (1<<4)#define LAYER0_DMA_FIFO_OVERFLOW (1<<5) -#define LAYER0_DMA_FIFO_UNDEFLOW (1<<6) +#define LAYER0_DMA_FIFO_UNDERFLOW (1<<6)#define LAYER0_DMA_CB_FIFO_OVERFLOW (1<<7)#define LAYER0_DMA_CB_FIFO_UNDERFLOW (1<<8)#define LAYER0_DMA_CR_FIFO_OVERFLOW (1<<9)
@@ -402,6 +402,7 @@#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 (1 << 3)#define LCD_VIDEO0_DMA1_BYTES (0x4 * 0xb02)#define LCD_VIDEO0_DMA1_STATE (0x4 * 0xb03)#define LCD_VIDEO0_DMA2_BYTES (0x4 * 0xb04)
@@ -750,4 +751,8 @@#define MSSCPU_CPR_CLK_EN (0x0)#define MSSCPU_CPR_RST_EN (0x10)#define BIT_MASK_16 (0xffff) +/*icam lcd qos */ +#define LCD_QOS_PRORITY (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
Anitha Chrisanthus
maintainerPATCH 58/59 drm/kmb: Get System Clock from SCMI
In reply to Anitha ChrisanthusSystem clock is different for A0 and B0 silicons, so get it directly from clk_PLL0 through SCMI calls.
--- drivers/gpu/drm/kmb/kmb_drv.c | 11 +++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 1 + drivers/gpu/drm/kmb/kmb_dsi.c | 12 +----------- 3 files changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/kmb/kmb_drv.c +11 -0
@@ -59,6 +59,7 @@ static struct clk *clk_lcd;static struct clk *clk_mipi;static struct clk *clk_mipi_ecfg;static struct clk *clk_mipi_cfg; +static struct clk *clk_pll0;struct drm_bridge *adv_bridge;
@@ -144,6 +145,7 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)#ifdef ICAM_LCD_QOS int val =0 ;#endif +struct device_node *vpu_dev;/* Map MIPI MMIO registers */ dev_p->mipi_mmio =kmb_map_mmio (pdev,"mipi_regs" );
@@ -210,6 +212,15 @@ static int kmb_load(struct drm_device *drm, unsigned long flags)DRM_ERROR ("clk_get() failed clk_mipi_cfg\n" ); goto setup_fail; } + vpu_dev =of_find_node_by_path ("/soc/vpu-ipc" ); +DRM_INFO ("vpu node = %pOF" , vpu_dev); + clk_pll0 =of_clk_get_by_name (vpu_dev,"pll_0_out_0" ); +if (IS_ERR (clk_pll0)) { +DRM_ERROR ("clk_get() failed clk_pll0 " ); + goto setup_fail; + } + dev_p->sys_clk_mhz =clk_get_rate (clk_pll0)/1000000 ; +DRM_INFO ("system clk = %d Mhz" , dev_p->sys_clk_mhz);#ifdef LCD_TEST /* Set LCD clock to 200 Mhz */ DRM_DEBUG ("Get clk_lcd before set = %ld\n" ,clk_get_rate (clk_lcd));
drivers/gpu/drm/kmb/kmb_drv.h +1 -0
@@ -58,6 +58,7 @@ struct kmb_drm_private {spinlock_t irq_lock;int irq_lcd;int irq_mipi; +int sys_clk_mhz;dma_addr_t fb_addr; };
drivers/gpu/drm/kmb/kmb_dsi.c +1 -11
@@ -611,20 +611,10 @@ static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *dev_p, u8 frame_gen,u32 ppl_llp_ratio;u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; -#ifdef GET_SYS_CLK -/* Get system clock for blanking period cnfigurations */ - sc =get_clock_frequency (CPR_CLK_SYSTEM , &sysclk); -if (sc) -return sc; - -/* Convert to MHZ */ - sysclk /=1000 ; -#else /* 500 Mhz system clock minus 50 to account for the difference in * MIPI clock speed in RTL tests */ - sysclk =KMB_SYS_CLK_MHZ -50 ; -#endif + sysclk = dev_p->sys_clk_mhz -50 ;/* PPL-Pixel Packing Layer, LLP-Low Level Protocol * Frame genartor timing parameters are clocked on the system clock,
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Anitha Chrisanthus
maintainerPATCH 59/59 drm/kmb: work around for planar formats
In reply to Anitha ChrisanthusSet the DMA Vstride and Line width for U and V planes to the same as the Y plane and not the actual pitch.
Bit18 of layer config does not have any effect when U and V planes are swapped, so swap it in the driver.
--- drivers/gpu/drm/kmb/kmb_plane.c | 50 ++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 20 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +30 -20
@@ -190,6 +190,8 @@ unsigned int set_pixel_format(u32 format) val =LCD_LAYER_FORMAT_RGBA8888 ;break ; } +DRM_INFO_ONCE ("%s : %d format=0x%x val=0x%x\n" , + __func__, __LINE__, format, val);return val; }
@@ -300,38 +302,48 @@ static void kmb_plane_atomic_update(struct drm_plane *plane, dev_p->fb_addr = addr[Y_PLANE ];kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_ADDR (plane_id), addr[Y_PLANE ] + fb->offsets[0 ]); + val =set_pixel_format (fb->format->format); + val |=set_bits_per_pixel (fb->format);/* Program Cb/Cr for planar formats */ if (num_planes >1 ) { -if (fb->format->format ==DRM_FORMAT_YUV420 || - fb->format->format ==DRM_FORMAT_YVU420 ) - width /=2 ; -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_CB_LINE_VSTRIDE (plane_id), - fb->pitches[LAYER_1 ]); - + width*fb->format->cpp[0 ]);kmb_write_lcd (dev_p,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 ); -kmb_write_lcd (dev_p,LCD_LAYERn_DMA_START_CB_ADR (plane_id), - addr[U_PLANE ]); +U_PLANE ); +/* check if Cb/Cr is swapped*/ +if ((num_planes ==3 ) && (val &LCD_LAYER_CRCB_ORDER )) +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_START_CR_ADR (plane_id), + addr[U_PLANE ]); +else +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_START_CB_ADR (plane_id), + addr[U_PLANE ]);if (num_planes ==3 ) {kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CR_LINE_VSTRIDE (plane_id), - fb->pitches[LAYER_2 ]); +LCD_LAYERn_DMA_CR_LINE_VSTRIDE (plane_id), + ((width)*fb->format->cpp[0 ]));kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_CR_LINE_WIDTH (plane_id), - (width * fb->format->cpp[0 ])); +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 ); -kmb_write_lcd (dev_p, -LCD_LAYERn_DMA_START_CR_ADR (plane_id), - addr[V_PLANE ]); + plane->state,V_PLANE ); + +/* check if Cb/Cr is swapped*/ +if (val &LCD_LAYER_CRCB_ORDER ) +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_START_CB_ADR (plane_id), + addr[V_PLANE ]); +else +kmb_write_lcd (dev_p, +LCD_LAYERn_DMA_START_CR_ADR (plane_id), + addr[V_PLANE ]); } }
@@ -340,8 +352,6 @@ static void kmb_plane_atomic_update(struct drm_plane *plane,kmb_write_lcd (dev_p,LCD_LAYERn_COL_START (plane_id), crtc_x);kmb_write_lcd (dev_p,LCD_LAYERn_ROW_START (plane_id), crtc_y); - val =set_pixel_format (fb->format->format); - val |=set_bits_per_pixel (fb->format);/*CHECKME Leon drvr sets it to 100 try this for now */ val |=LCD_LAYER_FIFO_100 ;
Signature · 6 lines
2.7.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Add support for Keem Bay DRM driver
In reply to Anitha Chrisanthus== Series Details ==
== Series Details ==
Series: Add support for Keem Bay DRM driver
URL : https://patchwork.freedesktop.org/series/78961/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip c489c4330583 drm/kmb: Add support for KeemBay Display -:39: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #39: new file mode 100644
-:256: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #256: FILE: drivers/gpu/drm/kmb/kmb_crtc.c:187:
+
+}
-:345: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations #345: FILE: drivers/gpu/drm/kmb/kmb_crtc.h:55:
+};
+#define to_kmb_crtc_state(x) container_of(x, struct kmb_crtc_state, crtc_base)
-:347: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files #347: FILE: drivers/gpu/drm/kmb/kmb_crtc.h:57:
+extern void kmb_plane_destroy(struct drm_plane *plane);
-:348: CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files #348: FILE: drivers/gpu/drm/kmb/kmb_crtc.h:58:
+extern struct drm_plane *kmb_plane_init(struct drm_device *drm);
-:892: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_CFG> #892: FILE: drivers/gpu/drm/kmb/kmb_plane.c:86:
+ kmb_write(lcd, LCD_LAYERn_DMA_CFG(i), ~LCD_DMA_LAYER_ENABLE);
-:895: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_ADDR> #895: FILE: drivers/gpu/drm/kmb/kmb_plane.c:89:
+ kmb_write(lcd, LCD_LAYERn_DMA_START_ADDR(i), addr);
-:896: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_SHADOW> #896: FILE: drivers/gpu/drm/kmb/kmb_plane.c:90:
+ kmb_write(lcd, LCD_LAYERn_DMA_START_SHADOW(i), addr);
-:901: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LEN> #901: FILE: drivers/gpu/drm/kmb/kmb_plane.c:95:
+ kmb_write(lcd, LCD_LAYERn_DMA_LEN(i), dma_len);
-:903: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LINE_VSTRIDE> #903: FILE: drivers/gpu/drm/kmb/kmb_plane.c:97:
+ kmb_write(lcd, LCD_LAYERn_DMA_LINE_VSTRIDE(i), fb->pitches[0]);
-:904: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LINE_WIDTH> #904: FILE: drivers/gpu/drm/kmb/kmb_plane.c:98:
+ kmb_write(lcd, LCD_LAYERn_DMA_LINE_WIDTH(i),
-:1022: CHECK:PREFER_KERNEL_TYPES: Prefer kernel type 'u32' over 'uint32_t' #1022: FILE: drivers/gpu/drm/kmb/kmb_plane.c:216:
+ const uint32_t *plane_formats;
-:1026: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #1026: FILE: drivers/gpu/drm/kmb/kmb_plane.c:220:
+ for (i = 0; i < lcd->n_layers; i++) {
+
-:1043: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #1043: FILE: drivers/gpu/drm/kmb/kmb_plane.c:237:
+ ret = drm_universal_plane_init(drm, plane, 0xFF,
+ &kmb_plane_funcs, plane_formats,
-:1168: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1168: FILE: drivers/gpu/drm/kmb/kmb_regs.h:46:
+#define LCD_LAYERn_CFG(N) (LCD_LAYER0_CFG + (0x400*N))
^
-:1168: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CFG> #1168: FILE: drivers/gpu/drm/kmb/kmb_regs.h:46:
+#define LCD_LAYERn_CFG(N) (LCD_LAYER0_CFG + (0x400*N))
-:1168: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1168: FILE: drivers/gpu/drm/kmb/kmb_regs.h:46:
+#define LCD_LAYERn_CFG(N) (LCD_LAYER0_CFG + (0x400*N))
-:1170: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1170: FILE: drivers/gpu/drm/kmb/kmb_regs.h:48:
+#define LCD_LAYERn_COL_START(N) (LCD_LAYER0_COL_START + (0x400*N))
^
-:1170: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_COL_START> #1170: FILE: drivers/gpu/drm/kmb/kmb_regs.h:48:
+#define LCD_LAYERn_COL_START(N) (LCD_LAYER0_COL_START + (0x400*N))
-:1170: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1170: FILE: drivers/gpu/drm/kmb/kmb_regs.h:48:
+#define LCD_LAYERn_COL_START(N) (LCD_LAYER0_COL_START + (0x400*N))
-:1172: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1172: FILE: drivers/gpu/drm/kmb/kmb_regs.h:50:
+#define LCD_LAYERn_ROW_START(N) (LCD_LAYER0_ROW_START + (0x400*N))
^
-:1172: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_ROW_START> #1172: FILE: drivers/gpu/drm/kmb/kmb_regs.h:50:
+#define LCD_LAYERn_ROW_START(N) (LCD_LAYER0_ROW_START + (0x400*N))
-:1172: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1172: FILE: drivers/gpu/drm/kmb/kmb_regs.h:50:
+#define LCD_LAYERn_ROW_START(N) (LCD_LAYER0_ROW_START + (0x400*N))
-:1174: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1174: FILE: drivers/gpu/drm/kmb/kmb_regs.h:52:
+#define LCD_LAYERn_WIDTH(N) (LCD_LAYER0_WIDTH + (0x400*N))
^
-:1174: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_WIDTH> #1174: FILE: drivers/gpu/drm/kmb/kmb_regs.h:52:
+#define LCD_LAYERn_WIDTH(N) (LCD_LAYER0_WIDTH + (0x400*N))
-:1174: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1174: FILE: drivers/gpu/drm/kmb/kmb_regs.h:52:
+#define LCD_LAYERn_WIDTH(N) (LCD_LAYER0_WIDTH + (0x400*N))
-:1176: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1176: FILE: drivers/gpu/drm/kmb/kmb_regs.h:54:
+#define LCD_LAYERn_HEIGHT(N) (LCD_LAYER0_HEIGHT + (0x400*N))
^
-:1176: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_HEIGHT> #1176: FILE: drivers/gpu/drm/kmb/kmb_regs.h:54:
+#define LCD_LAYERn_HEIGHT(N) (LCD_LAYER0_HEIGHT + (0x400*N))
-:1176: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1176: FILE: drivers/gpu/drm/kmb/kmb_regs.h:54:
+#define LCD_LAYERn_HEIGHT(N) (LCD_LAYER0_HEIGHT + (0x400*N))
-:1178: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1178: FILE: drivers/gpu/drm/kmb/kmb_regs.h:56:
+#define LCD_LAYERn_SCALE_CFG(N) (LCD_LAYER0_SCALE_CFG + (0x400*N))
^
-:1178: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_SCALE_CFG> #1178: FILE: drivers/gpu/drm/kmb/kmb_regs.h:56:
+#define LCD_LAYERn_SCALE_CFG(N) (LCD_LAYER0_SCALE_CFG + (0x400*N))
-:1178: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1178: FILE: drivers/gpu/drm/kmb/kmb_regs.h:56:
+#define LCD_LAYERn_SCALE_CFG(N) (LCD_LAYER0_SCALE_CFG + (0x400*N))
-:1180: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1180: FILE: drivers/gpu/drm/kmb/kmb_regs.h:58:
+#define LCD_LAYERn_ALPHA(N) (LCD_LAYER0_ALPHA + (0x400*N))
^
-:1180: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_ALPHA> #1180: FILE: drivers/gpu/drm/kmb/kmb_regs.h:58:
+#define LCD_LAYERn_ALPHA(N) (LCD_LAYER0_ALPHA + (0x400*N))
-:1180: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1180: FILE: drivers/gpu/drm/kmb/kmb_regs.h:58:
+#define LCD_LAYERn_ALPHA(N) (LCD_LAYER0_ALPHA + (0x400*N))
-:1182: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1182: FILE: drivers/gpu/drm/kmb/kmb_regs.h:60:
+#define LCD_LAYERn_INV_COLOUR_LS(N) (LCD_LAYER0_INV_COLOUR_LS + (0x400*N))
^
-:1182: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_INV_COLOUR_LS> #1182: FILE: drivers/gpu/drm/kmb/kmb_regs.h:60:
+#define LCD_LAYERn_INV_COLOUR_LS(N) (LCD_LAYER0_INV_COLOUR_LS + (0x400*N))
-:1182: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1182: FILE: drivers/gpu/drm/kmb/kmb_regs.h:60:
+#define LCD_LAYERn_INV_COLOUR_LS(N) (LCD_LAYER0_INV_COLOUR_LS + (0x400*N))
-:1184: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1184: FILE: drivers/gpu/drm/kmb/kmb_regs.h:62:
+#define LCD_LAYERn_INV_COLOUR_MS(N) (LCD_LAYER0_INV_COLOUR_MS + (0x400*N))
^
-:1184: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_INV_COLOUR_MS> #1184: FILE: drivers/gpu/drm/kmb/kmb_regs.h:62:
+#define LCD_LAYERn_INV_COLOUR_MS(N) (LCD_LAYER0_INV_COLOUR_MS + (0x400*N))
-:1184: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1184: FILE: drivers/gpu/drm/kmb/kmb_regs.h:62:
+#define LCD_LAYERn_INV_COLOUR_MS(N) (LCD_LAYER0_INV_COLOUR_MS + (0x400*N))
-:1186: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1186: FILE: drivers/gpu/drm/kmb/kmb_regs.h:64:
+#define LCD_LAYERn_TRANS_COLOUR_LS(N) (LCD_LAYER0_TRANS_COLOUR_LS + (0x400*N))
^
-:1186: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_TRANS_COLOUR_LS> #1186: FILE: drivers/gpu/drm/kmb/kmb_regs.h:64:
+#define LCD_LAYERn_TRANS_COLOUR_LS(N) (LCD_LAYER0_TRANS_COLOUR_LS + (0x400*N))
-:1186: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1186: FILE: drivers/gpu/drm/kmb/kmb_regs.h:64:
+#define LCD_LAYERn_TRANS_COLOUR_LS(N) (LCD_LAYER0_TRANS_COLOUR_LS + (0x400*N))
-:1188: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1188: FILE: drivers/gpu/drm/kmb/kmb_regs.h:66:
+#define LCD_LAYERn_TRANS_COLOUR_MS(N) (LCD_LAYER0_TRANS_COLOUR_MS + (0x400*N))
^
-:1188: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_TRANS_COLOUR_MS> #1188: FILE: drivers/gpu/drm/kmb/kmb_regs.h:66:
+#define LCD_LAYERn_TRANS_COLOUR_MS(N) (LCD_LAYER0_TRANS_COLOUR_MS + (0x400*N))
-:1188: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1188: FILE: drivers/gpu/drm/kmb/kmb_regs.h:66:
+#define LCD_LAYERn_TRANS_COLOUR_MS(N) (LCD_LAYER0_TRANS_COLOUR_MS + (0x400*N))
-:1190: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1190: FILE: drivers/gpu/drm/kmb/kmb_regs.h:68:
+#define LCD_LAYERn_CSC_COEFF11(N) (LCD_LAYER0_CSC_COEFF11 + (0x400*N))
^
-:1190: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF11> #1190: FILE: drivers/gpu/drm/kmb/kmb_regs.h:68:
+#define LCD_LAYERn_CSC_COEFF11(N) (LCD_LAYER0_CSC_COEFF11 + (0x400*N))
-:1190: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1190: FILE: drivers/gpu/drm/kmb/kmb_regs.h:68:
+#define LCD_LAYERn_CSC_COEFF11(N) (LCD_LAYER0_CSC_COEFF11 + (0x400*N))
-:1192: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1192: FILE: drivers/gpu/drm/kmb/kmb_regs.h:70:
+#define LCD_LAYERn_CSC_COEFF12(N) (LCD_LAYER0_CSC_COEFF12 + (0x400*N))
^
-:1192: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF12> #1192: FILE: drivers/gpu/drm/kmb/kmb_regs.h:70:
+#define LCD_LAYERn_CSC_COEFF12(N) (LCD_LAYER0_CSC_COEFF12 + (0x400*N))
-:1192: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1192: FILE: drivers/gpu/drm/kmb/kmb_regs.h:70:
+#define LCD_LAYERn_CSC_COEFF12(N) (LCD_LAYER0_CSC_COEFF12 + (0x400*N))
-:1194: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1194: FILE: drivers/gpu/drm/kmb/kmb_regs.h:72:
+#define LCD_LAYERn_CSC_COEFF13(N) (LCD_LAYER0_CSC_COEFF13 + (0x400*N))
^
-:1194: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF13> #1194: FILE: drivers/gpu/drm/kmb/kmb_regs.h:72:
+#define LCD_LAYERn_CSC_COEFF13(N) (LCD_LAYER0_CSC_COEFF13 + (0x400*N))
-:1194: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1194: FILE: drivers/gpu/drm/kmb/kmb_regs.h:72:
+#define LCD_LAYERn_CSC_COEFF13(N) (LCD_LAYER0_CSC_COEFF13 + (0x400*N))
-:1196: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1196: FILE: drivers/gpu/drm/kmb/kmb_regs.h:74:
+#define LCD_LAYERn_CSC_COEFF21(N) (LCD_LAYER0_CSC_COEFF21 + (0x400*N))
^
-:1196: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF21> #1196: FILE: drivers/gpu/drm/kmb/kmb_regs.h:74:
+#define LCD_LAYERn_CSC_COEFF21(N) (LCD_LAYER0_CSC_COEFF21 + (0x400*N))
-:1196: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1196: FILE: drivers/gpu/drm/kmb/kmb_regs.h:74:
+#define LCD_LAYERn_CSC_COEFF21(N) (LCD_LAYER0_CSC_COEFF21 + (0x400*N))
-:1198: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1198: FILE: drivers/gpu/drm/kmb/kmb_regs.h:76:
+#define LCD_LAYERn_CSC_COEFF22(N) (LCD_LAYER0_CSC_COEFF22 + (0x400*N))
^
-:1198: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF22> #1198: FILE: drivers/gpu/drm/kmb/kmb_regs.h:76:
+#define LCD_LAYERn_CSC_COEFF22(N) (LCD_LAYER0_CSC_COEFF22 + (0x400*N))
-:1198: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1198: FILE: drivers/gpu/drm/kmb/kmb_regs.h:76:
+#define LCD_LAYERn_CSC_COEFF22(N) (LCD_LAYER0_CSC_COEFF22 + (0x400*N))
-:1200: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1200: FILE: drivers/gpu/drm/kmb/kmb_regs.h:78:
+#define LCD_LAYERn_CSC_COEFF23(N) (LCD_LAYER0_CSC_COEFF23 + (0x400*N))
^
-:1200: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF23> #1200: FILE: drivers/gpu/drm/kmb/kmb_regs.h:78:
+#define LCD_LAYERn_CSC_COEFF23(N) (LCD_LAYER0_CSC_COEFF23 + (0x400*N))
-:1200: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1200: FILE: drivers/gpu/drm/kmb/kmb_regs.h:78:
+#define LCD_LAYERn_CSC_COEFF23(N) (LCD_LAYER0_CSC_COEFF23 + (0x400*N))
-:1202: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1202: FILE: drivers/gpu/drm/kmb/kmb_regs.h:80:
+#define LCD_LAYERn_CSC_COEFF31(N) (LCD_LAYER0_CSC_COEFF31 + (0x400*N))
^
-:1202: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF31> #1202: FILE: drivers/gpu/drm/kmb/kmb_regs.h:80:
+#define LCD_LAYERn_CSC_COEFF31(N) (LCD_LAYER0_CSC_COEFF31 + (0x400*N))
-:1202: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1202: FILE: drivers/gpu/drm/kmb/kmb_regs.h:80:
+#define LCD_LAYERn_CSC_COEFF31(N) (LCD_LAYER0_CSC_COEFF31 + (0x400*N))
-:1204: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1204: FILE: drivers/gpu/drm/kmb/kmb_regs.h:82:
+#define LCD_LAYERn_CSC_COEFF32(N) (LCD_LAYER0_CSC_COEFF32 + (0x400*N))
^
-:1204: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF32> #1204: FILE: drivers/gpu/drm/kmb/kmb_regs.h:82:
+#define LCD_LAYERn_CSC_COEFF32(N) (LCD_LAYER0_CSC_COEFF32 + (0x400*N))
-:1204: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1204: FILE: drivers/gpu/drm/kmb/kmb_regs.h:82:
+#define LCD_LAYERn_CSC_COEFF32(N) (LCD_LAYER0_CSC_COEFF32 + (0x400*N))
-:1206: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1206: FILE: drivers/gpu/drm/kmb/kmb_regs.h:84:
+#define LCD_LAYERn_CSC_COEFF33(N) (LCD_LAYER0_CSC_COEFF33 + (0x400*N))
^
-:1206: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF33> #1206: FILE: drivers/gpu/drm/kmb/kmb_regs.h:84:
+#define LCD_LAYERn_CSC_COEFF33(N) (LCD_LAYER0_CSC_COEFF33 + (0x400*N))
-:1206: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1206: FILE: drivers/gpu/drm/kmb/kmb_regs.h:84:
+#define LCD_LAYERn_CSC_COEFF33(N) (LCD_LAYER0_CSC_COEFF33 + (0x400*N))
-:1208: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1208: FILE: drivers/gpu/drm/kmb/kmb_regs.h:86:
+#define LCD_LAYERn_CSC_OFF1(N) (LCD_LAYER0_CSC_OFF1 + (0x400*N))
^
-:1208: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_OFF1> #1208: FILE: drivers/gpu/drm/kmb/kmb_regs.h:86:
+#define LCD_LAYERn_CSC_OFF1(N) (LCD_LAYER0_CSC_OFF1 + (0x400*N))
-:1208: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1208: FILE: drivers/gpu/drm/kmb/kmb_regs.h:86:
+#define LCD_LAYERn_CSC_OFF1(N) (LCD_LAYER0_CSC_OFF1 + (0x400*N))
-:1210: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1210: FILE: drivers/gpu/drm/kmb/kmb_regs.h:88:
+#define LCD_LAYERn_CSC_OFF2(N) (LCD_LAYER0_CSC_OFF2 + (0x400*N))
^
-:1210: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_OFF2> #1210: FILE: drivers/gpu/drm/kmb/kmb_regs.h:88:
+#define LCD_LAYERn_CSC_OFF2(N) (LCD_LAYER0_CSC_OFF2 + (0x400*N))
-:1210: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1210: FILE: drivers/gpu/drm/kmb/kmb_regs.h:88:
+#define LCD_LAYERn_CSC_OFF2(N) (LCD_LAYER0_CSC_OFF2 + (0x400*N))
-:1212: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1212: FILE: drivers/gpu/drm/kmb/kmb_regs.h:90:
+#define LCD_LAYERn_CSC_OFF3(N) (LCD_LAYER0_CSC_OFF3 + (0x400*N))
^
-:1212: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_OFF3> #1212: FILE: drivers/gpu/drm/kmb/kmb_regs.h:90:
+#define LCD_LAYERn_CSC_OFF3(N) (LCD_LAYER0_CSC_OFF3 + (0x400*N))
-:1212: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1212: FILE: drivers/gpu/drm/kmb/kmb_regs.h:90:
+#define LCD_LAYERn_CSC_OFF3(N) (LCD_LAYER0_CSC_OFF3 + (0x400*N))
-:1214: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1214: FILE: drivers/gpu/drm/kmb/kmb_regs.h:92:
+#define LCD_LAYERn_DMA_CFG(N) (LCD_LAYER0_DMA_CFG + (0x400*N))
^
-:1214: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1214: FILE: drivers/gpu/drm/kmb/kmb_regs.h:92:
+#define LCD_LAYERn_DMA_CFG(N) (LCD_LAYER0_DMA_CFG + (0x400*N))
-:1216: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1216: FILE: drivers/gpu/drm/kmb/kmb_regs.h:94:
+#define LCD_LAYERn_DMA_START_ADDR(N) (LCD_LAYER0_DMA_START_ADR + (0x400*N))
^
-:1216: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1216: FILE: drivers/gpu/drm/kmb/kmb_regs.h:94:
+#define LCD_LAYERn_DMA_START_ADDR(N) (LCD_LAYER0_DMA_START_ADR + (0x400*N))
-:1218: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1218: FILE: drivers/gpu/drm/kmb/kmb_regs.h:96:
+#define LCD_LAYERn_DMA_START_SHADOW(N) (LCD_LAYER0_DMA_START_SHADOW + (0x400*N))
^
-:1218: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1218: FILE: drivers/gpu/drm/kmb/kmb_regs.h:96:
+#define LCD_LAYERn_DMA_START_SHADOW(N) (LCD_LAYER0_DMA_START_SHADOW + (0x400*N))
-:1220: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1220: FILE: drivers/gpu/drm/kmb/kmb_regs.h:98:
+#define LCD_LAYERn_DMA_LEN(N) (LCD_LAYER0_DMA_LEN + (0x400*N))
^
-:1220: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1220: FILE: drivers/gpu/drm/kmb/kmb_regs.h:98:
+#define LCD_LAYERn_DMA_LEN(N) (LCD_LAYER0_DMA_LEN + (0x400*N))
-:1222: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1222: FILE: drivers/gpu/drm/kmb/kmb_regs.h:100:
+#define LCD_LAYERn_DMA_LEN_SHADOW(N) (LCD_LAYER0_DMA_LEN_SHADOW + (0x400*N))
^
-:1222: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LEN_SHADOW> #1222: FILE: drivers/gpu/drm/kmb/kmb_regs.h:100:
+#define LCD_LAYERn_DMA_LEN_SHADOW(N) (LCD_LAYER0_DMA_LEN_SHADOW + (0x400*N))
-:1222: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1222: FILE: drivers/gpu/drm/kmb/kmb_regs.h:100:
+#define LCD_LAYERn_DMA_LEN_SHADOW(N) (LCD_LAYER0_DMA_LEN_SHADOW + (0x400*N))
-:1224: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1224: FILE: drivers/gpu/drm/kmb/kmb_regs.h:102:
+#define LCD_LAYERn_DMA_STATUS(N) (LCD_LAYER0_DMA_STATUS + (0x400*N))
^
-:1224: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_STATUS> #1224: FILE: drivers/gpu/drm/kmb/kmb_regs.h:102:
+#define LCD_LAYERn_DMA_STATUS(N) (LCD_LAYER0_DMA_STATUS + (0x400*N))
-:1224: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1224: FILE: drivers/gpu/drm/kmb/kmb_regs.h:102:
+#define LCD_LAYERn_DMA_STATUS(N) (LCD_LAYER0_DMA_STATUS + (0x400*N))
-:1226: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1226: FILE: drivers/gpu/drm/kmb/kmb_regs.h:104:
+#define LCD_LAYERn_DMA_LINE_WIDTH(N) (LCD_LAYER0_DMA_LINE_WIDTH + (0x400*N))
^
-:1226: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1226: FILE: drivers/gpu/drm/kmb/kmb_regs.h:104:
+#define LCD_LAYERn_DMA_LINE_WIDTH(N) (LCD_LAYER0_DMA_LINE_WIDTH + (0x400*N))
-:1228: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1228: FILE: drivers/gpu/drm/kmb/kmb_regs.h:106:
+#define LCD_LAYERn_DMA_LINE_VSTRIDE(N) (LCD_LAYER0_DMA_LINE_VSTRIDE + (0x400*N))
^
-:1228: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1228: FILE: drivers/gpu/drm/kmb/kmb_regs.h:106:
+#define LCD_LAYERn_DMA_LINE_VSTRIDE(N) (LCD_LAYER0_DMA_LINE_VSTRIDE + (0x400*N))
-:1230: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1230: FILE: drivers/gpu/drm/kmb/kmb_regs.h:108:
+#define LCD_LAYERn_DMA_FIFO_STATUS(N) (LCD_LAYER0_DMA_FIFO_STATUS + (0x400*N))
^
-:1230: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_FIFO_STATUS> #1230: FILE: drivers/gpu/drm/kmb/kmb_regs.h:108:
+#define LCD_LAYERn_DMA_FIFO_STATUS(N) (LCD_LAYER0_DMA_FIFO_STATUS + (0x400*N))
-:1230: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1230: FILE: drivers/gpu/drm/kmb/kmb_regs.h:108:
+#define LCD_LAYERn_DMA_FIFO_STATUS(N) (LCD_LAYER0_DMA_FIFO_STATUS + (0x400*N))
-:1232: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1232: FILE: drivers/gpu/drm/kmb/kmb_regs.h:110:
+#define LCD_LAYERn_CFG2(N) (LCD_LAYER0_CFG2 + (0x400*N))
^
-:1232: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CFG2> #1232: FILE: drivers/gpu/drm/kmb/kmb_regs.h:110:
+#define LCD_LAYERn_CFG2(N) (LCD_LAYER0_CFG2 + (0x400*N))
-:1232: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1232: FILE: drivers/gpu/drm/kmb/kmb_regs.h:110:
+#define LCD_LAYERn_CFG2(N) (LCD_LAYER0_CFG2 + (0x400*N))
-:1235: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1235: FILE: drivers/gpu/drm/kmb/kmb_regs.h:113:
+#define LCD_LAYERn_CFG2(N) (LCD_LAYER0_CFG2 + (0x400*N))
^
-:1235: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1235: FILE: drivers/gpu/drm/kmb/kmb_regs.h:113:
+#define LCD_LAYERn_CFG2(N) (LCD_LAYER0_CFG2 + (0x400*N))
-:1426: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1426: FILE: drivers/gpu/drm/kmb/kmb_regs.h:304:
+#define LAYER3_DMA_FIFO_UNDERFLOW_BIT (1<<26)
^
-:1427: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1427: FILE: drivers/gpu/drm/kmb/kmb_regs.h:305:
+#define LAYER3_DMA_OVERFLOW_BIT (1<<25)
^
-:1428: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1428: FILE: drivers/gpu/drm/kmb/kmb_regs.h:306:
+#define LAYER3_DMA_IDLE_BIT (1<<24)
^
-:1429: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1429: FILE: drivers/gpu/drm/kmb/kmb_regs.h:307:
+#define LAYER3_DMA_DONE_BIT (1<<23)
^
-:1431: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1431: FILE: drivers/gpu/drm/kmb/kmb_regs.h:309:
+#define LAYER2_DMA_FIFO_UNDERFLOW_BIT (1<<22)
^
-:1432: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1432: FILE: drivers/gpu/drm/kmb/kmb_regs.h:310:
+#define LAYER2_DMA_OVERFLOW_BIT (1<<21)
^
-:1433: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1433: FILE: drivers/gpu/drm/kmb/kmb_regs.h:311:
+#define LAYER2_DMA_IDLE_BIT (1<<20)
^
-:1434: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1434: FILE: drivers/gpu/drm/kmb/kmb_regs.h:312:
+#define LAYER2_DMA_DONE_BIT (1<<19)
^
-:1436: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1436: FILE: drivers/gpu/drm/kmb/kmb_regs.h:314:
+#define LAYER1_DMA_CR_FIFO_UNDERFLOW_BIT (1<<18)
^
-:1437: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1437: FILE: drivers/gpu/drm/kmb/kmb_regs.h:315:
+#define LAYER1_DMA_CR_FIFO_OVERFLOW_BIT (1<<17)
^
-:1438: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1438: FILE: drivers/gpu/drm/kmb/kmb_regs.h:316:
+#define LAYER1_DMA_CB_FIFO_UNDERFLOW_BIT (1<<16)
^
-:1439: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1439: FILE: drivers/gpu/drm/kmb/kmb_regs.h:317:
+#define LAYER1_DMA_CB_FIFO_OVERFLOW_BIT (1<<15)
^
-:1441: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1441: FILE: drivers/gpu/drm/kmb/kmb_regs.h:319:
+#define LAYER1_DMA_FIFO_UNDERFLOW_BIT (1<<14)
^
-:1442: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1442: FILE: drivers/gpu/drm/kmb/kmb_regs.h:320:
+#define LAYER1_DMA_OVERFLOW_BIT (1<<13)
^
-:1443: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1443: FILE: drivers/gpu/drm/kmb/kmb_regs.h:321:
+#define LAYER1_DMA_IDLE_BIT (1<<12)
^
-:1444: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1444: FILE: drivers/gpu/drm/kmb/kmb_regs.h:322:
+#define LAYER1_DMA_DONE_BIT (1<<11)
^
-:1446: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1446: FILE: drivers/gpu/drm/kmb/kmb_regs.h:324:
+#define LAYER0_DMA_CR_FIFO_UNDERFLOW_BIT (1<<10)
^
-:1447: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1447: FILE: drivers/gpu/drm/kmb/kmb_regs.h:325:
+#define LAYER0_DMA_CR_FIFO_OVERFLOW_BIT (1<<9)
^
-:1448: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1448: FILE: drivers/gpu/drm/kmb/kmb_regs.h:326:
+#define LAYER0_DMA_CB_FIFO_UNDERFLOW_BIT (1<<8)
^
-:1449: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1449: FILE: drivers/gpu/drm/kmb/kmb_regs.h:327:
+#define LAYER0_DMA_CB_FIFO_OVERFLOW_BIT (1<<7)
^
-:1451: WARNING:TYPO_SPELLING: 'UNDEFLOW' may be misspelled - perhaps 'UNDERFLOW'? #1451: FILE: drivers/gpu/drm/kmb/kmb_regs.h:329:
+#define LAYER0_DMA_FIFO_UNDEFLOW_BIT (1<<6)
-:1451: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1451: FILE: drivers/gpu/drm/kmb/kmb_regs.h:329:
+#define LAYER0_DMA_FIFO_UNDEFLOW_BIT (1<<6)
^
-:1452: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1452: FILE: drivers/gpu/drm/kmb/kmb_regs.h:330:
+#define LAYER0_DMA_OVERFLOW_BIT (1<<5)
^
-:1453: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1453: FILE: drivers/gpu/drm/kmb/kmb_regs.h:331:
+#define LAYER0_DMA_IDLE_BIT (1<<4)
^
-:1454: CHECK:SPACING: spaces preferred around that '<<' (ctx:VxV) #1454: FILE: drivers/gpu/drm/kmb/kmb_regs.h:332:
+#define LAYER0_DMA_DONE_BIT (1<<3)
^
-:1456: CHECK:CAMELCASE: Avoid CamelCase: <BLT_VIDEOn_DMAm_STATE> #1456: FILE: drivers/gpu/drm/kmb/kmb_regs.h:334:
+#define BLT_VIDEOn_DMAm_STATE 0x00
-:1457: CHECK:CAMELCASE: Avoid CamelCase: <BLT_VIDEOn_DMAm_BYTES> #1457: FILE: drivers/gpu/drm/kmb/kmb_regs.h:335:
+#define BLT_VIDEOn_DMAm_BYTES 0x00
-:1460: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1460: FILE: drivers/gpu/drm/kmb/kmb_regs.h:338:
+#define BLT_LAYERn_WIDTH(N) (0x40C + (0x400*N))
^
-:1460: CHECK:CAMELCASE: Avoid CamelCase: <BLT_LAYERn_WIDTH> #1460: FILE: drivers/gpu/drm/kmb/kmb_regs.h:338:
+#define BLT_LAYERn_WIDTH(N) (0x40C + (0x400*N))
-:1460: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'N' may be better as '(N)' to avoid precedence issues #1460: FILE: drivers/gpu/drm/kmb/kmb_regs.h:338:
+#define BLT_LAYERn_WIDTH(N) (0x40C + (0x400*N))
-:1461: CHECK:SPACING: spaces preferred around that '*' (ctx:VxV) #1461: FILE: drivers/gpu/drm/kmb/kmb_regs.h:339:
+#define BLT_LAYERn_HEIGHT_OFFSET(N) (0x410 + (0x400*N))
^
-:1461: CHECK:CAME
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Add support for Keem Bay DRM driver
In reply to Anitha Chrisanthus== Series Details ==
== Series Details ==
Series: Add support for Keem Bay DRM driver
URL : https://patchwork.freedesktop.org/series/78961/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8679 -> Patchwork_18048
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/index.html
Known issues
------------
Here are the changes found in Patchwork_18048 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s3:
- fi-tgl-u2: [PASS][1] -> [FAIL][2] ([i915#1888])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-u2/igt@[email protected]
* igt@gem_flink_basic@bad-flink:
- fi-tgl-y: [PASS][3] -> [DMESG-WARN][4] ([i915#402]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-y/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-y/igt@[email protected]
* igt@i915_module_load@reload:
- fi-byt-n2820: [PASS][5] -> [DMESG-WARN][6] ([i915#1982]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-byt-n2820/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-byt-n2820/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-bsw-kefka: [PASS][7] -> [DMESG-WARN][8] ([i915#1982])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-bsw-kefka/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-bsw-kefka/igt@[email protected]
* igt@kms_busy@basic@flip:
- fi-kbl-x1275: [PASS][9] -> [DMESG-WARN][10] ([i915#62] / [i915#92] / [i915#95])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-kbl-x1275/igt@kms_busy@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-kbl-x1275/igt@kms_busy@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-tgl-y: [PASS][11] -> [DMESG-WARN][12] ([i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-y/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-y/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
- fi-tgl-u2: [PASS][13] -> [DMESG-WARN][14] ([i915#402]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-u2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-u2/igt@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload:
- fi-tgl-y: [DMESG-WARN][15] ([i915#1982]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-y/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-y/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- {fi-tgl-dsi}: [DMESG-WARN][17] ([i915#1982]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-dsi/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-dsi/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-glk-dsi: [DMESG-WARN][19] ([i915#1982]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-glk-dsi/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-glk-dsi/igt@[email protected]
* igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling:
- fi-tgl-y: [DMESG-WARN][21] ([i915#402]) -> [PASS][22] +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-tgl-y/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-tgl-y/igt@[email protected]
#### Warnings ####
* igt@gem_exec_suspend@basic-s0:
- fi-kbl-x1275: [DMESG-WARN][23] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][24] ([i915#62] / [i915#92])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-kbl-x1275/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-kbl-x1275/igt@[email protected]
* igt@kms_flip@basic-flip-vs-modeset@a-dp1:
- fi-kbl-x1275: [DMESG-WARN][25] ([i915#62] / [i915#92]) -> [DMESG-WARN][26] ([i915#62] / [i915#92] / [i915#95]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/fi-kbl-x1275/igt@kms_flip@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/fi-kbl-x1275/igt@kms_flip@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (44 -> 37)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_8679 -> Patchwork_18048
CI-20190529: 20190529
CI_DRM_8679: 3e20fe558381bf798308d3a1171948676af22376 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5718: af1ef32bfae90bcdbaf1b5d84c61ff4e04368505 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18048: f00f86024239412399446a44511fbda63c35454f @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f00f86024239 drm/kmb: work around for planar formatsb1e35c106c12 drm/kmb: Get System Clock from SCMI1710a87ff0ea drm/kmb: workaround for dma undeflow issue44d2078949be kmb/drm: Prune unsupported modesedfb028ab278 drm/kmb: Added useful messages in LCD ISR846bf8d1e61e drm/kmb: Initialize uninitialized variables028055fb8f5d drm/kmb: disable the LCD layer in EOF irq handler 889babf9cfe8 drm/kmb: Cleaned up code06de05fd450d drm/kmb: Write to LCD_LAYERn_CFG only onceb17b588a8831 drm/kmb: Do the layer initializations only once 34af9bf91633 drm/kmb: Disable ping pong mode842b739f2cd7 drm/kmb: SWAP R and B LCD Layer ordera5ff3de4bffe drm/kmb: Don’t inadvertantly disable LCD controller c48404fabcc6 drm/kmb: Enable LCD interrupts during modesetaa74ab54b6fe drm/kmb: Enable LCD interrupts7da5c74fb405 drm/kmb: Mipi settings from input timingsb62ba8313d3d drm/kmb: Changed name of driver to kmb-drme01cf8c8b19e drm/kmb: Update LCD programming to match MIPI27a70659c7a2 drm/kmb: Changes for LCD to Mipifbe077dbaaeb drm/kmb: Added LCD_TEST config5a47e4b73390 drm/kmb: Fixed driver unload930aff57edce drm/kmb: Mipi DPHY initialization changes38f7144bf3ba drm/kmb: Set MSS_CAM_RSTN_CTRL along with enable 7e90f462475d drm/kmb: Enable MIPI TX HS Test Pattern Generation 5d3868582ef6 drm/kmb: Remove declaration of irq_lcd/irq_mipi e3ba4bc8f7ec drm/kmb: Enable MSS_CAM_CLK_CTRL for LCD and MIPI 90ac48d0cfcb drm/kmb: Initialize clocks for clk_msscam, clk_mipi_ecfg, & clk_mipi_cfg. b404fc810a4d drm/kmb: Revert dsi_host back to a static variable 147af713f65c drm/kmb: Cleanup probe functions0845046a7e9c drm/kmb: call bridge init in the very beginning e21dd1858638 drm/kmb: Defer Probeaee9fb3d0564 drm/kmb: Changed MMIO sizea0943964cc53 drm/kmb: minor name change to match device tree 8242841c1895 drm/kmb: rebase to newer kernel version246901d524d4 drm/kmb: Display clock enable/disable361431b546c2 drm/kmb: Add ADV7535 bridge0f9851bf9854 drm/kmb: Additional register programming to update_plane 7b104c062665 drm/kmb: Set hardcoded values to LCD_VSYNC_START 2334986949a7 drm/kmb: IRQ handlers for LCD and mipi dsi6949d1ccba8a drm/kmb: Register IRQ for LCD51a3a10d1010 drm/kmb: Added ioremap/iounmap for register access bab2411c3b88 drm/kmb: Part8 of Mipi Tx Initializationf5bc0b022350 drm/kmb: Part7 of Mipi Tx Initialization5c10174ed361 drm/kmb: Part6 of Mipi Tx Initializationc732be5654cd drm/kmb: Part5 of Mipi Tx Intitialization9fd03e66c4e7 drm/kmb: Correct address offsets for mipi registers c611d416585b drm/kmb: Part4 of Mipi Tx Initialization9f61c291d03f drm/kmb: Part3 of Mipi Tx initialization21b7ef9eac3e drm/kmb: Use correct mmio offset from data book eb0ef1e362a5 drm/kmb: Part 2 of Mipi Tx Initializationdb8b9b413b46 drm/kmb: Part 1 of Mipi Tx Initialization2e6717ed66e9 drm/kmb: Added mipi_dsi_host initialization7fa237090144 drm/kmb: Set OUT_FORMAT_CFG registera877f4622c68 drm/kmb: Initial check-in for Mipi DSIae767502b6a2 drm/kmb: Updated kmb_plane_atomic_checka3952bd37221 drm/kmb: Use biwise operators for register definitions 4f0983e09134 drm/kmb: Set correct values in the LAYERn_CFG register cfc0a9487ba1 drm/kmb: Added id to kmb_planec489c4330583 drm/kmb: Add support for KeemBay Display
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for Add support for Keem Bay DRM driver
In reply to Anitha Chrisanthus== Series Details ==
== Series Details ==
Series: Add support for Keem Bay DRM driver
URL : https://patchwork.freedesktop.org/series/78961/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8679_full -> Patchwork_18048_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_18048_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_balancer@bonded-early:
- shard-kbl: [PASS][1] -> [FAIL][2] ([i915#2079])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl6/igt@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp:
- shard-apl: [PASS][3] -> [DMESG-WARN][4] ([i915#1635] / [i915#95]) +22 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-64x64-random:
- shard-kbl: [PASS][5] -> [DMESG-WARN][6] ([i915#93] / [i915#95]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl3/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-a-256x256-right-edge:
- shard-skl: [PASS][7] -> [DMESG-WARN][8] ([i915#1982]) +11 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl10/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@ac-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#79])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-glk3/igt@kms_flip@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-glk1/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [PASS][11] -> [FAIL][12] ([i915#79])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl4/igt@kms_flip@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl3/igt@kms_flip@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl1/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@c-hdmi-a1:
- shard-hsw: [PASS][15] -> [INCOMPLETE][16] ([i915#2055])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw7/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-hsw6/igt@kms_flip@[email protected]
* igt@kms_flip@modeset-vs-vblank-race-interruptible@a-edp1:
- shard-tglb: [PASS][17] -> [DMESG-WARN][18] ([i915#1982])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb2/igt@kms_flip@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-tglb8/igt@kms_flip@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [PASS][19] -> [FAIL][20] ([i915#1188])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl10/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [i915#265]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][23] -> [DMESG-FAIL][24] ([fdo#108145] / [i915#1982])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl7/igt@[email protected]
* igt@kms_prime@basic-crc@second-to-first:
- shard-kbl: [PASS][25] -> [DMESG-FAIL][26] ([i915#95])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@kms_prime@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl7/igt@kms_prime@[email protected]
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb8/igt@kms_psr@psr2_cursor_plane_move.html
* igt@kms_setmode@basic:
- shard-hsw: [PASS][29] -> [FAIL][30] ([i915#31])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-hsw4/igt@[email protected]
* igt@perf@blocking-parameterized:
- shard-iclb: [PASS][31] -> [FAIL][32] ([i915#1542])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb6/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb2/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34] +8 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl3/igt@gem_ctx_isolation@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl7/igt@gem_ctx_isolation@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-apl: [DMESG-WARN][35] ([i915#1436] / [i915#716]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl6/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][37] ([i915#79]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-glk2/igt@kms_flip@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-glk5/igt@kms_flip@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank@ab-vga1-hdmi-a1:
- shard-hsw: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw6/igt@kms_flip@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-hsw4/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@b-edp1:
- shard-skl: [INCOMPLETE][41] ([i915#198]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl6/igt@kms_flip@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl1/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-indfb-fliptrack:
- shard-iclb: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb2/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-farfromfence:
- shard-tglb: [DMESG-WARN][45] ([i915#1982]) -> [PASS][46] +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb7/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-tglb5/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][47] ([fdo#109642] / [fdo#111068]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb6/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb6/igt@kms_psr@psr2_primary_mmap_cpu.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_vblank@pipe-b-query-idle:
- shard-skl: [DMESG-WARN][51] ([i915#1982]) -> [PASS][52] +14 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-skl10/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-skl7/igt@[email protected]
* igt@perf@blocking:
- shard-glk: [DMESG-WARN][53] ([i915#118] / [i915#95]) -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-glk9/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-glk8/igt@[email protected]
* igt@perf@invalid-oa-metric-set-id:
- shard-apl: [DMESG-WARN][55] ([i915#1635] / [i915#95]) -> [PASS][56] +18 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl3/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl8/igt@[email protected]
#### Warnings ####
* igt@gem_exec_reloc@basic-spin-others@vcs0:
- shard-snb: [WARN][57] ([i915#2036]) -> [WARN][58] ([i915#2021])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-snb1/igt@gem_exec_reloc@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-snb5/igt@gem_exec_reloc@[email protected]
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][59] ([i915#658]) -> [SKIP][60] ([i915#588])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb6/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb2/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][61] ([i915#1515]) -> [FAIL][62] ([i915#1515])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-iclb6/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-iclb2/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-max:
- shard-apl: [SKIP][63] ([fdo#109271] / [fdo#111827]) -> [SKIP][64] ([fdo#109271] / [fdo#111827] / [i915#1635])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl3/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl1/igt@[email protected]
* igt@kms_content_protection@atomic:
- shard-kbl: [TIMEOUT][65] ([i915#1319] / [i915#1958]) -> [TIMEOUT][66] ([i915#1319] / [i915#1958] / [i915#2119]) +4 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][67] ([i915#180] / [i915#93] / [i915#95]) -> [DMESG-WARN][68] ([i915#93] / [i915#95])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-512x512-random:
- shard-apl: [SKIP][69] ([fdo#109271] / [i915#1635]) -> [SKIP][70] ([fdo#109271]) +9 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl7/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl2/igt@[email protected]
* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-ytiled:
- shard-snb: [TIMEOUT][71] ([i915#1958]) -> [TIMEOUT][72] ([i915#1958] / [i915#2119]) +6 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-snb2/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-snb1/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [DMESG-WARN][73] ([i915#359]) -> [DMESG-WARN][74] ([i915#180])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl1/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl6/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-rte:
- shard-apl: [SKIP][75] ([fdo#109271]) -> [SKIP][76] ([fdo#109271] / [i915#1635]) +5 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl4/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl8/igt@[email protected]
* igt@kms_lease@lessee_list:
- shard-hsw: [TIMEOUT][77] ([i915#1958]) -> [TIMEOUT][78] ([i915#1958] / [i915#2119]) +5 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-hsw4/igt@kms_lease@lessee_list.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-hsw7/igt@kms_lease@lessee_list.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant:
- shard-kbl: [DMESG-FAIL][79] ([fdo#108145] / [i915#1982] / [i915#95]) -> [DMESG-FAIL][80] ([fdo#108145] / [i915#95])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-kbl3/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-kbl7/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
- shard-apl: [DMESG-FAIL][81] ([fdo#108145] / [i915#1635] / [i915#95]) -> [DMESG-FAIL][82] ([fdo#108145] / [i915#1635] / [i915#1982] / [i915#95])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl3/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl1/igt@kms_plane_alpha_blend@pipe-a-coverage-vs-premult-vs-constant.html
* igt@runner@aborted:
- shard-apl: ([FAIL][83], [FAIL][84]) ([fdo#109271] / [i915#1610] / [i915#1635] / [i915#716]) -> [FAIL][85] ([i915#1635])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl7/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-apl1/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-apl7/igt@[email protected]
- shard-tglb: ([FAIL][86], [FAIL][87]) ([i915#1764] / [i915#2110]) -> [FAIL][88] ([i915#2110])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb3/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8679/shard-tglb1/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/shard-tglb1/igt@[email protected]
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1515]: https://gitlab.freedesktop.org/drm/intel/issues/1515
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1764]: https://gitlab.freedesktop.org/drm/intel/issues/1764
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2021]: https://gitlab.freedesktop.org/drm/intel/issues/2021
[i915#2036]: https://gitlab.freedesktop.org/drm/intel/issues/2036
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2079]: https://gitlab.freedesktop.org/drm/intel/issues/2079
[i915#2110]: https://gitlab.freedesktop.org/drm/intel/issues/2110
[i915#2119]: https://gitlab.freedesktop.org/drm/intel/issues/2119
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#359]: https://gitlab.freedesktop.org/drm/intel/issues/359
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_8679 -> Patchwork_18048
CI-20190529: 20190529
CI_DRM_8679: 3e20fe558381bf798308d3a1171948676af22376 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5718: af1ef32bfae90bcdbaf1b5d84c61ff4e04368505 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18048: f00f86024239412399446a44511fbda63c35454f @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18048/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi Anitha.
Quoted 3 lines · Anitha Chrisanthus
This is a new DRM driver for Intel's KeemBay SOC. The SoC couples an ARM Cortex A53 CPU with an Intel Movidius VPU.
...
Nice and informative intro - thanks.
The patchset looks more like a dump of current state and less like a logical set of changes - as the few I looked at changed code introduced in earlier patches.
So I ended up applying all patches to a local branch.
Very good to post an WIP version so you can capture some early feedback.
It is never fun to think something is finished and then address a lot of feedback.
Some general remarks after reading/browsing some of the code:
- Embeds drm_device - good
- Uses SPDX, good. But includes also a license text. Can we get rid of the redundandt license text?
- Some of the inline functions in kmb_drv.h is too large (kmb_write_bits_mipi())
- There is stray code commented out using "//" here and there - shall be dropped.
- Please arrange include files in blocks:
#include <linux/...>
#include <video/...>
#include <drm/...>
#include "kmb_*"
Within each block sort alphabetially.
- Use a kmb_ prefix or similar for global variables - like under_flow
- no extern in .c files - plane_status
- Consider using an array for the clk's
- In general use drm_info(), drm_err() for logging.
Yes, you will need to pass kmb_drm_private around to do so
- Do not use drm_device->dev_private, it is deprecated. Use upclassing
- kmb_driver can be slimmed a lot. See what recent drivers uses. There is some nice defines so it is obvious what is not standard. DRIVER_HAVE_IRQ is not relevant btw.
- Start using drmm_* support. The way kmb_drm_private is allocated is sub-optimal
The above was my fist drive-by comments - but do not be discouraged. For the most part they should be easy to address.
Looking forward for other feedback and for v2.
Let me know if the above triggers any questions.
Quoted 3 lines
+--------------+ +---------+ +-----------------------+ |LCD controller| -> |Mipi DSI | -> |Mipi to HDMI Converter | +--------------+ +---------+ +-----------------------+
Question to dri-devel people:
Would the Mipi DSI be better represented outside the display driver? If yes, how?
Sam
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chrisanthus, Anitha
maintainerThanks much Sam for reviewing the code so quickly. I'll address your reviews in v2.
Anitha
Quoted 70 lines
-----Original Message-----
From: Sam Ravnborg <[email protected]>
Sent: Wednesday, July 1, 2020 12:01 AM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>; [email protected]; Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH 00/59] Add support for Keem Bay DRM driverHi Anitha.
Quoted 3 lines · Anitha Chrisanthus
This is a new DRM driver for Intel's KeemBay SOC. The SoC couples an ARM Cortex A53 CPU with an Intel Movidius VPU.
...
Nice and informative intro - thanks.The patchset looks more like a dump of current state and less like a logical set of changes - as the few I looked at changed code introduced in earlier patches.
So I ended up applying all patches to a local branch.
Very good to post an WIP version so you can capture some early feedback.
It is never fun to think something is finished and then address a lot of feedback.Some general remarks after reading/browsing some of the code:
- Embedsdrm_device- good
- Uses SPDX, good. But includes also a license text. Can we get rid of the redundandt license text?
- Some of the inline functions inkmb_drv.his too large (kmb_write_bits_mipi())
- There is stray code commented out using "//" here and there - shall be dropped.
- Please arrange include files in blocks:
#include <linux/...>#include <video/...>
#include <drm/...>
#include "kmb_*"
Within each block sort alphabetially.
- Use a
kmb_prefix or similar for global variables - likeunder_flow
- no extern in .c files -plane_status
- Consider using an array for the clk's
- In general usedrm_info(),drm_err()for logging.
Yes, you will need to passkmb_drm_privatearound to do so
- Do not usedrm_device->dev_private, it is deprecated. Use upclassing
-kmb_drivercan be slimmed a lot. See what recent drivers uses. There is some nice defines so it is obvious what is not standard.DRIVER_HAVE_IRQis not relevant btw.
- Start using drmm_* support. The waykmb_drm_privateis allocated is sub-optimalThe above was my fist drive-by comments - but do not be discouraged. For the most part they should be easy to address.
Looking forward for other feedback and for v2.Let me know if the above triggers any questions.
Quoted 3 lines
+--------------+ +---------+ +-----------------------+ |LCD controller| -> |Mipi DSI | -> |Mipi to HDMI Converter | +--------------+ +---------+ +-----------------------+
Quoted 5 lines
Question to dri-devel people:
Would the Mipi DSI be better represented outside the display driver? If yes, how?Sam
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 18 lines · Anitha Chrisanthus
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.
Quoted 5 lines
Only 1080p resolution and single plane is supported at this time. The usecase is for debugging video and camera outputs.
Since we are just starting the upstream process, the KMB EVM board is not in mainline and so Device tree changes are missing.
A proper Yaml bindings file is then necessary even if the platform is not mainline.
Neil
Quoted 82 lines
Anitha Chrisanthus (52):
drm/kmb: Add support for KeemBay Display drm/kmb: Added id tokmb_plane
drm/kmb: Set correct values in theLAYERn_CFGregister drm/kmb: Use biwise operators for register definitions drm/kmb: Updatedkmb_plane_atomic_checkdrm/kmb: Initial check-in for Mipi DSI
drm/kmb: SetOUT_FORMAT_CFGregister
drm/kmb: Addedmipi_dsi_hostinitialization drm/kmb: Part 1 of Mipi Tx Initialization drm/kmb: Part 2 of Mipi Tx Initialization drm/kmb: Use correct mmio offset from data book drm/kmb: Part3 of Mipi Tx initialization drm/kmb: Part4 of Mipi Tx Initialization drm/kmb: Correct address offsets for mipi registers drm/kmb: Part5 of Mipi Tx Intitialization drm/kmb: Part6 of Mipi Tx Initialization drm/kmb: Part7 of Mipi Tx Initialization drm/kmb: Part8 of Mipi Tx Initialization drm/kmb: Added ioremap/iounmap for register access drm/kmb: Register IRQ for LCD
drm/kmb: IRQ handlers for LCD and mipi dsi drm/kmb: Set hardcoded values toLCD_VSYNC_STARTdrm/kmb: Additional register programming toupdate_planedrm/kmb: Add ADV7535 bridge
drm/kmb: Display clock enable/disable
drm/kmb: rebase to newer kernel version drm/kmb: minor name change to match device tree drm/kmb: Changed MMIO size
drm/kmb: Defer Probe
drm/kmb: call bridge init in the very beginning drm/kmb: EnableMSS_CAM_CLK_CTRLfor LCD and MIPI drm/kmb: SetMSS_CAM_RSTN_CTRLalong with enable drm/kmb: Mipi DPHY initialization changes drm/kmb: Fixed driver unload
drm/kmb: AddedLCD_TESTconfig
drm/kmb: Changes for LCD to Mipi
drm/kmb: Update LCD programming to match MIPI drm/kmb: Changed name of driver to kmb-drm drm/kmb: Mipi settings from input timings drm/kmb: Enable LCD interrupts
drm/kmb: Enable LCD interrupts during modeset drm/kmb: Don’t inadvertantly disable LCD controller drm/kmb: SWAP R and B LCD Layer order
drm/kmb: Disable ping pong mode
drm/kmb: Do the layer initializations only once drm/kmb: disable the LCD layer in EOF irq handler drm/kmb: Initialize uninitialized variables drm/kmb: Added useful messages in LCD ISR kmb/drm: Prune unsupported modes
drm/kmb: workaround for dma undeflow issue drm/kmb: Get System Clock from SCMI
drm/kmb: work around for planar formatsEdmund Dea (7):
drm/kmb: Cleanup probe functions
drm/kmb: Revertdsi_hostback to a static variable drm/kmb: Initialize clocks forclk_msscam,clk_mipi_ecfg, &
clk_mipi_cfg.
drm/kmb: Remove declaration of irq_lcd/irq_mipi drm/kmb: Enable MIPI TX HS Test Pattern Generation drm/kmb: Write toLCD_LAYERn_CFGonly once drm/kmb: Cleaned up codedrivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 12 + drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 243 +++++ drivers/gpu/drm/kmb/kmb_crtc.h | 61 ++ drivers/gpu/drm/kmb/kmb_drv.c | 828 +++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 196 ++++ drivers/gpu/drm/kmb/kmb_dsi.c | 1950 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 390 ++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 538 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 142 +++ drivers/gpu/drm/kmb/kmb_regs.h | 758 +++++++++++++++ 13 files changed, 5123 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
Quoted 9 lines
create mode 100644 drivers/gpu/drm/kmb/kmb_crtc.h 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
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel