Add support for KeemBay DRM driver
Subsystems (3)
Anitha Chrisanthus
maintainerPATCH v6 1/1 Add support for KeemBay DRM driver
This is a new DRM driver for Intel's KeemBay SOC. The SoC couples an ARM Cortex A53 CPU with an Intel Movidius VPU.
This driver is tested with the KMB EVM board which is the refernce baord for Keem Bay SOC. The SOC's display pipeline is as follows
+--------------+ +---------+ +-----------------------+ |LCD controller| -> |Mipi DSI | -> |Mipi to HDMI Converter | +--------------+ +---------+ +-----------------------+
LCD controller and Mipi DSI transmitter are part of the SOC and mipi to HDMI converter is ADV7535 for KMB EVM board.
The DRM driver is a basic KMS atomic modesetting display driver and has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.
Only 1080p resolution and single plane is supported at this time. The usecase is for debugging video and camera outputs.
Device tree patches are under review here
https://lore.kernel.org/linux-arm-kernel/[email protected]/T/
Changes since v1:
- Removed redundant license text, updated license
- Rearranged include blocks
- renamed global vars and removed extern in c
- Used upclassing for dev_private
- Used drm_dev_init in drm device create
- minor cleanups
Changes since v2:
- squashed all commits to a single commit
- logging changed to drm_info, drm_dbg etc.
- used devm_drm_dev_alloc()
- removed commented out sections and general cleanup
Changes since v3:
- renamed dev_p to kmb
- moved clocks under kmb_clock, consolidated clk initializations
- use drmm functions
- use DRM_GEM_CMA_DRIVER_OPS_VMAP
- more cleanups
Changes since v4:
- corrected spellings
Changes since v5:
- corrected checkpatch warnings/checks
-Please ignore checkpatch checks on Camelcase - this is how it is named in the databook
- Please ignore checkpatch warnings on misspelled for hsa, dout, widthn etc. - they are spelled as in the databook
- Please ignore checkpatch checks on macro arguments reuse - its confirmed ok
Anitha Chrisanthus (1):
drm/kmb: Add support for KeemBay Display
drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 13 + drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 217 +++++ drivers/gpu/drm/kmb/kmb_crtc.h | 36 + drivers/gpu/drm/kmb/kmb_drv.c | 725 ++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 172 ++++ drivers/gpu/drm/kmb/kmb_dsi.c | 1828 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 370 ++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 519 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 124 +++ drivers/gpu/drm/kmb/kmb_regs.h | 748 ++++++++++++++++ 13 files changed, 4757 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 v6 1/1 drm/kmb: Add support for KeemBay Display
This is a basic KMS atomic modesetting display driver for KeemBay family of SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.
Single CRTC with LCD controller->mipi DSI-> ADV bridge
Only 1080p resolution and single plane is supported at this time.
v2: moved extern to .h, removed license text
use drm_dev_init, upclassed dev_private, removed HAVE_IRQ.
v3: Squashed all 59 commits to one
v4: review changes from Sam Ravnborg
renamed dev_p to kmb
moved clocks under kmb_clock, consolidated clk initializations use drmm functions
use DRM_GEM_CMA_DRIVER_OPS_VMAP
v5: corrected spellings
v6: corrected checkpatch warnings
--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 13 + drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 217 +++++ drivers/gpu/drm/kmb/kmb_crtc.h | 36 + drivers/gpu/drm/kmb/kmb_drv.c | 725 ++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 172 ++++ drivers/gpu/drm/kmb/kmb_dsi.c | 1828 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 370 ++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 519 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 124 +++ drivers/gpu/drm/kmb/kmb_regs.h | 748 ++++++++++++++++ 13 files changed, 4757 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
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 +13 -0
@@ -0,0 +1,13 @@ +config DRM_KMB_DISPLAY + tristate "INTEL 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 Intel's KeemBay SOC which integrates + an ARM Cortex A53 CPU with an Intel Movidius VPU. + + If M is selected the module will be called kmb-drm.
drivers/gpu/drm/kmb/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +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_crtc.c new file +217 -0
217 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_crtc.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright © 2018-2020 Intel Corporation +*/ + +#ifndef __KMB_CRTC_H__ +#define __KMB_CRTC_H__ + +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> +#include <video/videomode.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> +#include <linux/wait.h> +#include "kmb_drv.h" + +struct kmb_crtc_timing { +u32 vfront_porch; +u32 vback_porch; +u32 vsync_len; +u32 hfront_porch; +u32 hback_porch; +u32 hsync_len; +}; + +#endif /* __KMB_CRTC_H__ */
drivers/gpu/drm/kmb/kmb_drv.c new file +725 -0
725 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_drv.h new file +172 -0
172 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.c new file +1828 -0
1,820 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_dsi.h new file +370 -0
370 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.c new file +519 -0
519 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_plane.h new file +124 -0
124 lines not on this page · raw message
drivers/gpu/drm/kmb/kmb_regs.h new file +748 -0
748 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.
Re: [PATCH v6] drm/kmb: Add support for KeemBay Display
Hi Anitha.
Quoted 13 lines · Anitha Chrisanthus
This is a basic KMS atomic modesetting display driver for KeemBay family of SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.
Single CRTC with LCD
controller->mipiDSI-> ADV bridgeOnly 1080p resolution and single plane is supported at this time.
v2: moved extern to .h, removed license text
usedrm_dev_init, upclasseddev_private, removedHAVE_IRQ.v3: Squashed all 59 commits to one
Quoted 8 lines
v4: review changes from Sam Ravnborg
renameddev_pto kmb
moved clocks underkmb_clock, consolidated clk initializations use drmm functions
useDRM_GEM_CMA_DRIVER_OPS_VMAPv5: corrected spellings
v6: corrected checkpatch warnings
I have asked a few persons to review, but they lack time at the moment. So I will continue this monolouge of review feedback.
I had hoped to provide all feedback in a few itearations, but I continue to find more stuff.
First part of this round is some feedback on plane stuff
Sam
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +0
-0
drivers/gpu/drm/kmb/kmb_plane.c line 8
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8
-0@@ -0,0 +1,519 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2018-2020 Intel Corporation +*/ + +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h>
Not used I think.
drivers/gpu/drm/kmb/kmb_plane.c line 9
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0+#include <video/videomode.h>
Not used I hope.
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +8
-0+ +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h>
drivers/gpu/drm/kmb/kmb_plane.c line 27
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+#include <drm/drm_of.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_managed.h> + +#include "kmb_crtc.h" +#include "kmb_drv.h" +#include "kmb_plane.h" +#include "kmb_regs.h" + +struct layer_status plane_status[KMB_MAX_PLANES ];
Embed plane_status in struct kmb_plane so you avoid an extra statically allocated variable here. And it is then together with other relevant data.
Quoted 18 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +18
-0+const u32 layer_irqs[] = { +LCD_INT_VL0 , +LCD_INT_VL1 , +LCD_INT_GL0 , +LCD_INT_GL1 +}; + +static unsigned int check_pixel_format (struct drm_plane *plane,u32 format) +{ +int i; + +for (i =0 ; i < plane->format_count; i++) { +if (plane->format_types[i] == format) +return 0 ; + } +return -EINVAL ; +} +
drivers/gpu/drm/kmb/kmb_plane.c line 55
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+static int kmb_plane_atomic_check (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct drm_framebuffer *fb; +int ret; + + fb = state->fb; +if (!fb || !state->crtc) +return 0 ; +
Should drm_atomic_helper_check_plane_state() be called here?
Quoted 116 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +116
-0+ ret =check_pixel_format (plane, fb->format->format); +if (ret) +return ret; + +if (state->crtc_w >KMB_MAX_WIDTH || state->crtc_h >KMB_MAX_HEIGHT ) +return -EINVAL ; +if (state->crtc_w <KMB_MIN_WIDTH || state->crtc_h <KMB_MIN_HEIGHT ) +return -EINVAL ; +return 0 ; +} + +static void kmb_plane_atomic_disable (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct kmb_plane *kmb_plane =to_kmb_plane (plane); +int plane_id = kmb_plane->id; + +switch (plane_id) { +case LAYER_0 : + plane_status[plane_id].ctrl =LCD_CTRL_VL1_ENABLE ; +break ; +case LAYER_1 : + plane_status[plane_id].ctrl =LCD_CTRL_VL2_ENABLE ; +break ; +case LAYER_2 : + plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE ; +break ; +case LAYER_3 : + plane_status[plane_id].ctrl =LCD_CTRL_GL2_ENABLE ; +break ; + } + + plane_status[plane_id].disable = true; +} + +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 */ +/* looks hw requires B & G to be swapped when RGB */ +case DRM_FORMAT_RGB332 : + val =LCD_LAYER_FORMAT_RGB332 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_XBGR4444 : + val =LCD_LAYER_FORMAT_RGBX4444 ; +break ; +case DRM_FORMAT_ARGB4444 : + val =LCD_LAYER_FORMAT_RGBA4444 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_ABGR4444 : + val =LCD_LAYER_FORMAT_RGBA4444 ; +break ; +case DRM_FORMAT_XRGB1555 : + val =LCD_LAYER_FORMAT_XRGB1555 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_XBGR1555 : + val =LCD_LAYER_FORMAT_XRGB1555 ; +break ; +case DRM_FORMAT_ARGB1555 : + val =LCD_LAYER_FORMAT_RGBA1555 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_ABGR1555 : + val =LCD_LAYER_FORMAT_RGBA1555 ; +break ; +case DRM_FORMAT_RGB565 : + val =LCD_LAYER_FORMAT_RGB565 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_BGR565 : + val =LCD_LAYER_FORMAT_RGB565 ; +break ; +case DRM_FORMAT_RGB888 : + val =LCD_LAYER_FORMAT_RGB888 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_BGR888 : + val =LCD_LAYER_FORMAT_RGB888 ; +break ; +case DRM_FORMAT_XRGB8888 : + val =LCD_LAYER_FORMAT_RGBX8888 |LCD_LAYER_BGR_ORDER ; +break ; +case DRM_FORMAT_XBGR8888 : + val =LCD_LAYER_FORMAT_RGBX8888 ; +break ; +case DRM_FORMAT_ARGB8888 : + val =LCD_LAYER_FORMAT_RGBA8888 |LCD_LAYER_BGR_ORDER ; +break ;
drivers/gpu/drm/kmb/kmb_plane.c line 181
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+case DRM_FORMAT_ABGR8888 : + val =LCD_LAYER_FORMAT_RGBA8888 ; +break ; + } +DRM_INFO_ONCE ("%s : %d format=0x%x val=0x%x\n" , + __func__, __LINE__, format, val); +return val; +} + +unsigned int set_bits_per_pixel (const struct drm_format_info *format)
This is not a set function - nothing is set.
Maybe just rename it to get_*
Quoted 52 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +52
-0+{ +u32 bpp =0 ; +unsigned int val =0 ; + +if (format->num_planes >1 ) { + val =LCD_LAYER_8BPP ; +return val; + } + + bpp +=8 * format->cpp[0 ]; + +switch (bpp) { +case 8 : + val =LCD_LAYER_8BPP ; +break ; +case 16 : + val =LCD_LAYER_16BPP ; +break ; +case 24 : + val =LCD_LAYER_24BPP ; +break ; +case 32 : + val =LCD_LAYER_32BPP ; +break ; + } + +DRM_DEBUG ("bpp=%d val=0x%x\n" , bpp, val); +return val; +} + +static void config_csc (struct kmb_drm_private *kmb,int plane_id) +{ +/* YUV to RGB conversion using the fixed matrix csc_coef_lcd */ +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF11 (plane_id), csc_coef_lcd[0 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF12 (plane_id), csc_coef_lcd[1 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF13 (plane_id), csc_coef_lcd[2 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF21 (plane_id), csc_coef_lcd[3 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF22 (plane_id), csc_coef_lcd[4 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF23 (plane_id), csc_coef_lcd[5 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF31 (plane_id), csc_coef_lcd[6 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF32 (plane_id), csc_coef_lcd[7 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_COEFF33 (plane_id), csc_coef_lcd[8 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_OFF1 (plane_id), csc_coef_lcd[9 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_OFF2 (plane_id), csc_coef_lcd[10 ]); +kmb_write_lcd (kmb,LCD_LAYERn_CSC_OFF3 (plane_id), csc_coef_lcd[11 ]); +} + +static void kmb_plane_atomic_update (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct drm_framebuffer *fb; +struct kmb_drm_private *kmb;
drivers/gpu/drm/kmb/kmb_plane.c line 243
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+unsigned int width; +unsigned int height; +unsigned int dma_len; +struct kmb_plane *kmb_plane; +unsigned int dma_cfg; +unsigned int ctrl =0 , val =0 , out_format =0 ; +unsigned int src_w, src_h, crtc_x, crtc_y; +unsigned char plane_id; +int num_planes; +static dma_addr_t addr[MAX_SUB_PLANES ] = {0 ,0 ,0 };
I *think* some compilers will choke on this. And the assignment seems not to be needed, they are all assigned before use as far as I could tell.
Quoted 168 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +168
-0+ +if (!plane || !plane->state || !state) +return ; + + fb = plane->state->fb; +if (!fb) +return ; + num_planes = fb->format->num_planes; + kmb_plane =to_kmb_plane (plane); + plane_id = kmb_plane->id; + + kmb =to_kmb (plane->dev); + +if (kmb_under_flow || kmb_flush_done) { +drm_dbg (&kmb->drm,"plane_update:underflow!!!! returning" ); +return ; + } + + src_w = (plane->state->src_w >>16 ); + src_h = plane->state->src_h >>16 ; + crtc_x = plane->state->crtc_x; + crtc_y = plane->state->crtc_y; + +drm_dbg (&kmb->drm, +"src_w=%d src_h=%d, fb->format->format=0x%x fb->flags=0x%x\n" , + src_w, src_h, fb->format->format, fb->flags); + + width = fb->width; + height = fb->height; + dma_len = (width * height * fb->format->cpp[0 ]); +drm_dbg (&kmb->drm,"dma_len=%d " , dma_len); +kmb_write_lcd (kmb,LCD_LAYERn_DMA_LEN (plane_id), dma_len); +kmb_write_lcd (kmb,LCD_LAYERn_DMA_LEN_SHADOW (plane_id), dma_len); +kmb_write_lcd (kmb,LCD_LAYERn_DMA_LINE_VSTRIDE (plane_id), + fb->pitches[0 ]); +kmb_write_lcd (kmb,LCD_LAYERn_DMA_LINE_WIDTH (plane_id), + (width * fb->format->cpp[0 ])); + + addr[Y_PLANE ] =drm_fb_cma_get_gem_addr (fb, plane->state,0 ); + kmb->fb_addr = addr[Y_PLANE ]; +kmb_write_lcd (kmb,LCD_LAYERn_DMA_START_ADDR (plane_id), + addr[Y_PLANE ] + fb->offsets[0 ]); + val =set_pixel_format (fb->format->format); + val |=set_bits_per_pixel (fb->format); +/* Program Cb/Cr for planar formats */ +if (num_planes >1 ) { +kmb_write_lcd (kmb,LCD_LAYERn_DMA_CB_LINE_VSTRIDE (plane_id), + width * fb->format->cpp[0 ]); +kmb_write_lcd (kmb,LCD_LAYERn_DMA_CB_LINE_WIDTH (plane_id), + (width * fb->format->cpp[0 ])); + + addr[U_PLANE ] =drm_fb_cma_get_gem_addr (fb, plane->state, +U_PLANE ); +/* check if Cb/Cr is swapped*/ +if (num_planes ==3 && (val &LCD_LAYER_CRCB_ORDER )) +kmb_write_lcd (kmb, +LCD_LAYERn_DMA_START_CR_ADR (plane_id), + addr[U_PLANE ]); +else +kmb_write_lcd (kmb, +LCD_LAYERn_DMA_START_CB_ADR (plane_id), + addr[U_PLANE ]); + +if (num_planes ==3 ) { +kmb_write_lcd (kmb, +LCD_LAYERn_DMA_CR_LINE_VSTRIDE (plane_id), + ((width) * fb->format->cpp[0 ])); + +kmb_write_lcd (kmb, +LCD_LAYERn_DMA_CR_LINE_WIDTH (plane_id), + ((width) * fb->format->cpp[0 ])); + + addr[V_PLANE ] =drm_fb_cma_get_gem_addr (fb, + plane->state, +V_PLANE ); + +/* check if Cb/Cr is swapped*/ +if (val &LCD_LAYER_CRCB_ORDER ) +kmb_write_lcd (kmb, +LCD_LAYERn_DMA_START_CB_ADR (plane_id), + addr[V_PLANE ]); +else +kmb_write_lcd (kmb, +LCD_LAYERn_DMA_START_CR_ADR (plane_id), + addr[V_PLANE ]); + } + } + +kmb_write_lcd (kmb,LCD_LAYERn_WIDTH (plane_id), src_w -1 ); +kmb_write_lcd (kmb,LCD_LAYERn_HEIGHT (plane_id), src_h -1 ); +kmb_write_lcd (kmb,LCD_LAYERn_COL_START (plane_id), crtc_x); +kmb_write_lcd (kmb,LCD_LAYERn_ROW_START (plane_id), crtc_y); + + val |=LCD_LAYER_FIFO_100 ; + +if (val &LCD_LAYER_PLANAR_STORAGE ) { + val |=LCD_LAYER_CSC_EN ; + +/* Enable CSC if input is planar and output is RGB */ +config_csc (kmb, plane_id); + } + +kmb_write_lcd (kmb,LCD_LAYERn_CFG (plane_id), val); + +switch (plane_id) { +case LAYER_0 : + ctrl =LCD_CTRL_VL1_ENABLE ; +break ; +case LAYER_1 : + ctrl =LCD_CTRL_VL2_ENABLE ; +break ; +case LAYER_2 : + ctrl =LCD_CTRL_GL1_ENABLE ; +break ; +case LAYER_3 : + ctrl =LCD_CTRL_GL2_ENABLE ; +break ; + } + + ctrl |=LCD_CTRL_PROGRESSIVE |LCD_CTRL_TIM_GEN_ENABLE + |LCD_CTRL_CONTINUOUS |LCD_CTRL_OUTPUT_ENABLED ; + +/* LCD is connected to MIPI on kmb +* Therefore this bit is required for DSI Tx +*/ + ctrl |=LCD_CTRL_VHSYNC_IDLE_LVL ; + +kmb_set_bitmask_lcd (kmb,LCD_CONTROL , ctrl); + +/* FIXME no doc on how to set output format,these values are +* taken from the Myriadx tests +*/ + out_format |=LCD_OUTF_FORMAT_RGB888 ; + +/* Leave RGB order,conversion mode and clip mode to default */ +/* do not interleave RGB channels for mipi Tx compatibility */ + out_format |=LCD_OUTF_MIPI_RGB_MODE ; +kmb_write_lcd (kmb,LCD_OUT_FORMAT_CFG , out_format); + + dma_cfg =LCD_DMA_LAYER_ENABLE |LCD_DMA_LAYER_VSTRIDE_EN | +LCD_DMA_LAYER_CONT_UPDATE |LCD_DMA_LAYER_AXI_BURST_16 ; + +/* Enable DMA */ +kmb_write_lcd (kmb,LCD_LAYERn_DMA_CFG (plane_id), dma_cfg); +drm_dbg (&kmb->drm,"dma_cfg=0x%x LCD_DMA_CFG=0x%x\n" , dma_cfg, +kmb_read_lcd (kmb,LCD_LAYERn_DMA_CFG (plane_id))); + +kmb_set_bitmask_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_EOF | +LCD_INT_DMA_ERR ); +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE ,LCD_INT_EOF | +LCD_INT_DMA_ERR ); +} + +static const struct drm_plane_helper_funcs kmb_plane_helper_funcs = { + .atomic_check = kmb_plane_atomic_check, + .atomic_update = kmb_plane_atomic_update, + .atomic_disable = kmb_plane_atomic_disable +}; + +void kmb_plane_destroy (struct drm_plane *plane) +{ +struct kmb_plane *kmb_plane =to_kmb_plane (plane); + +drm_plane_cleanup (plane); +kfree (kmb_plane); +} + +static void kmb_destroy_plane_state(struct drm_plane *plane,
drivers/gpu/drm/kmb/kmb_plane.c line 421
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+ struct drm_plane_state *state) +{ +struct kmb_plane_state *kmb_state =to_kmb_plane_state (state); + +__drm_atomic_helper_plane_destroy_state (state); +kfree (kmb_state); +} + +struct drm_plane_state *kmb_plane_duplicate_state (struct drm_plane *plane) +{
Use __drm_atomic_helper_plane_duplicate_state() - which requires a few updates.
See other users.
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+struct drm_plane_state *state; +struct kmb_plane_state *kmb_state; + + kmb_state =kmemdup (plane->state,sizeof (*kmb_state),GFP_KERNEL ); +if (!kmb_state) +return NULL ; + + state = &kmb_state->base_plane_state; +__drm_atomic_helper_plane_duplicate_state (plane, state); +
drivers/gpu/drm/kmb/kmb_plane.c line 441
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+return state; +} + +static void kmb_plane_reset (struct drm_plane *plane) +{ +struct kmb_plane_state *kmb_state =to_kmb_plane_state (plane->state); + +if (kmb_state) +__drm_atomic_helper_plane_destroy_state + (&kmb_state->base_plane_state);
Join lines - this is not readable.
drivers/gpu/drm/kmb/kmb_plane.c line 445
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0+kfree (kmb_state); + + plane->state =NULL ; + kmb_state =kzalloc (sizeof (*kmb_state),GFP_KERNEL );
Use __drm_atomic_helper_plane_reset()
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+if (kmb_state) { + kmb_state->base_plane_state.plane = plane; + kmb_state->base_plane_state.rotation =DRM_MODE_ROTATE_0 ; + plane->state = &kmb_state->base_plane_state; + kmb_state->no_planes =KMB_MAX_PLANES ; + } +} + +static const struct drm_plane_funcs kmb_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane,
drivers/gpu/drm/kmb/kmb_plane.c line 465
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0+ .disable_plane = drm_atomic_helper_disable_plane, + .destroy = kmb_plane_destroy, + .reset = kmb_plane_reset, + .atomic_duplicate_state = kmb_plane_duplicate_state, + .atomic_destroy_state = kmb_destroy_plane_state, +}; + +struct kmb_plane *kmb_plane_init (struct drm_device *drm) +{ +struct kmb_drm_private *lcd =to_kmb (drm);
Name it kmb? s/lcd/kmb/
Quoted 89 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +54
-0+struct kmb_plane *plane =NULL ; +struct kmb_plane *primary =NULL ; +int i =0 ; +int ret =0 ; +enum drm_plane_type plane_type; +const u32 *plane_formats; +int num_plane_formats; + +for (i =0 ; i < lcd->n_layers; i++) { + plane =drmm_kzalloc (drm,sizeof (*plane),GFP_KERNEL ); + +if (!plane) { +drm_err (drm,"Failed to allocate plane\n" ); +return ERR_PTR (-ENOMEM ); + } + + plane_type = (i ==0 ) ?DRM_PLANE_TYPE_PRIMARY : +DRM_PLANE_TYPE_OVERLAY ; +if (i <2 ) { + plane_formats = kmb_formats_v; + num_plane_formats =ARRAY_SIZE (kmb_formats_v); + }else { + plane_formats = kmb_formats_g; + num_plane_formats =ARRAY_SIZE (kmb_formats_g); + } + + ret =drm_universal_plane_init (drm, &plane->base_plane, +POSSIBLE_CRTCS , &kmb_plane_funcs, + plane_formats, num_plane_formats, +NULL , plane_type,"plane %d" , i); +if (ret <0 ) { +drm_err (drm,"drm_universal_plane_init failed (ret=%d)" , + ret); + goto cleanup; + } +drm_dbg (drm,"%s : %d i=%d type=%d" , + __func__, __LINE__, + i, plane_type); +drm_plane_helper_add (&plane->base_plane, + &kmb_plane_helper_funcs); +if (plane_type ==DRM_PLANE_TYPE_PRIMARY ) { + primary = plane; + lcd->plane = plane; + } +drm_dbg (drm,"%s : %d primary=%p\n" , __func__, __LINE__, + &primary->base_plane); + plane->id = i; + } + +return primary; +cleanup: +kfree (plane); +return ERR_PTR (ret); +}drivers/gpu/drm/kmb/kmb_plane.h new file +29
-0@@ -0,0 +1,124 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright © 2018-2020 Intel Corporation +*/ + +#ifndef __KMB_PLANE_H__ +#define __KMB_PLANE_H__ + +#include "kmb_drv.h" + +extern int kmb_under_flow; +extern int kmb_flush_done; + +#define LCD_INT_VL0_ERR ((LAYER0_DMA_FIFO_UNDERFLOW) | \ + (LAYER0_DMA_FIFO_OVERFLOW) | \ + (LAYER0_DMA_CB_FIFO_OVERFLOW) | \ + (LAYER0_DMA_CB_FIFO_UNDERFLOW) | \ + (LAYER0_DMA_CR_FIFO_OVERFLOW) | \ + (LAYER0_DMA_CR_FIFO_UNDERFLOW)) + +#define LCD_INT_VL1_ERR ((LAYER1_DMA_FIFO_UNDERFLOW) | \ + (LAYER1_DMA_FIFO_OVERFLOW) | \ + (LAYER1_DMA_CB_FIFO_OVERFLOW) | \ + (LAYER1_DMA_CB_FIFO_UNDERFLOW) | \ + (LAYER1_DMA_CR_FIFO_OVERFLOW) | \ + (LAYER1_DMA_CR_FIFO_UNDERFLOW)) + +#define LCD_INT_GL0_ERR (LAYER2_DMA_FIFO_OVERFLOW | LAYER2_DMA_FIFO_UNDERFLOW) +#define LCD_INT_GL1_ERR (LAYER3_DMA_FIFO_OVERFLOW | LAYER3_DMA_FIFO_UNDERFLOW)
drivers/gpu/drm/kmb/kmb_plane.h line 38
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9
-0+#define LCD_INT_VL0 (LAYER0_DMA_DONE | LAYER0_DMA_IDLE | LCD_INT_VL0_ERR) +#define LCD_INT_VL1 (LAYER1_DMA_DONE | LAYER1_DMA_IDLE | LCD_INT_VL1_ERR) +#define LCD_INT_GL0 (LAYER2_DMA_DONE | LAYER2_DMA_IDLE | LCD_INT_GL0_ERR) +#define LCD_INT_GL1 (LAYER3_DMA_DONE | LAYER3_DMA_IDLE | LCD_INT_GL1_ERR) +#define LCD_INT_DMA_ERR (LCD_INT_VL0_ERR | LCD_INT_VL1_ERR \ + | LCD_INT_GL0_ERR | LCD_INT_GL1_ERR) + +#define POSSIBLE_CRTCS 1 +#define INITIALIZED 1
Not used I think.
Quoted 16 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +16
-0+#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) + +enum layer_id { +LAYER_0 , +LAYER_1 , +LAYER_2 , +LAYER_3 , +// KMB_MAX_PLANES, +}; + +#define KMB_MAX_PLANES 1 + +enum sub_plane_id {
drivers/gpu/drm/kmb/kmb_plane.h line 63
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +9
-0+Y_PLANE , +U_PLANE , +V_PLANE , + MAX_SUB_PLANES, +}; + +struct kmb_plane { +struct drm_plane base_plane; +struct kmb_drm_private kmb_dev;
This is wrong, embedding kmb_drm_private here is not correct.
drivers/gpu/drm/kmb/kmb_plane.h line 65
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +2
-0+unsigned char id; +};
If possible embedding the planes in kmb_drm_private would be preferable. This is how other drivers do it with success.
The id part seems pretty unique - but maybe other drivers has the same but name it different.
drivers/gpu/drm/kmb/kmb_plane.h line 69
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +4
-0+ +struct kmb_plane_state { +struct drm_plane_state base_plane_state; +unsigned char no_planes;
no_planes is not used - so the whole kmb_plane_state can be dropped. And this should kill a few helper functions too.
I know part of this is prepared for multiple planes.
But keep it lean and clean now - maybe addding extra planes later needs to be done different than what the code tries to prepare for.
Quoted 45 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +45
-0+}; + +/* 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 , +}; + +/* Conversion (yuv->rgb) matrix from myriadx */ +static const u32 csc_coef_lcd[] = { +1024 ,0 ,1436 , +1024 ,-352 ,-731 , +1024 ,1814 ,0 , +-179 ,125 ,-226 +}; +
drivers/gpu/drm/kmb/kmb_plane.h line 124
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +10
-0+struct layer_status { +bool disable; +u32 ctrl; +}; + +extern struct layer_status plane_status[KMB_MAX_PLANES ]; + +struct kmb_plane *kmb_plane_init (struct drm_device *drm); +void kmb_plane_destroy (struct drm_plane *plane); +#endif /* __KMB_PLANE_H__ */
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v6] drm/kmb: Add support for KeemBay Display
In reply to Anitha ChrisanthusHi Anitha.
Feedback on kmb_dsi.
The main feedback can be found after the kmb_dsi_init function. The highligt of the feedback is that, in my opinion, the best would be to use the drm_bridge abstraction for the kmb_dsi. Maybe because I am biased - and this is just overhead. But it just looks simpler to me.
There are several chunks of code surrounded by #ifdef. It would be good if they could all be handled so no more #ifdef are required.
There is also a lot of debug prints. Maybe this can be trimmed now that the driver works?
There is a lot of variables that should all be included in a struct kmb_dsi that should be allocated in the probe function (if this becomes a bridge driver).
I hope this does not scare you away! If I am right about the ocnversion to a drm_bridge, then I hope it is semi trivial to do.
All the hard HW init stuff is done.
Sam
Quoted 187 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +181
-0@@ -0,0 +1,1828 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2019-2020 Intel Corporation +*/ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/slab.h> +#include <linux/spinlock.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "kmb_drv.h" +#include "kmb_dsi.h" +#include "kmb_regs.h" + +static int hw_initialized; +/* #define MIPI_TX_TEST_PATTERN_GENERATION */ +/* #define DPHY_GET_FSM */ +/* #define DPHY_READ_TESTCODE */ + +static struct mipi_dsi_host *dsi_host; +static struct mipi_dsi_device *dsi_device; + +/* Default setting is 1080p, 4 lanes */ +#define IMG_HEIGHT_LINES 1080 +#define IMG_WIDTH_PX 1920 +#define MIPI_TX_ACTIVE_LANES 4 + +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 , + .dma_packed =0 +}; + +struct mipi_tx_frame_cfg mipitx_frame0_cfg = { + .sections[0 ] = &mipi_tx_frame0_sect_cfg, + .sections[1 ] =NULL , + .sections[2 ] =NULL , + .sections[3 ] =NULL , + .vsync_width =5 , + .v_backporch =36 , + .v_frontporch =4 , + .hsync_width =44 , + .h_backporch =148 , + .h_frontporch =88 +}; + +struct mipi_tx_dsi_cfg mipitx_dsi_cfg = { + .hfp_blank_en =0 , + .eotp_en =0 , + .lpm_last_vfp_line =0 , + .lpm_first_vsa_line =0 , + .sync_pulse_eventn =DSI_VIDEO_MODE_NO_BURST_EVENT , + .hfp_blanking =SEND_BLANK_PACKET , + .hbp_blanking =SEND_BLANK_PACKET , + .hsa_blanking =SEND_BLANK_PACKET , + .v_blanking =SEND_BLANK_PACKET , +}; + +struct mipi_ctrl_cfg mipi_tx_init_cfg = { + .index =MIPI_CTRL6 , + .type =MIPI_DSI , + .dir =MIPI_TX , + .active_lanes =MIPI_TX_ACTIVE_LANES , + .lane_rate_mbps =MIPI_TX_LANE_DATA_RATE_MBPS , + .ref_clk_khz =MIPI_TX_REF_CLK_KHZ , + .cfg_clk_khz =MIPI_TX_CFG_CLK_KHZ , + .data_if =MIPI_IF_PARALLEL , + .tx_ctrl_cfg = { + .frames[0 ] = &mipitx_frame0_cfg, + .frames[1 ] =NULL , + .frames[2 ] =NULL , + .frames[3 ] =NULL , + .tx_dsi_cfg = &mipitx_dsi_cfg, + .line_sync_pkt_en =0 , + .line_counter_active =0 , + .frame_counter_active =0 , + .tx_always_use_hact =1 , + .tx_hact_wait_stop =1 , + } +}; + +struct mipi_hs_freq_range_cfg { +u16 default_bit_rate_mbps; +u8 hsfreqrange_code; +}; + +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 struct mipi_hs_freq_range_cfg +mipi_hs_freq_range[MIPI_DPHY_DEFAULT_BIT_RATES ] = { + {.default_bit_rate_mbps =80 , .hsfreqrange_code =0x00 }, + {.default_bit_rate_mbps =90 , .hsfreqrange_code =0x10 }, + {.default_bit_rate_mbps =100 , .hsfreqrange_code =0x20 }, + {.default_bit_rate_mbps =110 , .hsfreqrange_code =0x30 }, + {.default_bit_rate_mbps =120 , .hsfreqrange_code =0x01 }, + {.default_bit_rate_mbps =130 , .hsfreqrange_code =0x11 }, + {.default_bit_rate_mbps =140 , .hsfreqrange_code =0x21 }, + {.default_bit_rate_mbps =150 , .hsfreqrange_code =0x31 }, + {.default_bit_rate_mbps =160 , .hsfreqrange_code =0x02 }, + {.default_bit_rate_mbps =170 , .hsfreqrange_code =0x12 }, + {.default_bit_rate_mbps =180 , .hsfreqrange_code =0x22 }, + {.default_bit_rate_mbps =190 , .hsfreqrange_code =0x32 }, + {.default_bit_rate_mbps =205 , .hsfreqrange_code =0x03 }, + {.default_bit_rate_mbps =220 , .hsfreqrange_code =0x13 }, + {.default_bit_rate_mbps =235 , .hsfreqrange_code =0x23 }, + {.default_bit_rate_mbps =250 , .hsfreqrange_code =0x33 }, + {.default_bit_rate_mbps =275 , .hsfreqrange_code =0x04 }, + {.default_bit_rate_mbps =300 , .hsfreqrange_code =0x14 }, + {.default_bit_rate_mbps =325 , .hsfreqrange_code =0x25 }, + {.default_bit_rate_mbps =350 , .hsfreqrange_code =0x35 }, + {.default_bit_rate_mbps =400 , .hsfreqrange_code =0x05 }, + {.default_bit_rate_mbps =450 , .hsfreqrange_code =0x16 }, + {.default_bit_rate_mbps =500 , .hsfreqrange_code =0x26 }, + {.default_bit_rate_mbps =550 , .hsfreqrange_code =0x37 }, + {.default_bit_rate_mbps =600 , .hsfreqrange_code =0x07 }, + {.default_bit_rate_mbps =650 , .hsfreqrange_code =0x18 }, + {.default_bit_rate_mbps =700 , .hsfreqrange_code =0x28 }, + {.default_bit_rate_mbps =750 , .hsfreqrange_code =0x39 }, + {.default_bit_rate_mbps =800 , .hsfreqrange_code =0x09 }, + {.default_bit_rate_mbps =850 , .hsfreqrange_code =0x19 }, + {.default_bit_rate_mbps =900 , .hsfreqrange_code =0x29 }, + {.default_bit_rate_mbps =1000 , .hsfreqrange_code =0x0A }, + {.default_bit_rate_mbps =1050 , .hsfreqrange_code =0x1A }, + {.default_bit_rate_mbps =1100 , .hsfreqrange_code =0x2A }, + {.default_bit_rate_mbps =1150 , .hsfreqrange_code =0x3B }, + {.default_bit_rate_mbps =1200 , .hsfreqrange_code =0x0B }, + {.default_bit_rate_mbps =1250 , .hsfreqrange_code =0x1B }, + {.default_bit_rate_mbps =1300 , .hsfreqrange_code =0x2B }, + {.default_bit_rate_mbps =1350 , .hsfreqrange_code =0x3C }, + {.default_bit_rate_mbps =1400 , .hsfreqrange_code =0x0C }, + {.default_bit_rate_mbps =1450 , .hsfreqrange_code =0x1C }, + {.default_bit_rate_mbps =1500 , .hsfreqrange_code =0x2C }, + {.default_bit_rate_mbps =1550 , .hsfreqrange_code =0x3D }, + {.default_bit_rate_mbps =1600 , .hsfreqrange_code =0x0D }, + {.default_bit_rate_mbps =1650 , .hsfreqrange_code =0x1D }, + {.default_bit_rate_mbps =1700 , .hsfreqrange_code =0x2E }, + {.default_bit_rate_mbps =1750 , .hsfreqrange_code =0x3E }, + {.default_bit_rate_mbps =1800 , .hsfreqrange_code =0x0E }, + {.default_bit_rate_mbps =1850 , .hsfreqrange_code =0x1E }, + {.default_bit_rate_mbps =1900 , .hsfreqrange_code =0x2F }, + {.default_bit_rate_mbps =1950 , .hsfreqrange_code =0x3F }, + {.default_bit_rate_mbps =2000 , .hsfreqrange_code =0x0F }, + {.default_bit_rate_mbps =2050 , .hsfreqrange_code =0x40 }, + {.default_bit_rate_mbps =2100 , .hsfreqrange_code =0x41 }, + {.default_bit_rate_mbps =2150 , .hsfreqrange_code =0x42 }, + {.default_bit_rate_mbps =2200 , .hsfreqrange_code =0x43 }, + {.default_bit_rate_mbps =2250 , .hsfreqrange_code =0x44 }, + {.default_bit_rate_mbps =2300 , .hsfreqrange_code =0x45 }, + {.default_bit_rate_mbps =2350 , .hsfreqrange_code =0x46 }, + {.default_bit_rate_mbps =2400 , .hsfreqrange_code =0x47 }, + {.default_bit_rate_mbps =2450 , .hsfreqrange_code =0x48 }, + {.default_bit_rate_mbps =2500 , .hsfreqrange_code =0x49 }
drivers/gpu/drm/kmb/kmb_dsi.c line 191
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+}; + +union mipi_irq_cfg int_cfg = { + .irq_cfg.frame_done =1 , + .irq_cfg.ctrl_error =1 , +}; + +static enum drm_mode_status +kmb_dsi_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode)
There is a third argument in latest drm code.
Quoted 117 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +117
-0+{ +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 ; +} + +static int kmb_dsi_get_modes (struct drm_connector *connector) +{ +int num_modes =0 ; + + num_modes =drm_add_modes_noedid (connector, + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); + +DRM_INFO ("width=%d height=%d\n" , + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); +DRM_INFO ("num modes=%d\n" , num_modes); + +return num_modes; +} + +void kmb_dsi_host_unregister (void ) +{ +mipi_dsi_host_unregister (dsi_host); +kfree (dsi_host); +} + +static void kmb_dsi_connector_destroy (struct drm_connector *connector) +{ +struct kmb_connector *kmb_connector =to_kmb_connector (connector); + +drm_connector_cleanup (connector); +kfree (kmb_connector); +} + +static void kmb_dsi_encoder_destroy (struct drm_encoder *encoder) +{ +struct kmb_dsi *kmb_dsi =to_kmb_dsi (encoder); + +if (!kmb_dsi) +return ; + +kfree (kmb_dsi->dsi_host); + +drm_encoder_cleanup (encoder); + +kmb_dsi_connector_destroy (&kmb_dsi->attached_connector->base); + +kfree (kmb_dsi); +if (!dsi_device) +kfree (dsi_device); +} + +static const struct drm_encoder_funcs kmb_dsi_funcs = { + .destroy = kmb_dsi_encoder_destroy, +}; + +static const struct +drm_connector_helper_funcs kmb_dsi_connector_helper_funcs = { + .get_modes = kmb_dsi_get_modes, + .mode_valid = kmb_dsi_mode_valid, +}; + +static const struct drm_connector_funcs kmb_dsi_connector_funcs = { + .destroy = kmb_dsi_connector_destroy, + .fill_modes = drm_helper_probe_single_connector_modes, + .reset = drm_atomic_helper_connector_reset, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .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 drm_device *drm, +struct kmb_dsi *kmb_dsi) +{ +struct kmb_dsi_host *host; + + host =kzalloc (sizeof (*host),GFP_KERNEL ); +if (!host) +return NULL ; + + host->base = dsi_host; + host->base->ops = &kmb_dsi_host_ops; + host->kmb_dsi = kmb_dsi;
drivers/gpu/drm/kmb/kmb_dsi.c line 318
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ + host->base->dev = drm->dev; + + dsi_device->host = host->base; + host->device = dsi_device; +return host; +} + +struct drm_bridge *kmb_dsi_host_bridge_init (struct device *dev) +{
If this becomes a bridge driver, then part of this belongs in the probe function.
Quoted 32 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +32
-0+struct drm_bridge *bridge =NULL ; +struct device_node *encoder_node; + +/* Create and register MIPI DSI host */ +if (!dsi_host) { + dsi_host =kzalloc (sizeof (*dsi_host),GFP_KERNEL ); +if (!dsi_host) +return ERR_PTR (-ENOMEM ); + + dsi_host->ops = &kmb_dsi_host_ops; + +if (!dsi_device) { + dsi_device =kzalloc (sizeof (*dsi_device),GFP_KERNEL ); +if (!dsi_device) { +kfree (dsi_host); +return ERR_PTR (-ENOMEM ); + } + } + + dsi_host->dev = dev; +mipi_dsi_host_register (dsi_host); + } +/* Find ADV7535 node and initialize it */ + encoder_node =of_parse_phandle (dev->of_node,"encoder-slave" ,0 ); + +if (!encoder_node) { +DRM_ERROR ("Failed to get bridge info from DT\n" ); +return ERR_PTR (-EINVAL ); + } + +/* Locate drm bridge from the hdmi encoder DT node */ + bridge =of_drm_find_bridge (encoder_node);
drivers/gpu/drm/kmb/kmb_dsi.c line 360
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+of_node_put (encoder_node); +if (!bridge) { +DRM_INFO ("Wait for external bridge driver DT\n" ); +return ERR_PTR (-EPROBE_DEFER ); + } +return bridge; +} + +u32 mipi_get_datatype_params (u32 data_type,u32 data_mode, +struct mipi_data_type_params *params)
static
Quoted 886 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +886
-0+{ +struct mipi_data_type_params data_type_param; + +switch (data_type) { +case DSI_LP_DT_PPS_YCBCR420_12B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =3 ; +switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_YCBCR422_16B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =4 ; +switch (data_mode) { +/* Case 0 and 1 not supported according +* to MDK +*/ +case 2 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_LPPS_YCBCR422_20B : +case DSI_LP_DT_PPS_YCBCR422_24B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =6 ; +switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB565_16B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =2 ; +switch (data_mode) { +case 0 : +case 1 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB666_18B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =9 ; + data_type_param.bits_per_pclk =18 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_LPPS_RGB666_18B : +case DSI_LP_DT_PPS_RGB888_24B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =3 ; + data_type_param.bits_per_pclk =24 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_PPS_RGB101010_30B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =15 ; + data_type_param.bits_per_pclk =30 ; + data_type_param.pixels_per_pclk =1 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_type %d\n" , data_type); +return -EINVAL ; + }; + + *params = data_type_param; +return 0 ; +} + +static u32 compute_wc (u32 width_px,u8 size_constr_p,u8 size_constr_b) +{ +/* Calculate the word count for each long packet */ +return (((width_px / size_constr_p) * size_constr_b) &0xffff ); +} + +static u32 compute_unpacked_bytes (u32 wc,u8 bits_per_pclk) +{ +/* Number of PCLK cycles needed to transfer a line +* with each PCLK cycle, 4 Bytes are sent through the PPL module +*/ +return ((wc *8 ) / bits_per_pclk) *4 ; +} + +static u32 mipi_tx_fg_section_cfg_regs (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, +u32 height_lines,u32 unpacked_bytes, +struct mipi_tx_frame_sect_phcfg *ph_cfg) +{ +u32 cfg =0 ; +u32 ctrl_no =MIPI_CTRL6 ; +u32 reg_adr; + +/* Frame section packet header */ +/* Word count bits [15:0] */ + cfg = (ph_cfg->wc &MIPI_TX_SECT_WC_MASK ) <<0 ; + +/* Data type (bits [21:16]) */ + cfg |= ((ph_cfg->data_type &MIPI_TX_SECT_DT_MASK ) + <<MIPI_TX_SECT_DT_SHIFT ); + +/* Virtual channel (bits [23:22]) */ + cfg |= ((ph_cfg->vchannel &MIPI_TX_SECT_VC_MASK ) + <<MIPI_TX_SECT_VC_SHIFT ); + +/* Data mode (bits [24:25]) */ + cfg |= ((ph_cfg->data_mode &MIPI_TX_SECT_DM_MASK ) + <<MIPI_TX_SECT_DM_SHIFT ); +if (ph_cfg->dma_packed) + cfg |=MIPI_TX_SECT_DMA_PACKED ; + +drm_dbg (&kmb->drm, +"ctrl=%d frame_id=%d section=%d cfg=%x packed=%d\n" , + ctrl_no, frame_id, section, cfg, ph_cfg->dma_packed); +kmb_write_mipi (kmb, + (MIPI_TXm_HS_FGn_SECTo_PH (ctrl_no, frame_id, section)), + cfg); + +/* Unpacked bytes */ + +/* There are 4 frame generators and each fg has 4 sections +* There are 2 registers for unpacked bytes (# bytes each +* section occupies in memory) +* REG_UNPACKED_BYTES0: [15:0]-BYTES0, [31:16]-BYTES1 +* REG_UNPACKED_BYTES1: [15:0]-BYTES2, [31:16]-BYTES3 +*/ + reg_adr = +MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0 (ctrl_no, + frame_id) + (section /2 ) *4 ; +kmb_write_bits_mipi (kmb, reg_adr, (section %2 ) *16 ,16 , + unpacked_bytes); +drm_dbg (&kmb->drm, +"unpacked_bytes = %d, wordcount = %d\n" , unpacked_bytes, + ph_cfg->wc); + +/* Line config */ + reg_adr =MIPI_TXm_HS_FGn_SECTo_LINE_CFG (ctrl_no, frame_id, section); +kmb_write_mipi (kmb, reg_adr, height_lines); +return 0 ; +} + +static u32 mipi_tx_fg_section_cfg (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, +struct mipi_tx_frame_section_cfg *frame_scfg, +u32 *bits_per_pclk,u32 *wc) +{ +u32 ret =0 ; +u32 unpacked_bytes; +struct mipi_data_type_params data_type_parameters; +struct mipi_tx_frame_sect_phcfg ph_cfg; + + ret =mipi_get_datatype_params (frame_scfg->data_type, + frame_scfg->data_mode, + &data_type_parameters); +if (ret) +return ret; + +/* Packet width has to be a multiple of the minimum packet width +* (in pixels) set for each data type +*/ +if (frame_scfg->width_pixels % + data_type_parameters.size_constraint_pixels !=0 ) +return -EINVAL ; + + *wc =compute_wc (frame_scfg->width_pixels, + data_type_parameters.size_constraint_pixels, + data_type_parameters.size_constraint_bytes); + unpacked_bytes =compute_unpacked_bytes (*wc, + data_type_parameters.bits_per_pclk); + 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 (kmb, frame_id, section, + frame_scfg->height_lines, + unpacked_bytes, &ph_cfg); + +/* Caller needs bits_per_clk for additional caluclations */ + *bits_per_pclk = data_type_parameters.bits_per_pclk; + +return 0 ; +} + +static void mipi_tx_fg_cfg_regs (struct kmb_drm_private *kmb,u8 frame_gen, +struct mipi_tx_frame_timing_cfg *fg_cfg) +{ +u32 sysclk; +u32 ppl_llp_ratio; +u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; + +/* 500 Mhz system clock minus 50 to account for the difference in +* MIPI clock speed in RTL tests +*/ + sysclk = kmb->sys_clk_mhz -50 ; + +/* 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 maintain precision */ + ppl_llp_ratio = ((fg_cfg->bpp /8 ) * sysclk *1000 ) / + ((fg_cfg->lane_rate_mbps /8 ) * fg_cfg->active_lanes); + +drm_dbg (&kmb->drm,"ppl_llp_ratio=%d\n" , ppl_llp_ratio); +drm_dbg (&kmb->drm,"bpp=%d sysclk=%d lane-rate=%d active-lanes=%d\n" , + fg_cfg->bpp, sysclk, fg_cfg->lane_rate_mbps, + fg_cfg->active_lanes); + +/* Frame generator number of lines */ + reg_adr =MIPI_TXm_HS_FGn_NUM_LINES (ctrl_no, frame_gen); +kmb_write_mipi (kmb, 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 /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->vsync_width); + +/* vertical backporch (vbp) */ + reg_adr =MIPI_TXm_HS_V_BACKPORCHESn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_backporch); + +/* vertical frontporch (vfp) */ + reg_adr =MIPI_TXm_HS_V_FRONTPORCHESn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_frontporch); + +/* vertical active (vactive) */ + reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_active); + +/* hsync width */ + reg_adr =MIPI_TXm_HS_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->hsync_width * ppl_llp_ratio) /1000 ); + +/* horizontal backporch (hbp) */ + reg_adr =MIPI_TXm_HS_H_BACKPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_backporch * ppl_llp_ratio) /1000 ); + +/* horizontal frontporch (hfp) */ + reg_adr =MIPI_TXm_HS_H_FRONTPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_frontporch * ppl_llp_ratio) /1000 ); + +/* horizontal active (ha) */ + 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_mipi (kmb, reg_adr, val); + +/* llp hsync width */ + reg_adr =MIPI_TXm_HS_LLP_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, 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_mipi (kmb, 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_mipi (kmb, reg_adr, + fg_cfg->h_frontporch * (fg_cfg->bpp /8 )); +} + +static void mipi_tx_fg_cfg (struct kmb_drm_private *kmb,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]) + 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 (kmb, frame_gen, &fg_t_cfg); +} + +static void mipi_tx_multichannel_fifo_cfg (struct kmb_drm_private *kmb, +u8 active_lanes,u8 vchannel_id) +{ +u32 fifo_size, fifo_rthreshold; +u32 ctrl_no =MIPI_CTRL6 ; + +/* Clear all mc fifo channel sizes and thresholds */ +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CTRL_EN ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC1 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD1 ,0 ); + + fifo_size = ((active_lanes >MIPI_D_LANES_PER_DPHY ) ? +MIPI_CTRL_4LANE_MAX_MC_FIFO_LOC : +MIPI_CTRL_2LANE_MAX_MC_FIFO_LOC ) -1 ; + +/* MC fifo size for virtual channels 0-3 +* REG_MC_FIFO_CHAN_ALLOC0: [8:0]-channel0, [24:16]-channel1 +* REG_MC_FIFO_CHAN_ALLOC1: [8:0]-2, [24:16]-channel3 +*/ +SET_MC_FIFO_CHAN_ALLOC (kmb, ctrl_no, vchannel_id, fifo_size); + +/* Set threshold to half the fifo size, actual size=size*16 */ + fifo_rthreshold = ((fifo_size) *8 ) &BIT_MASK_16 ; +SET_MC_FIFO_RTHRESHOLD (kmb, ctrl_no, vchannel_id, fifo_rthreshold); + +/* Enable the MC FIFO channel corresponding to the Virtual Channel */ +kmb_set_bit_mipi (kmb,MIPI_TXm_HS_MC_FIFO_CTRL_EN (ctrl_no), + vchannel_id); +} + +static void mipi_tx_ctrl_cfg (struct kmb_drm_private *kmb,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); + +drm_dbg (&kmb->drm,"sync_cfg=%d fg_en=%d\n" , sync_cfg, fg_en); + +/* MIPI_TX_HS_CTRL */ + +/* type:DSI, source:LCD */ + ctrl =HS_CTRL_EN |TX_SOURCE ; + ctrl |=LCD_VC (fg_id); + ctrl |=ACTIVE_LANES (ctrl_cfg->active_lanes -1 ); +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 ; + +/*67 ns stop time */ + ctrl |=HSEXIT_CNT (0x43 ); + +kmb_write_mipi (kmb,MIPI_TXm_HS_SYNC_CFG (ctrl_no), sync_cfg); +kmb_write_mipi (kmb,MIPI_TXm_HS_CTRL (ctrl_no), ctrl); +} + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +static void mipi_tx_hs_tp_gen (struct kmb_drm_private *kmb,int vc, +int tp_sel,u32 stripe_width,u32 color0, +u32 color1,u32 ctrl_no) +{ +int val =0 ; + +/* Select test pattern mode on the virtual channel */ + val =TP_SEL_VCm (vc, tp_sel); + +/* Configure test pattern colors */ +kmb_write_mipi (kmb,MIPI_TXm_HS_TEST_PAT_COLOR0 (ctrl_no), color0); +kmb_write_mipi (kmb,MIPI_TXm_HS_TEST_PAT_COLOR1 (ctrl_no), color1); + +/* Enable test pattern generation on the virtual channel */ + val |=TP_EN_VCm (vc); +kmb_write_mipi (kmb,MIPI_TXm_HS_TEST_PAT_CTRL (ctrl_no), val); +} +#endif + +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *ctrl_cfg) +{ +u32 ret =0 ; +u8 active_vchannels =0 ; +u8 frame_id, sect; +u32 bits_per_pclk =0 ; +u32 word_count =0 ; +struct mipi_tx_frame_cfg *frame; + +/* This is the order to initialize MIPI TX: +* 1. set frame section parameters +* 2. set frame specific parameters +* 3. connect lcd to mipi +* 4. multi channel fifo cfg +* 5. set mipitxcctrlcfg +*/ + +for (frame_id =0 ; frame_id <4 ; frame_id++) { + frame = ctrl_cfg->tx_ctrl_cfg.frames[frame_id]; + +/* Find valid frame, assume only one valid frame */ +if (!frame) +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 (!frame->sections[sect]) +continue ; + + ret =mipi_tx_fg_section_cfg (kmb, frame_id, sect, + frame->sections[sect], + &bits_per_pclk, + &word_count); +if (ret) +return ret; + } + +/* Set frame specific parameters */ +mipi_tx_fg_cfg (kmb, frame_id, ctrl_cfg->active_lanes, + bits_per_pclk, word_count, + ctrl_cfg->lane_rate_mbps, frame); + + active_vchannels++; + +/* Stop iterating as only one virtual channel +* shall be used for LCD connection +*/ +break ; + } + +if (active_vchannels ==0 ) +return -EINVAL ; +/* Multi-Channel FIFO Configuration */ +mipi_tx_multichannel_fifo_cfg (kmb, ctrl_cfg->active_lanes, frame_id); + +/* Frame Generator Enable */ +mipi_tx_ctrl_cfg (kmb, frame_id, ctrl_cfg); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x8 ,0xff ,0xff00 ,MIPI_CTRL6 ); +#endif + +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +return ret; +} + +#ifdef DPHY_READ_TESTCODE +int dphy_read_testcode (struct kmb_drm_private *kmb,int dphy_sel, +int test_code) +{ +u32 reg_wr_data; +u32 reg_rd_data; +int data; + + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data =0 ; + reg_wr_data =0 ; + reg_rd_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code >>8 &0xf ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code &0xff ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + +if ((dphy_sel >>0 &0xf ) >0 ) + reg_rd_data =kmb_read_mipi (kmb,DPHY_TEST_DOUBT0_3 ); +if ((dphy_sel >>4 &0xf ) >0 ) + reg_rd_data =kmb_read_mipi (kmb,DPHY_TEST_DOUBT4_7 ); +if ((dphy_sel >>8 &0x3 ) >0 ) + reg_rd_data =kmb_read_mipi (kmb,DPHY_TEST_DOUBT8_9 ); + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + data = reg_rd_data >>0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + data = reg_rd_data >>8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + data = reg_rd_data >>16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + data = reg_rd_data >>24 ; + +return data; +} +#endif + +static void test_mode_send (struct kmb_drm_private *kmb,u32 dphy_no, +u32 test_code,u32 test_data) +{ +if (test_code !=TEST_CODE_FSM_CONTROL ) +drm_dbg (&kmb->drm, +"test_code = %02x, test_data = %08x\n" , test_code, + test_data); +/* Steps to send test code: +* - set testclk HIGH +* - set testdin with test code +* - set testen HIGH +* - set testclk LOW +* - set testen LOW +*/ + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testdin */ +SET_TEST_DIN0_3 (kmb, dphy_no, test_code); + +/* Set testen high */ +SET_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +if (test_code) { +/* Steps to send test data: +* - set testen LOW +* - set testclk LOW +* - set testdin with data +* - set testclk HIGH +*/ + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set data in testdin */ +kmb_write_mipi (kmb, +DPHY_TEST_DIN0_3 + ((dphy_no /0x4 ) *0x4 ), + test_data << ((dphy_no %4 ) *8 )); + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + } +} + +static inline void +set_test_mode_src_osc_freq_target_low_bits (struct kmb_drm_private *kmb, +u32 dphy_no, +u32 freq) +{ +/* Typical rise/fall time=166, refer Table 1207 databook, +* sr_osc_freq_target[7:0] +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_SLEW_RATE_DDL_CYCLES , + (freq &0x7f )); +} + +static inline void +set_test_mode_src_osc_freq_target_hi_bits (struct kmb_drm_private *kmb, +u32 dphy_no, +u32 freq) +{ +u32 data; + +/* Flag this as high nibble */ + data = ((freq >>6 ) &0x1f ) | (1 <<7 ); + +/* Typical rise/fall time=166, refer Table 1207 databook, +* sr_osc_freq_target[11:7] +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_SLEW_RATE_DDL_CYCLES , data); +} + +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 (struct kmb_drm_private *kmb,u32 dphy_no, +u32 ref_clk_mhz,u32 target_freq_mhz) +{ +u32 best_n =0 , best_m =0 ; +u32 n =0 , m =0 , div =0 , delta, freq =0 , t_freq; +u32 best_freq_delta =3000 ; + +/* 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 , + }; + + 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 (kmb, dphy_no,TEST_CODE_PLL_VCO_CTRL , (vco_p.range + | (1 <<6 ))); + +/* Program m, n pll parameters */ +drm_dbg (&kmb->drm,"m = %d n = %d\n" , best_m, best_n); + +/* PLL_Input_Divider_Ratio[3:0] = pll_n_ovr */ +test_mode_send (kmb, 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 (kmb, 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 (kmb, 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 (kmb, 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 (kmb, 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 (kmb, dphy_no,TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL , +0x00 ); + +/* pll_gmp_cntrl-fixed value for gmp_cntrl from DPHY doci */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_GMP_CTRL ,0x10 ); + +/* pll_cpbias_cntrl-fixed value for cpbias_cntrl from DPHY doc */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_CHARGE_PUMP_BIAS ,0x10 ); + +/* pll_th1 -Lock Detector Phase error threshold, +* document gives fixed value +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_PHASE_ERR_CTRL ,0x02 ); + +/* PLL Lock Configuration */ + +/* pll_th2 - Lock Filter length, document gives fixed value */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_LOCK_FILTER ,0x60 ); + +/* pll_th3- PLL Unlocking filter, document gives fixed value */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_UNLOCK_FILTER ,0x03 ); + +/* pll_lock_sel-PLL Lock Detector Selection, +* document gives fixed value +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_LOCK_DETECTOR ,0x02 ); +} + +#ifdef DPHY_GET_FSM +static void dphy_get_fsm (struct kmb_drm_private *kmb,u32 dphy_no) +{ +test_mode_send (kmb, dphy_no,TEST_CODE_FSM_CONTROL ,0x80 );
drivers/gpu/drm/kmb/kmb_dsi.c line 1256
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +drm_dbg (&kmb->drm,"dphy %d fsm_state = 0%x\n" , dphy_no, + kmb_read_mipi(kmb, DPHY_TEST_DOUBT4_7)); +} +#endif + +static void dphy_init_sequence (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg,u32 dphy_no, +int active_lanes,enum dphy_mode mode) +{
This function is too long.
Try to:
- drop irrelevant debug prints
- make a few helpers - maybe the long if () else if () else could cll functions.
Quoted 390 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +390
-0+u32 test_code =0 , test_data =0 , val; +int i =0 ; + +drm_info (&kmb->drm, +"dphy=%d mode=%d active_lanes=%d\n" , dphy_no, mode, + active_lanes); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Set D-PHY in shutdown mode */ +/* Assert RSTZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); + +/* Assert SHUTDOWNZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); + val =kmb_read_mipi (kmb,DPHY_INIT_CTRL0 ); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , val); + +/* Init D-PHY_n +* Pulse testclear signal to make sure the d-phy configuration +* starts from a clean base +*/ +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +SET_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); + +drm_dbg (&kmb->drm,"DPHY_TEST_CTRL0=0x%x\n" , +kmb_read_mipi (kmb,DPHY_TEST_CTRL0 )); + +/* Set mastermacro bit - Master or slave mode */ + test_code =TEST_CODE_MULTIPLE_PHY_CTRL ; + +/* DPHY has its own clock lane enabled (master) */ +if (mode ==MIPI_DPHY_MASTER ) + test_data =0x01 ; +else + test_data =0x00 ; + +/* Send the test code and data */ +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set the lane data rate */ +for (i =0 ; i <MIPI_DPHY_DEFAULT_BIT_RATES ; i++) { +if (mipi_hs_freq_range[i].default_bit_rate_mbps < + cfg->lane_rate_mbps) +continue ; + +/* Send the test code and data */ +/* bit[6:0] = hsfreqrange_ovr bit[7] = hsfreqrange_ovr_en */ + test_code =TEST_CODE_HS_FREQ_RANGE_CFG ; + test_data = (mipi_hs_freq_range[i].hsfreqrange_code &0x7f ) | + (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); +break ; + } + +/* High-Speed Tx Slew Rate Calibration +* BitRate: > 1.5 Gbps && <= 2.5 Gbps: slew rate control OFF +*/ +if (cfg->lane_rate_mbps >1500 ) { +/* Bypass slew rate calibration algorithm +* bits[1:0} srcal_en_ovr_en, srcal_en_ovr +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data =0x02 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Disable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x00 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + }else if (cfg->lane_rate_mbps >1000 ) { +/* BitRate: > 1 Gbps && <= 1.5 Gbps: - slew rate control ON +* typical rise/fall times: 166 ps +*/ + +/* Do not bypass slew rate calibration algorithm +* bits[1:0}=srcal_en_ovr_en, srcal_en_ovr, bit[6]=sr_range +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[6:0] low nibble +* typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x72f &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble +* Typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x72f >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + }else { +/* lane_rate_mbps <= 1000 Mbps +* BitRate: <= 1 Gbps: +* - slew rate control ON +* - typical rise/fall times: 225 ps +*/ + +/* Do not bypass slew rate calibration algorithm */ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Typical rise/fall time=255, refer Table 1207 databook */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x523 &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x523 >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + } + +/* Set cfgclkfreqrange */ + val = (((cfg->cfg_clk_khz /1000 ) -17 ) *4 ) &0x3f ; +SET_DPHY_FREQ_CTRL0_3 (kmb, dphy_no, val); + +drm_dbg (&kmb->drm,"DPHY_FREQ = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_FREQ_CTRL0_3 +4 )); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Enable config clk for the corresponding d-phy */ +kmb_set_bit_mipi (kmb,DPHY_CFG_CLK_EN , dphy_no); + +drm_dbg (&kmb->drm,"DPHY_CFG_CLK_EN = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_CFG_CLK_EN )); + +/* PLL setup */ +if (mode ==MIPI_DPHY_MASTER ) { +/* Set PLL regulator in bypass */ + test_code =TEST_CODE_PLL_ANALOG_PROG ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* PLL Parameters Setup */ +mipi_tx_pll_setup (kmb, dphy_no, cfg->ref_clk_khz /1000 , + cfg->lane_rate_mbps /2 ); + +/* Set clksel */ +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL1 , +PLL_CLKSEL_0 ,2 ,0x01 ); + +/* Set pll_shadow_control */ +kmb_set_bit_mipi (kmb,DPHY_INIT_CTRL1 ,PLL_SHADOW_CTRL ); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL1 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL1 )); + } + +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +//#define MIPI_TX_FORCE_VOD +#ifdef MIPI_TX_FORCE_VOD +#define MIPI_TX_VOD_LVL 450 +#define TEST_CODE_BANDGAP 0x24 +/* Set bandgap/VOD level */ +switch (MIPI_TX_VOD_LVL ) { +case 200 : + test_data =0x00 ; +break ; +case 300 : + test_data =0x20 ; +break ; +case 350 : + test_data =0x40 ; +break ; +case 450 : + test_data =0x60 ; +break ; +case 400 : +default : + test_data =0x70 ; +break ; + } +test_mode_send (kmb, dphy_no,TEST_CODE_BANDGAP , test_data); +#endif + +/* Send NORMAL OPERATION test code */ + test_code =0x0 ; + test_data =0x0 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Configure BASEDIR for data lanes +* NOTE: basedir only applies to LANE_0 of each D-PHY. +* The other lanes keep their direction based on the D-PHY type, +* either Rx or Tx. +* bits[5:0] - BaseDir: 1 = Rx +* bits[9:6] - BaseDir: 0 = Tx +*/ +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL2 ,0 ,9 ,0x03f ); +ndelay (15 ); + +/* Enable CLOCK LANE +* Clock lane should be enabled regardless of the direction +* set for the D-PHY (Rx/Tx) +*/ +kmb_set_bit_mipi (kmb,DPHY_INIT_CTRL2 ,12 + dphy_no); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL2 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL2 )); + +/* Enable DATA LANES */ +kmb_write_bits_mipi (kmb,DPHY_ENABLE , dphy_no *2 ,2 , + ((1 << active_lanes) -1 )); + +drm_dbg (&kmb->drm, +"DPHY_ENABLE = 0x%x\n" ,kmb_read_mipi (kmb,DPHY_ENABLE )); +ndelay (15 ); + +/* Take D-PHY out of shutdown mode */ +/* Deassert SHUTDOWNZ signal */ +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); +SET_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); +ndelay (15 ); + +/* Deassert RSTZ signal */ +SET_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL0 )); +} + +static void dphy_wait_fsm (struct kmb_drm_private *kmb,u32 dphy_no, +enum dphy_tx_fsm fsm_state) +{ +enum dphy_tx_fsm val =DPHY_TX_POWERDWN ; +int i =0 ; +int status =1 ; + +do { +test_mode_send (kmb, dphy_no,TEST_CODE_FSM_CONTROL ,0x80 ); + + val =GET_TEST_DOUT4_7 (kmb, dphy_no); + i++; +if (i >TIMEOUT ) { + status =0 ; +break ; + } + }while (val != fsm_state); + +drm_dbg (&kmb->drm,"%s: dphy %d val = %x\n" , __func__, dphy_no, val); +drm_info (&kmb->drm,"********** DPHY %d WAIT_FSM %s **********\n" , + dphy_no, status ?"SUCCESS" :"FAILED" ); +} + +static void wait_init_done (struct kmb_drm_private *kmb,u32 dphy_no, +u32 active_lanes) +{ +u32 stopstatedata =0 ; +u32 data_lanes = (1 << active_lanes) -1 ; +int i =0 , val; +int status =1 ; + +drm_dbg (&kmb->drm,"dphy=%d active_lanes=%d data_lanes=%d\n" , dphy_no, + active_lanes, data_lanes); + +do { + val =kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 ); + stopstatedata =GET_STOPSTATE_DATA (kmb, dphy_no) & data_lanes; + +/* TODO-need to add a time out and return failure */ + i++; + +if (i >TIMEOUT ) { + status =0 ; + +drm_info (&kmb->drm, +"! WAIT_INIT_DONE: TIMING OUT!(err_stat=%d)" , +kmb_read_mipi (kmb,MIPI_DPHY_ERR_STAT6_7 )); +drm_dbg (&kmb->drm, +"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , val); +drm_dbg (&kmb->drm, +"stopdata = 0x%x data_lanes=0x%x\n" , + stopstatedata, data_lanes); + +break ; + } + +if (i <3 ) { +drm_dbg (&kmb->drm, +"stopdata = 0x%x data_lanes=0x%x\n" , + stopstatedata, data_lanes); +drm_dbg (&kmb->drm, +"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , val); + } + }while (stopstatedata != data_lanes); + +drm_info (&kmb->drm,"********** DPHY %d INIT - %s **********\n" , + dphy_no, status ?"SUCCESS" :"FAILED" ); +} + +static void wait_pll_lock (struct kmb_drm_private *kmb,u32 dphy_no) +{ +int i =0 ; +int status =1 ; + +do { +/* TODO-need to add a time out and return failure */ + i++; +if (i >TIMEOUT ) { + status =0 ; + +drm_info (&kmb->drm,"%s: timing out" , __func__); +drm_dbg (&kmb->drm, +"%s : PLL_LOCK = 0x%x " , __func__, +kmb_read_mipi (kmb,DPHY_PLL_LOCK )); + +break ; + } + +if ((i %100 ) ==0 ) +drm_dbg (&kmb->drm, +"%s : PLL_LOCK = 0x%x\n" , __func__, +kmb_read_mipi (kmb,DPHY_PLL_LOCK )); + }while (!GET_PLL_LOCK (kmb, dphy_no)); + +drm_info (&kmb->drm,"***** PLL Locked for DPHY %d - %s *****\n" , + dphy_no, status ?"SUCCESS" :"FAILED" ); +} + +static u32 mipi_tx_init_dphy (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg) +{ +u32 dphy_no =MIPI_DPHY6 ; + +drm_info (&kmb->drm, +"active_lanes=%d lane_rate=%d\n" , cfg->active_lanes, +MIPI_TX_LANE_DATA_RATE_MBPS ); + +/* Multiple D-PHYs needed */ +if (cfg->active_lanes >MIPI_DPHY_D_LANES ) { +/* +*Initialization for Tx aggregation mode is done according to +*a. start init PHY1 +*b. poll for PHY1 FSM state LOCK +* b1. reg addr 0x03[3:0] - state_main[3:0] == 5 (LOCK) +*c. poll for PHY1 calibrations done : +* c1. termination calibration lower section: addr 0x22[5] +* - rescal_done +* c2. slewrate calibration (if data rate < = 1500 Mbps): +* addr 0xA7[3:2] - srcal_done, sr_finished +*d. start init PHY0 +*e. poll for PHY0 stopstate +*f. poll for PHY1 stopstate +*/ +/* PHY #N+1 ('slave') */ + +dphy_init_sequence (kmb, cfg, dphy_no +1 , + (cfg->active_lanes -MIPI_DPHY_D_LANES ), +MIPI_DPHY_SLAVE ); +dphy_wait_fsm (kmb, dphy_no +1 ,DPHY_TX_LOCK ); + +/* PHY #N master */ +dphy_init_sequence (kmb, cfg, dphy_no,MIPI_DPHY_D_LANES , +MIPI_DPHY_MASTER ); + +/* Wait for DPHY init to complete */ +wait_init_done (kmb, dphy_no,MIPI_DPHY_D_LANES ); +wait_init_done (kmb, dphy_no +1 , + cfg->active_lanes -MIPI_DPHY_D_LANES ); +wait_pll_lock (kmb, dphy_no); +wait_pll_lock (kmb, dphy_no +1 ); +dphy_wait_fsm (kmb, dphy_no,DPHY_TX_IDLE ); + }else {/* Single DPHY */ + dphy_init_sequence(kmb, cfg, dphy_no, cfg->active_lanes,
drivers/gpu/drm/kmb/kmb_dsi.c line 1656
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ MIPI_DPHY_MASTER); +dphy_wait_fsm (kmb, dphy_no,DPHY_TX_IDLE ); +wait_init_done (kmb, dphy_no, cfg->active_lanes); +wait_pll_lock (kmb, dphy_no); + } + +return 0 ; +} + +void connect_lcd_to_mipi (struct kmb_drm_private *kmb)
static
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+{ +/* DISABLE MIPI->CIF CONNECTION */ +kmb_write_msscam (kmb,MSS_MIPI_CIF_CFG ,0 ); + +/* ENABLE LCD->MIPI CONNECTION */ +kmb_write_msscam (kmb,MSS_LCD_MIPI_CFG ,1 ); + +/* DISABLE LCD->CIF LOOPBACK */ +kmb_write_msscam (kmb,MSS_LOOPBACK_CFG ,0 );
drivers/gpu/drm/kmb/kmb_dsi.c line 1675
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+} + +int kmb_dsi_hw_init (struct drm_device *dev,struct drm_display_mode *mode) +{ +struct kmb_drm_private *kmb =to_kmb (dev); +u64 data_rate; + + mipi_tx_init_cfg.active_lanes =MIPI_TX_ACTIVE_LANES ; + +if (mode) {
I cannot see this function being called without a mode.
Quoted 119 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +119
-0+ mipi_tx_frame0_sect_cfg.width_pixels = mode->crtc_hdisplay; + mipi_tx_frame0_sect_cfg.height_lines = mode->crtc_vdisplay; + mipitx_frame0_cfg.vsync_width = + mode->crtc_vsync_end - mode->crtc_vsync_start; + mipitx_frame0_cfg.v_backporch = + mode->crtc_vtotal - mode->crtc_vsync_end; + mipitx_frame0_cfg.v_frontporch = + mode->crtc_vsync_start - mode->crtc_vdisplay; + mipitx_frame0_cfg.hsync_width = + mode->crtc_hsync_end - mode->crtc_hsync_start; + mipitx_frame0_cfg.h_backporch = + mode->crtc_htotal - mode->crtc_hsync_end; + mipitx_frame0_cfg.h_frontporch = + mode->crtc_hsync_start - mode->crtc_hdisplay; + +/* Lane rate = (vtotal*htotal*fps*bpp)/4 / 1000000 +* to convert to Mbps +*/ + data_rate = ((((u32 )mode->crtc_vtotal * + (u32 )mode->crtc_htotal) * + (u32)(drm_mode_vrefresh (mode)) * +MIPI_TX_BPP ) / mipi_tx_init_cfg.active_lanes) / +1000000 ; + +drm_info (&kmb->drm,"htotal=%d vtotal=%d refresh=%d\n" , + mode->crtc_htotal, mode->crtc_vtotal, +drm_mode_vrefresh (mode)); +drm_info (&kmb->drm,"data_rate=%u active_lanes=%d\n" , + (u32 )data_rate, mipi_tx_init_cfg.active_lanes); + +/* When late rate < 800, modeset fails with 4 lanes, +* so switch to 2 lanes +*/ +if (data_rate <800 ) { + mipi_tx_init_cfg.active_lanes =2 ; + mipi_tx_init_cfg.lane_rate_mbps = data_rate *2 ; + }else { + mipi_tx_init_cfg.lane_rate_mbps = data_rate; + } +drm_info (&kmb->drm, +"lane rate=%d\n" , mipi_tx_init_cfg.lane_rate_mbps); +drm_dbg (&kmb->drm, +"vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d hsync_len=%d lane-rate=%d" , + mipitx_frame0_cfg.v_frontporch, + mipitx_frame0_cfg.v_backporch, + mipitx_frame0_cfg.vsync_width, + mipitx_frame0_cfg.h_frontporch, + mipitx_frame0_cfg.h_backporch, + mipitx_frame0_cfg.hsync_width, + mipi_tx_init_cfg.lane_rate_mbps); + } + +if (hw_initialized) +return 0 ; + +kmb_write_mipi (kmb,DPHY_ENABLE ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL0 ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL1 ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL2 ,0 ); + +/* Initialize mipi controller */ +mipi_tx_init_cntrl (kmb, &mipi_tx_init_cfg); + +/* Dphy initialization */ +mipi_tx_init_dphy (kmb, &mipi_tx_init_cfg); +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +connect_lcd_to_mipi (kmb); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x15 ,0xff ,0xff00 ,MIPI_CTRL6 ); + +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); +#endif //MIPI_TX_TEST_PATTERN_GENERATION + + hw_initialized = true; + +drm_dbg (&kmb->drm,"MIPI_TXm_HS_CTRL = 0x%x\n" , +kmb_read_mipi (kmb,MIPI_TXm_HS_CTRL (6 ))); +drm_dbg (&kmb->drm,"MIPI LOOP BACK = %x\n" , +kmb_read_mipi (kmb,MIPI_CTRL_DIG_LOOPBACK )); +drm_info (&kmb->drm,"mipi hw_initialized = %d\n" , hw_initialized); + +return 0 ; +} + +int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge) +{ +struct kmb_dsi *kmb_dsi; +struct drm_encoder *encoder; +struct kmb_connector *kmb_connector; +struct drm_connector *connector; +struct kmb_dsi_host *host; +int ret =0 ; + + kmb_dsi =kzalloc (sizeof (*kmb_dsi),GFP_KERNEL ); +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); +DRM_ERROR ("failed to allocate kmb_connector\n" ); +return -ENOMEM ; + } + + kmb_dsi->attached_connector = kmb_connector; + + host =kmb_dsi_host_init (dev, kmb_dsi); +if (!host) { +DRM_ERROR ("Failed to allocate host\n" ); +kfree (kmb_dsi); +kfree (kmb_connector); +return -ENOMEM ;
drivers/gpu/drm/kmb/kmb_dsi.c line 1804
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ } + + kmb_dsi->dsi_host = host; + 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" );
Use drm_simple_encoder(). See other drivers how to do it.
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ +drm_connector_init (dev, connector, &kmb_dsi_connector_funcs, +DRM_MODE_CONNECTOR_DSI ); + +drm_connector_helper_add (connector, &kmb_dsi_connector_helper_funcs); +
drivers/gpu/drm/kmb/kmb_dsi.c line 1820
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+drm_info (dev,"connector = %s encoder = %s\n" , connector->name, + encoder->name); + + ret =drm_connector_attach_encoder (connector, encoder); +drm_info (dev,"connector->encoder = 0x%p ret = %d\n" , + connector->encoder, + ret); + +/* Link drm_bridge to encoder */ + ret =drm_bridge_attach (encoder, bridge,NULL ,0 );
This sequence is not optimal and not right.
The new way, which new drivers shall use, is to let the bridge drivers provide relevant operations and then the display driver uses drm_bridge_connector_init() to create the connector.
See for example mtk_dsi_encoder_init()
The current design uses a thight coupling between the display driver and the kmb_dsi. I may be biased but to me it seems easier to make kmb_dsi a real bridge driver so we have a chain of bridges like this:
--------------------+ +----------------+ +----------------+
| | | | |
kmb display driver +---+ kmb_dsi bridge +---+ adv7535 bridge +== HDMI
| | | | |
--------------------+ +----------------+ +----------------+adv7535 then provides get_edit, detect, and hot-plug detect operations to be used by the connector.
Quoted 108 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+if (ret) { +DRM_ERROR ("failed to attach bridge to MIPI\n" ); +drm_encoder_cleanup (encoder); +return ret; + } +drm_info (dev,"Bridge attached : SUCCESS\n" ); +return 0 ; +}drivers/gpu/drm/kmb/kmb_dsi.h new file +94
-0@@ -0,0 +1,370 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright © 2019-2020 Intel Corporation +*/ + +#ifndef __KMB_DSI_H__ +#define __KMB_DSI_H__ + +#include <drm/drm_crtc.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_modes.h> +#include "kmb_drv.h" + +/* MIPI TX CFG*/ +#define MIPI_TX_LANE_DATA_RATE_MBPS 891 +#define MIPI_TX_REF_CLK_KHZ 24000 +#define MIPI_TX_CFG_CLK_KHZ 24000 +#define MIPI_TX_BPP 24 + +/* DPHY Tx test codes*/ +#define TEST_CODE_FSM_CONTROL 0x03 +#define TEST_CODE_MULTIPLE_PHY_CTRL 0x0C +#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 BIT(7) +#define TEST_CODE_PLL_OUTPUT_CLK_SEL 0x19 +#define PLL_N_OVR_EN BIT(4) +#define PLL_M_OVR_EN BIT(5) +#define TEST_CODE_VOD_LEVEL 0x24 +#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 + +/* DPHY 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 + +#define TIMEOUT 600 + +#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 511 +/* 2 Data Lanes per D-PHY */ +#define MIPI_DPHY_D_LANES 2 +#define MIPI_DPHY_DEFAULT_BIT_RATES 63 + +#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) +#define to_kmb_dsi (x) container_of(x, struct kmb_dsi, base) + +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 drm_bridge *bridge; +}; + +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; +}; + +/* DPHY Tx test codes */ + +enum mipi_ctrl_num { +MIPI_CTRL0 =0 , + MIPI_CTRL1,
drivers/gpu/drm/kmb/kmb_dsi.h line 104
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+MIPI_CTRL2 , +MIPI_CTRL3 , +MIPI_CTRL4 , +MIPI_CTRL5 , +MIPI_CTRL6 , +MIPI_CTRL7 , +MIPI_CTRL8 , +MIPI_CTRL9 , +MIPI_CTRL_NA +};
Not used?
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +4
-0+ +enum mipi_dphy_num { +MIPI_DPHY0 =0 , +MIPI_DPHY1 ,
drivers/gpu/drm/kmb/kmb_dsi.h line 118
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+MIPI_DPHY2 , +MIPI_DPHY3 , +MIPI_DPHY4 , +MIPI_DPHY5 , +MIPI_DPHY6 , +MIPI_DPHY7 , +MIPI_DPHY8 , +MIPI_DPHY9 , +MIPI_DPHY_NA +};
Not used?
Quoted 214 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +214
-0+ +enum mipi_dir { +MIPI_RX , +MIPI_TX +}; + +enum mipi_ctrl_type { +MIPI_DSI , +MIPI_CSI +}; + +enum mipi_data_if { +MIPI_IF_DMA , +MIPI_IF_PARALLEL +}; + +enum mipi_data_mode { +MIPI_DATA_MODE0 , +MIPI_DATA_MODE1 , +MIPI_DATA_MODE2 , +MIPI_DATA_MODE3 +}; + +enum mipi_dsi_video_mode { +DSI_VIDEO_MODE_NO_BURST_PULSE , +DSI_VIDEO_MODE_NO_BURST_EVENT , +DSI_VIDEO_MODE_BURST +}; + +enum mipi_dsi_blanking_mode { +TRANSITION_TO_LOW_POWER , +SEND_BLANK_PACKET +}; + +enum mipi_dsi_eotp { +DSI_EOTP_DISABLED , +DSI_EOTP_ENABLES +}; + +enum mipi_dsi_data_type { +DSI_SP_DT_RESERVED_00 =0x00 , +DSI_SP_DT_VSYNC_START =0x01 , +DSI_SP_DT_COLOR_MODE_OFF =0x02 , +DSI_SP_DT_GENERIC_SHORT_WR =0x03 , +DSI_SP_DT_GENERIC_RD =0x04 , +DSI_SP_DT_DCS_SHORT_WR =0x05 , +DSI_SP_DT_DCS_RD =0x06 , +DSI_SP_DT_EOTP =0x08 , +DSI_LP_DT_NULL =0x09 , +DSI_LP_DT_RESERVED_0A =0x0a , +DSI_LP_DT_RESERVED_0B =0x0b , +DSI_LP_DT_LPPS_YCBCR422_20B =0x0c , +DSI_LP_DT_PPS_RGB101010_30B =0x0d , +DSI_LP_DT_PPS_RGB565_16B =0x0e , +DSI_LP_DT_RESERVED_0F =0x0f , + +DSI_SP_DT_RESERVED_10 =0x10 , +DSI_SP_DT_VSYNC_END =0x11 , +DSI_SP_DT_COLOR_MODE_ON =0x12 , +DSI_SP_DT_GENERIC_SHORT_WR_1PAR =0x13 , +DSI_SP_DT_GENERIC_RD_1PAR =0x14 , +DSI_SP_DT_DCS_SHORT_WR_1PAR =0x15 , +DSI_SP_DT_RESERVED_16 =0x16 , +DSI_SP_DT_RESERVED_17 =0x17 , +DSI_SP_DT_RESERVED_18 =0x18 , +DSI_LP_DT_BLANK =0x19 , +DSI_LP_DT_RESERVED_1A =0x1a , +DSI_LP_DT_RESERVED_1B =0x1b , +DSI_LP_DT_PPS_YCBCR422_24B =0x1c , +DSI_LP_DT_PPS_RGB121212_36B =0x1d , +DSI_LP_DT_PPS_RGB666_18B =0x1e , +DSI_LP_DT_RESERVED_1F =0x1f , + +DSI_SP_DT_RESERVED_20 =0x20 , +DSI_SP_DT_HSYNC_START =0x21 , +DSI_SP_DT_SHUT_DOWN_PERIPH_CMD =0x22 , +DSI_SP_DT_GENERIC_SHORT_WR_2PAR =0x23 , +DSI_SP_DT_GENERIC_RD_2PAR =0x24 , +DSI_SP_DT_RESERVED_25 =0x25 , +DSI_SP_DT_RESERVED_26 =0x26 , +DSI_SP_DT_RESERVED_27 =0x27 , +DSI_SP_DT_RESERVED_28 =0x28 , +DSI_LP_DT_GENERIC_LONG_WR =0x29 , +DSI_LP_DT_RESERVED_2A =0x2a , +DSI_LP_DT_RESERVED_2B =0x2b , +DSI_LP_DT_PPS_YCBCR422_16B =0x2c , +DSI_LP_DT_RESERVED_2D =0x2d , +DSI_LP_DT_LPPS_RGB666_18B =0x2e , +DSI_LP_DT_RESERVED_2F =0x2f , + +DSI_SP_DT_RESERVED_30 =0x30 , +DSI_SP_DT_HSYNC_END =0x31 , +DSI_SP_DT_TURN_ON_PERIPH_CMD =0x32 , +DSI_SP_DT_RESERVED_33 =0x33 , +DSI_SP_DT_RESERVED_34 =0x34 , +DSI_SP_DT_RESERVED_35 =0x35 , +DSI_SP_DT_RESERVED_36 =0x36 , +DSI_SP_DT_SET_MAX_RETURN_PKT_SIZE =0x37 , +DSI_SP_DT_RESERVED_38 =0x38 , +DSI_LP_DT_DSC_LONG_WR =0x39 , +DSI_LP_DT_RESERVED_3A =0x3a , +DSI_LP_DT_RESERVED_3B =0x3b , +DSI_LP_DT_RESERVED_3C =0x3c , +DSI_LP_DT_PPS_YCBCR420_12B =0x3d , +DSI_LP_DT_PPS_RGB888_24B =0x3e , +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 +}; + +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 { +u8 size_constraint_pixels; +u8 size_constraint_bytes; +u8 pixels_per_pclk; +u8 bits_per_pclk; +}; + +struct mipi_tx_dsi_cfg { +u8 hfp_blank_en;/*horizontal front porch blanking enable */ +u8 eotp_en;/*End of transmission packet enable */ +/*last vertical front porch blanking mode */ +u8 lpm_last_vfp_line; +/*first vertical sync active blanking mode */ +u8 lpm_first_vsa_line; +u8 sync_pulse_eventn;/*sync type */ +u8 hfp_blanking;/*horizontal front porch blanking mode */ +u8 hbp_blanking;/*horizontal back porch blanking mode */ +u8 hsa_blanking;/*horizontal sync active blanking mode */ +u8 v_blanking;/*vertical timing blanking mode */ +}; + +struct mipi_tx_frame_section_cfg { +u32 dma_v_stride; +u16 dma_v_scale_cfg; +u16 width_pixels; +u16 height_lines; +u8 dma_packed; +u8 bpp; +u8 bpp_unpacked; +u8 dma_h_stride; +u8 data_type; +u8 data_mode; +u8 dma_flip_rotate_sel; +}; + +struct mipi_tx_frame_timing_cfg { +u32 bpp; +u32 lane_rate_mbps; +u32 hsync_width; +u32 h_backporch; +u32 h_frontporch; +u32 h_active; +u16 vsync_width; +u16 v_backporch; +u16 v_frontporch; +u16 v_active; +u8 active_lanes; +}; + +struct mipi_tx_frame_sect_phcfg { +u32 wc; +enum mipi_data_mode data_mode; +enum mipi_dsi_data_type data_type; +u8 vchannel; +u8 dma_packed; +}; + +struct mipi_tx_frame_cfg { +struct mipi_tx_frame_section_cfg *sections[MIPI_TX_FRAME_GEN_SECTIONS ]; +u32 hsync_width;/*in pixels */ +u32 h_backporch;/*in pixels */ +u32 h_frontporch;/*in pixels */ +u16 vsync_width;/*in lines */ +u16 v_backporch;/*in lines */ +u16 v_frontporch;/*in lines */ +}; + +struct mipi_tx_ctrl_cfg { +struct mipi_tx_frame_cfg *frames[MIPI_TX_FRAME_GEN ]; +struct mipi_tx_dsi_cfg *tx_dsi_cfg; +u8 line_sync_pkt_en; +u8 line_counter_active; +u8 frame_counter_active; +u8 tx_hsclkkidle_cnt; +u8 tx_hsexit_cnt; +u8 tx_crc_en; +u8 tx_hact_wait_stop;
drivers/gpu/drm/kmb/kmb_dsi.h line 342
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+u8 tx_always_use_hact; +u8 tx_wait_trig; +u8 tx_wait_all_sect; +}; + +/*configuration structure for MIPI control */ +struct mipi_ctrl_cfg { +/* controller index : CTRL6 for connecting to LCD */ +u8 index; +u8 type;/* controller type : MIPI_DSI */
Some of the fields looks like they are only assigned but never used?
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +8
-0+u8 dir;/* controller direction : MIPI_TX */ +u8 active_lanes;/* # active lanes per controller 2/4 */ +u32 lane_rate_mbps;/*MBPS */ +u32 ref_clk_khz; +u32 cfg_clk_khz; +u32 data_if;/*MIPI_IF_DMA or MIPI_IF_PARALLEL */ +struct mipi_tx_ctrl_cfg tx_ctrl_cfg; +};
drivers/gpu/drm/kmb/kmb_dsi.h line 360
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+ +/* Structure for storing user specified interrupts that are enabled */ +union mipi_irq_cfg { +u8 value; +struct { +u8 line_compare:1 ; +u8 dma_event:1 ; +u8 frame_done:1 ; +u8 ctrl_error:1 ; +u8 dphy_error:1 ;
Most fields are not used??
drivers/gpu/drm/kmb/kmb_dsi.h line 366
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +6
-0+ } irq_cfg; +}; + +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);
Does not belong in this file
drivers/gpu/drm/kmb/kmb_dsi.h line 367
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.h new file +1
-0+void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);
Does not exist - delete
drivers/gpu/drm/kmb/kmb_dsi.h line 370
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +3
-0+void kmb_dsi_host_unregister (void ); +int kmb_dsi_hw_init (struct drm_device *dev,struct drm_display_mode *mode); +#endif /* __KMB_DSI_H__ */
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Chrisanthus, Anitha
maintainerRE: [PATCH v6] drm/kmb: Add support for KeemBay Display
Hi Sam,
Thanks a lot for the review. I will address your comments in v7. For those that are not addressed, please see my reply inline.
Regards,
Anitha
Quoted 11 lines
-----Original Message-----
From: Sam Ravnborg <[email protected]>
Sent: Thursday, August 20, 2020 1:10 PM
To: Chrisanthus, Anitha <[email protected]>
Cc: [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>; Vetter, Daniel <[email protected]>; [email protected]
Subject: Re: [PATCH v6] drm/kmb: Add support for KeemBay DisplayHi Anitha.
Quoted 7 lines
Feedback on
kmb_dsi.The main feedback can be found after the
kmb_dsi_initfunction. The highligt of the feedback is that, in my opinion, the best would be to use thedrm_bridgeabstraction for thekmb_dsi. Maybe because I am biased - and this is just overhead. But it just looks simpler to me.
Mipi dsi is very time sensitive and any delay can cause problems. As soon as it's initialized it expects LCD controller to be up and running especially the LCD_TIMING_GEN_TRIG, a slight delay and lots of issues. It is tightly coupled in the hardware with LCD and let's keep it that way in the software too.
Quoted 208 lines
There are several chunks of code surrounded by #ifdef. It would be good if they could all be handled so no more #ifdef are required.
There is also a lot of debug prints. Maybe this can be trimmed now that the driver works?
There is a lot of variables that should all be included in a struct
kmb_dsithat should be allocated in the probe function (if this becomes a bridge driver).I hope this does not scare you away! If I am right about the ocnversion to a
drm_bridge, then I hope it is semi trivial to do.
All the hard HW init stuff is done.Sam
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_dsi.cQuoted 189 lines
new file mode 100644
index 0000000..21745aedrivers/gpu/drm/kmb/kmb_dsi.c new file +184
-0@@ -0,0 +1,1828 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (c) 2019-2020 Intel Corporation +*/ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/slab.h> +#include <linux/spinlock.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "kmb_drv.h" +#include "kmb_dsi.h" +#include "kmb_regs.h" + +static int hw_initialized; +/* #define MIPI_TX_TEST_PATTERN_GENERATION */ +/* #define DPHY_GET_FSM */ +/* #define DPHY_READ_TESTCODE */ + +static struct mipi_dsi_host *dsi_host; +static struct mipi_dsi_device *dsi_device; + +/* Default setting is 1080p, 4 lanes */ +#define IMG_HEIGHT_LINES 1080 +#define IMG_WIDTH_PX 1920 +#define MIPI_TX_ACTIVE_LANES 4 + +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 , + .dma_packed =0 +}; + +struct mipi_tx_frame_cfg mipitx_frame0_cfg = { + .sections[0 ] = &mipi_tx_frame0_sect_cfg, + .sections[1 ] =NULL , + .sections[2 ] =NULL , + .sections[3 ] =NULL , + .vsync_width =5 , + .v_backporch =36 , + .v_frontporch =4 , + .hsync_width =44 , + .h_backporch =148 , + .h_frontporch =88 +}; + +struct mipi_tx_dsi_cfg mipitx_dsi_cfg = { + .hfp_blank_en =0 , + .eotp_en =0 , + .lpm_last_vfp_line =0 , + .lpm_first_vsa_line =0 , + .sync_pulse_eventn =DSI_VIDEO_MODE_NO_BURST_EVENT , + .hfp_blanking =SEND_BLANK_PACKET , + .hbp_blanking =SEND_BLANK_PACKET , + .hsa_blanking =SEND_BLANK_PACKET , + .v_blanking =SEND_BLANK_PACKET , +}; + +struct mipi_ctrl_cfg mipi_tx_init_cfg = { + .index =MIPI_CTRL6 , + .type =MIPI_DSI , + .dir =MIPI_TX , + .active_lanes =MIPI_TX_ACTIVE_LANES , + .lane_rate_mbps =MIPI_TX_LANE_DATA_RATE_MBPS , + .ref_clk_khz =MIPI_TX_REF_CLK_KHZ , + .cfg_clk_khz =MIPI_TX_CFG_CLK_KHZ , + .data_if =MIPI_IF_PARALLEL , + .tx_ctrl_cfg = { + .frames[0 ] = &mipitx_frame0_cfg, + .frames[1 ] =NULL , + .frames[2 ] =NULL , + .frames[3 ] =NULL , + .tx_dsi_cfg = &mipitx_dsi_cfg, + .line_sync_pkt_en =0 , + .line_counter_active =0 , + .frame_counter_active =0 , + .tx_always_use_hact =1 , + .tx_hact_wait_stop =1 , + } +}; + +struct mipi_hs_freq_range_cfg { +u16 default_bit_rate_mbps; +u8 hsfreqrange_code; +}; + +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 struct mipi_hs_freq_range_cfg +mipi_hs_freq_range[MIPI_DPHY_DEFAULT_BIT_RATES ] = { + {.default_bit_rate_mbps =80 , .hsfreqrange_code =0x00 }, + {.default_bit_rate_mbps =90 , .hsfreqrange_code =0x10 }, + {.default_bit_rate_mbps =100 , .hsfreqrange_code =0x20 }, + {.default_bit_rate_mbps =110 , .hsfreqrange_code =0x30 }, + {.default_bit_rate_mbps =120 , .hsfreqrange_code =0x01 }, + {.default_bit_rate_mbps =130 , .hsfreqrange_code =0x11 }, + {.default_bit_rate_mbps =140 , .hsfreqrange_code =0x21 }, + {.default_bit_rate_mbps =150 , .hsfreqrange_code =0x31 }, + {.default_bit_rate_mbps =160 , .hsfreqrange_code =0x02 }, + {.default_bit_rate_mbps =170 , .hsfreqrange_code =0x12 }, + {.default_bit_rate_mbps =180 , .hsfreqrange_code =0x22 }, + {.default_bit_rate_mbps =190 , .hsfreqrange_code =0x32 }, + {.default_bit_rate_mbps =205 , .hsfreqrange_code =0x03 }, + {.default_bit_rate_mbps =220 , .hsfreqrange_code =0x13 }, + {.default_bit_rate_mbps =235 , .hsfreqrange_code =0x23 }, + {.default_bit_rate_mbps =250 , .hsfreqrange_code =0x33 }, + {.default_bit_rate_mbps =275 , .hsfreqrange_code =0x04 }, + {.default_bit_rate_mbps =300 , .hsfreqrange_code =0x14 }, + {.default_bit_rate_mbps =325 , .hsfreqrange_code =0x25 }, + {.default_bit_rate_mbps =350 , .hsfreqrange_code =0x35 }, + {.default_bit_rate_mbps =400 , .hsfreqrange_code =0x05 }, + {.default_bit_rate_mbps =450 , .hsfreqrange_code =0x16 }, + {.default_bit_rate_mbps =500 , .hsfreqrange_code =0x26 }, + {.default_bit_rate_mbps =550 , .hsfreqrange_code =0x37 }, + {.default_bit_rate_mbps =600 , .hsfreqrange_code =0x07 }, + {.default_bit_rate_mbps =650 , .hsfreqrange_code =0x18 }, + {.default_bit_rate_mbps =700 , .hsfreqrange_code =0x28 }, + {.default_bit_rate_mbps =750 , .hsfreqrange_code =0x39 }, + {.default_bit_rate_mbps =800 , .hsfreqrange_code =0x09 }, + {.default_bit_rate_mbps =850 , .hsfreqrange_code =0x19 }, + {.default_bit_rate_mbps =900 , .hsfreqrange_code =0x29 }, + {.default_bit_rate_mbps =1000 , .hsfreqrange_code =0x0A }, + {.default_bit_rate_mbps =1050 , .hsfreqrange_code =0x1A }, + {.default_bit_rate_mbps =1100 , .hsfreqrange_code =0x2A }, + {.default_bit_rate_mbps =1150 , .hsfreqrange_code =0x3B }, + {.default_bit_rate_mbps =1200 , .hsfreqrange_code =0x0B }, + {.default_bit_rate_mbps =1250 , .hsfreqrange_code =0x1B }, + {.default_bit_rate_mbps =1300 , .hsfreqrange_code =0x2B }, + {.default_bit_rate_mbps =1350 , .hsfreqrange_code =0x3C }, + {.default_bit_rate_mbps =1400 , .hsfreqrange_code =0x0C }, + {.default_bit_rate_mbps =1450 , .hsfreqrange_code =0x1C }, + {.default_bit_rate_mbps =1500 , .hsfreqrange_code =0x2C }, + {.default_bit_rate_mbps =1550 , .hsfreqrange_code =0x3D }, + {.default_bit_rate_mbps =1600 , .hsfreqrange_code =0x0D }, + {.default_bit_rate_mbps =1650 , .hsfreqrange_code =0x1D }, + {.default_bit_rate_mbps =1700 , .hsfreqrange_code =0x2E }, + {.default_bit_rate_mbps =1750 , .hsfreqrange_code =0x3E }, + {.default_bit_rate_mbps =1800 , .hsfreqrange_code =0x0E }, + {.default_bit_rate_mbps =1850 , .hsfreqrange_code =0x1E }, + {.default_bit_rate_mbps =1900 , .hsfreqrange_code =0x2F }, + {.default_bit_rate_mbps =1950 , .hsfreqrange_code =0x3F }, + {.default_bit_rate_mbps =2000 , .hsfreqrange_code =0x0F }, + {.default_bit_rate_mbps =2050 , .hsfreqrange_code =0x40 }, + {.default_bit_rate_mbps =2100 , .hsfreqrange_code =0x41 }, + {.default_bit_rate_mbps =2150 , .hsfreqrange_code =0x42 }, + {.default_bit_rate_mbps =2200 , .hsfreqrange_code =0x43 }, + {.default_bit_rate_mbps =2250 , .hsfreqrange_code =0x44 }, + {.default_bit_rate_mbps =2300 , .hsfreqrange_code =0x45 }, + {.default_bit_rate_mbps =2350 , .hsfreqrange_code =0x46 }, + {.default_bit_rate_mbps =2400 , .hsfreqrange_code =0x47 }, + {.default_bit_rate_mbps =2450 , .hsfreqrange_code =0x48 }, + {.default_bit_rate_mbps =2500 , .hsfreqrange_code =0x49 } +}; + +union mipi_irq_cfg int_cfg = {
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c line 191
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ .irq_cfg.frame_done = 1, + .irq_cfg.ctrl_error = 1, +}; + +static enum drm_mode_status +kmb_dsi_mode_valid (struct drm_connector *connector, +struct drm_display_mode *mode)There is a third argument in latest drm code.
drm_connector_mode_valid() calls connector->mode_valid() with 2 arguments.
Quoted 1,723 lines
Quoted 29 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +21
-0+{ +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 ; +} + +static int kmb_dsi_get_modes (struct drm_connector *connector) +{ +int num_modes =0 ; + + num_modes = drm_add_modes_noedid(connector, + connector->dev-mode_config.max_width,
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ connector->dev->mode_config.max_height); + +DRM_INFO ("width=%d height=%d\n" , + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); +DRM_INFO ("num modes=%d\n" , num_modes); +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+return num_modes; +} + +void kmb_dsi_host_unregister (void ) +{ +mipi_dsi_host_unregister (dsi_host); +kfree (dsi_host); +} + +static void kmb_dsi_connector_destroy(struct drm_connector*connector)
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+{ + struct kmb_connector *kmb_connector =
to_kmb_connector(connector);Quoted 29 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +17
-0+ +drm_connector_cleanup (connector); +kfree (kmb_connector); +} + +static void kmb_dsi_encoder_destroy (struct drm_encoder *encoder) +{ +struct kmb_dsi *kmb_dsi =to_kmb_dsi (encoder); + +if (!kmb_dsi) +return ; + +kfree (kmb_dsi->dsi_host); + +drm_encoder_cleanup (encoder); + + kmb_dsi_connector_destroy(&kmb_dsi->attached_connector-base);
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ +kfree (kmb_dsi); +if (!dsi_device) +kfree (dsi_device); +} + +static const struct drm_encoder_funcs kmb_dsi_funcs = { + .destroy = kmb_dsi_encoder_destroy, +}; + +static const structdrivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+drm_connector_helper_funcs kmb_dsi_connector_helper_funcs = { + .get_modes = kmb_dsi_get_modes, + .mode_valid = kmb_dsi_mode_valid, +}; + +static const struct drm_connector_funcs kmb_dsi_connector_funcs = { + .destroy = kmb_dsi_connector_destroy, + .fill_modes = drm_helper_probe_single_connector_modes, + .reset = drm_atomic_helper_connector_reset, + .atomic_destroy_state =
drm_atomic_helper_connector_destroy_state,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ .atomic_duplicate_state =
drm_atomic_helper_connector_duplicate_state,Quoted 17 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +17
-0+}; + +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) +{drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+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 drm_device*drm,
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ struct kmb_dsi *kmb_dsi) +{ +struct kmb_dsi_host *host; + + host =kzalloc (sizeof (*host),GFP_KERNEL ); +if (!host) +return NULL ; + + host->base = dsi_host; + host->base->ops = &kmb_dsi_host_ops; + host->kmb_dsi = kmb_dsi;drivers/gpu/drm/kmb/kmb_dsi.c line 318
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ + host->base->dev = drm->dev; + + dsi_device->host = host->base; + host->device = dsi_device; +return host; +} + +struct drm_bridge *kmb_dsi_host_bridge_init (struct device *dev) +{If this becomes a bridge driver, then part of this belongs in the probe function.
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +13
-0+struct drm_bridge *bridge =NULL ; +struct device_node *encoder_node; + +/* Create and register MIPI DSI host */ +if (!dsi_host) { + dsi_host =kzalloc (sizeof (*dsi_host),GFP_KERNEL ); +if (!dsi_host) +return ERR_PTR (-ENOMEM ); + + dsi_host->ops = &kmb_dsi_host_ops; + +if (!dsi_device) { + dsi_device = kzalloc(sizeof(*dsi_device),
GFP_KERNEL);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+if (!dsi_device) { +kfree (dsi_host); +return ERR_PTR (-ENOMEM ); + } + } + + dsi_host->dev = dev; +mipi_dsi_host_register (dsi_host); + } +/* Find ADV7535 node and initialize it */ + encoder_node = of_parse_phandle(dev->of_node, "encoder-slave",0);
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+ +if (!encoder_node) { +DRM_ERROR ("Failed to get bridge info from DT\n" ); +return ERR_PTR (-EINVAL ); + } + +/* Locate drm bridge from the hdmi encoder DT node */ + bridge =of_drm_find_bridge (encoder_node);drivers/gpu/drm/kmb/kmb_dsi.c line 360
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+of_node_put (encoder_node); +if (!bridge) { +DRM_INFO ("Wait for external bridge driver DT\n" ); +return ERR_PTR (-EPROBE_DEFER ); + } +return bridge; +} + +u32 mipi_get_datatype_params (u32 data_type,u32 data_mode, +struct mipi_data_type_params *params)static
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+{ +struct mipi_data_type_params data_type_param; + +switch (data_type) { +case DSI_LP_DT_PPS_YCBCR420_12B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =3 ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_YCBCR422_16B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =4 ; +switch (data_mode) { +/* Case 0 and 1 not supported according +* to MDK +*/ drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+case 2 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_LPPS_YCBCR422_20B : +case DSI_LP_DT_PPS_YCBCR422_24B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =6 ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB565_16B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =2 ; +switch (data_mode) { +case 0 : +case 1 :drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 22 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +22
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB666_18B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =9 ; + data_type_param.bits_per_pclk =18 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_LPPS_RGB666_18B : +case DSI_LP_DT_PPS_RGB888_24B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =3 ; + data_type_param.bits_per_pclk =24 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_PPS_RGB101010_30B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =15 ; + data_type_param.bits_per_pclk =30 ; + data_type_param.pixels_per_pclk =1 ; +break ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+default : +DRM_ERROR ("DSI: Invalid data_type %d\n" , data_type); +return -EINVAL ; + }; + + *params = data_type_param; +return 0 ; +} + +static u32 compute_wc(u32 width_px, u8 size_constr_p, u8
size_constr_b)Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+{ +/* Calculate the word count for each long packet */ +return (((width_px / size_constr_p) * size_constr_b) &0xffff ); +} + +static u32 compute_unpacked_bytes (u32 wc,u8 bits_per_pclk) +{drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* Number of PCLK cycles needed to transfer a line +* with each PCLK cycle, 4 Bytes are sent through the PPL module +*/ +return ((wc *8 ) / bits_per_pclk) *4 ; +} + +static u32 mipi_tx_fg_section_cfg_regs (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, +u32 height_lines,u32 unpacked_bytes, + struct mipi_tx_frame_sect_phcfg
*ph_cfg)Quoted 18 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +18
-0+{ +u32 cfg =0 ; +u32 ctrl_no =MIPI_CTRL6 ; +u32 reg_adr; + +/* Frame section packet header */ +/* Word count bits [15:0] */ + cfg = (ph_cfg->wc &MIPI_TX_SECT_WC_MASK ) <<0 ; + +/* Data type (bits [21:16]) */ + cfg |= ((ph_cfg->data_type &MIPI_TX_SECT_DT_MASK ) + <<MIPI_TX_SECT_DT_SHIFT ); + +/* Virtual channel (bits [23:22]) */ + cfg |= ((ph_cfg->vchannel &MIPI_TX_SECT_VC_MASK ) + <<MIPI_TX_SECT_VC_SHIFT ); + +/* Data mode (bits [24:25]) */ drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ cfg |= ((ph_cfg->data_mode &MIPI_TX_SECT_DM_MASK ) + <<MIPI_TX_SECT_DM_SHIFT ); +if (ph_cfg->dma_packed) + cfg |=MIPI_TX_SECT_DMA_PACKED ; + +drm_dbg (&kmb->drm, +"ctrl=%d frame_id=%d section=%d cfg=%x packed=%d\n" , + ctrl_no, frame_id, section, cfg, ph_cfg->dma_packed); + kmb_write_mipi(kmb, + (MIPI_TXm_HS_FGn_SECTo_PH(ctrl_no, frame_id,section)),
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ cfg); + +/* Unpacked bytes */ + +/* There are 4 frame generators and each fg has 4 sections +* There are 2 registers for unpacked bytes (# bytes each +* section occupies in memory) drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+* REG_UNPACKED_BYTES0: [15:0]-BYTES0, [31:16]-BYTES1 +* REG_UNPACKED_BYTES1: [15:0]-BYTES2, [31:16]-BYTES3 +*/ + reg_adr = +MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0 (ctrl_no, + frame_id) + (section /2 ) *4 ; +kmb_write_bits_mipi (kmb, reg_adr, (section %2 ) *16 ,16 , + unpacked_bytes); + drm_dbg(&kmb->drm, + "unpacked_bytes = %d, wordcount = %d\n",
unpacked_bytes,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ ph_cfg->wc); + +/* Line config */ + reg_adr = MIPI_TXm_HS_FGn_SECTo_LINE_CFG(ctrl_no, frame_id,section);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+kmb_write_mipi (kmb, reg_adr, height_lines); +return 0 ; +} + +static u32 mipi_tx_fg_section_cfg (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, + struct mipi_tx_frame_section_cfg
*frame_scfg,Quoted 15 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +15
-0+ u32 *bits_per_pclk, u32 *wc) +{ +u32 ret =0 ; +u32 unpacked_bytes; +struct mipi_data_type_params data_type_parameters; +struct mipi_tx_frame_sect_phcfg ph_cfg; + + ret =mipi_get_datatype_params (frame_scfg->data_type, + frame_scfg->data_mode, + &data_type_parameters); +if (ret) +return ret; + +/* Packet width has to be a multiple of the minimum packet width +* (in pixels) set for each data type drivers/gpu/drm/kmb/kmb_dsi.c line 569
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+*/ +if (frame_scfg->width_pixels % + data_type_parameters.size_constraint_pixels !=0 ) +return -EINVAL ; + + *wc =compute_wc (frame_scfg->width_pixels, + data_type_parameters.size_constraint_pixels, + data_type_parameters.size_constraint_bytes); + unpacked_bytes = compute_unpacked_bytes(*wc, +data_type_parameters.bits_per_pclk);Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ 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(kmb, frame_id, section,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ frame_scfg->height_lines, + unpacked_bytes, &ph_cfg); + +/* Caller needs bits_per_clk for additional caluclations */ + *bits_per_pclk = data_type_parameters.bits_per_pclk; + +return 0 ; +} + +static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *kmb, u8
frame_gen,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +13
-0+ struct mipi_tx_frame_timing_cfg *fg_cfg) +{ +u32 sysclk; +u32 ppl_llp_ratio; +u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; + +/* 500 Mhz system clock minus 50 to account for the difference in +* MIPI clock speed in RTL tests +*/ + sysclk = kmb->sys_clk_mhz -50 ; + +/* PPL-Pixel Packing Layer, LLP-Low Level Protocol +* Frame genartor timing parameters are clocked on the system clock,
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+* whereas as the equivalent parameters in the LLP blocks are clocked
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+* on LLP Tx clock from the D-PHY - BYTE clock +*/ + +/* Multiply by 1000 to maintain precision */ + ppl_llp_ratio = ((fg_cfg->bpp /8 ) * sysclk *1000 ) / + ((fg_cfg->lane_rate_mbps /8 ) * fg_cfg->active_lanes); + +drm_dbg (&kmb->drm,"ppl_llp_ratio=%d\n" , ppl_llp_ratio); + drm_dbg(&kmb->drm, "bpp=%d sysclk=%d lane-rate=%d active-lanes=%d\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ fg_cfg->bpp, sysclk, fg_cfg->lane_rate_mbps, + fg_cfg->active_lanes); + +/* Frame generator number of lines */ + reg_adr =MIPI_TXm_HS_FGn_NUM_LINES (ctrl_no, frame_gen); +kmb_write_mipi (kmb, 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
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+* REG_VSYNC_WIDTH1: [15:0]-VSA for channel2, [31:16]-VSA for channel3
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+*/ + offset = (frame_gen %2 ) *16 ; + reg_adr =MIPI_TXm_HS_VSYNC_WIDTHn (ctrl_no, frame_gen /2 ); + kmb_write_bits_mipi(kmb, reg_adr, offset, 16, fg_cfg-
vsync_width);drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* vertical backporch (vbp) */ + reg_adr = MIPI_TXm_HS_V_BACKPORCHESn(ctrl_no, frame_gen /2);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_write_bits_mipi(kmb, reg_adr, offset, 16, fg_cfg-
v_backporch);drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* vertical frontporch (vfp) */ + reg_adr = MIPI_TXm_HS_V_FRONTPORCHESn(ctrl_no, frame_gen /2);
Quoted 24 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_write_bits_mipi(kmb, reg_adr, offset, 16, fg_cfg-
v_frontporch);drivers/gpu/drm/kmb/kmb_dsi.c new file +22
-0+ +/* vertical active (vactive) */ + reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_active); + +/* hsync width */ + reg_adr =MIPI_TXm_HS_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->hsync_width * ppl_llp_ratio) /1000 ); + +/* horizontal backporch (hbp) */ + reg_adr =MIPI_TXm_HS_H_BACKPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_backporch * ppl_llp_ratio) /1000 ); + +/* horizontal frontporch (hfp) */ + reg_adr =MIPI_TXm_HS_H_FRONTPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_frontporch * ppl_llp_ratio) /1000 ); + +/* horizontal active (ha) */ + reg_adr =MIPI_TXm_HS_H_ACTIVEn (ctrl_no, frame_gen);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +/* 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_mipi (kmb, reg_adr, val); + +/* llp hsync width */ + reg_adr =MIPI_TXm_HS_LLP_HSYNC_WIDTHn (ctrl_no, frame_gen); + kmb_write_mipi(kmb, reg_adr, fg_cfg->hsync_width * (fg_cfg->bpp/ 8));
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ +/* llp h backporch */ + reg_adr =MIPI_TXm_HS_LLP_H_BACKPORCHn (ctrl_no, frame_gen); + kmb_write_mipi(kmb, reg_adr, fg_cfg->h_backporch * (fg_cfg->bpp/ 8));
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* llp h frontporch */ + reg_adr = MIPI_TXm_HS_LLP_H_FRONTPORCHn(ctrl_no,
frame_gen);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+kmb_write_mipi (kmb, reg_adr, + fg_cfg->h_frontporch * (fg_cfg->bpp /8 )); +} + +static void mipi_tx_fg_cfg(struct kmb_drm_private *kmb, u8
frame_gen,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ u8 active_lanes, u32 bpp, u32 wc, + u32 lane_rate_mbps, struct mipi_tx_frame_cfg
*fg_cfg)Quoted 19 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +19
-0+{ +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]) + 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;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ 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 (kmb, frame_gen, &fg_t_cfg); +} + +static void mipi_tx_multichannel_fifo_cfg(struct kmb_drm_private*kmb,
Quoted 15 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +15
-0+ u8 active_lanes, u8 vchannel_id) +{ +u32 fifo_size, fifo_rthreshold; +u32 ctrl_no =MIPI_CTRL6 ; + +/* Clear all mc fifo channel sizes and thresholds */ +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CTRL_EN ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC1 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD1 ,0 ); + + fifo_size = ((active_lanes >MIPI_D_LANES_PER_DPHY ) ? +MIPI_CTRL_4LANE_MAX_MC_FIFO_LOC : +MIPI_CTRL_2LANE_MAX_MC_FIFO_LOC ) -1 ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +/* MC fifo size for virtual channels 0-3 +* REG_MC_FIFO_CHAN_ALLOC0: [8:0]-channel0, [24:16]-channel1 +* REG_MC_FIFO_CHAN_ALLOC1: [8:0]-2, [24:16]-channel3 +*/ +SET_MC_FIFO_CHAN_ALLOC (kmb, ctrl_no, vchannel_id, fifo_size); + +/* Set threshold to half the fifo size, actual size=size*16 */ + fifo_rthreshold = ((fifo_size) *8 ) &BIT_MASK_16 ; + SET_MC_FIFO_RTHRESHOLD(kmb, ctrl_no, vchannel_id,
fifo_rthreshold);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ +/* Enable the MC FIFO channel corresponding to the Virtual Channel */
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_set_bit_mipi(kmb,
MIPI_TXm_HS_MC_FIFO_CTRL_EN(ctrl_no),Quoted 31 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +31
-0+ vchannel_id); +} + +static void mipi_tx_ctrl_cfg (struct kmb_drm_private *kmb,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 ; +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* 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); + + drm_dbg(&kmb->drm, "sync_cfg=%d fg_en=%d\n", sync_cfg,
fg_en);Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ +/* MIPI_TX_HS_CTRL */ + +/* type:DSI, source:LCD */ + ctrl =HS_CTRL_EN |TX_SOURCE ; + ctrl |=LCD_VC (fg_id);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ ctrl |=ACTIVE_LANES (ctrl_cfg->active_lanes -1 ); +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 ; + +/*67 ns stop time */ + ctrl |=HSEXIT_CNT (0x43 ); + + kmb_write_mipi(kmb, MIPI_TXm_HS_SYNC_CFG(ctrl_no),
sync_cfg);Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+kmb_write_mipi (kmb,MIPI_TXm_HS_CTRL (ctrl_no), ctrl); +} + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +static void mipi_tx_hs_tp_gen(struct kmb_drm_private *kmb, int vc,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ int tp_sel, u32 stripe_width, u32 color0, + u32 color1, u32 ctrl_no) +{ + int val = 0; + +/* Select test pattern mode on the virtual channel */ + val =TP_SEL_VCm (vc, tp_sel); + +/* Configure test pattern colors */ + kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_COLOR0(ctrl_no),color0);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_COLOR1(ctrl_no),color1);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ +/* Enable test pattern generation on the virtual channel */ + val |=TP_EN_VCm (vc); + kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_CTRL(ctrl_no),val);
Quoted 23 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +23
-0+} +#endif + +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *ctrl_cfg) +{ +u32 ret =0 ; +u8 active_vchannels =0 ; +u8 frame_id, sect; +u32 bits_per_pclk =0 ; +u32 word_count =0 ; +struct mipi_tx_frame_cfg *frame; + +/* This is the order to initialize MIPI TX: +* 1. set frame section parameters +* 2. set frame specific parameters +* 3. connect lcd to mipi +* 4. multi channel fifo cfg +* 5. set mipitxcctrlcfg +*/ + +for (frame_id =0 ; frame_id <4 ; frame_id++) { + frame = ctrl_cfg->tx_ctrl_cfg.frames[frame_id];drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +/* Find valid frame, assume only one valid frame */ +if (!frame) +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++) {
Quoted 18 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +18
-0+if (!frame->sections[sect]) +continue ; + + ret =mipi_tx_fg_section_cfg (kmb, frame_id, sect, + frame->sections[sect], + &bits_per_pclk, + &word_count); +if (ret) +return ret; + } + +/* Set frame specific parameters */ +mipi_tx_fg_cfg (kmb, frame_id, ctrl_cfg->active_lanes, + bits_per_pclk, word_count, + ctrl_cfg->lane_rate_mbps, frame); + + active_vchannels++; +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* Stop iterating as only one virtual channel +* shall be used for LCD connection +*/ +break ; + } + +if (active_vchannels ==0 ) +return -EINVAL ; +/* Multi-Channel FIFO Configuration */ + mipi_tx_multichannel_fifo_cfg(kmb, ctrl_cfg->active_lanes,
frame_id);Quoted 114 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +114
-0+ +/* Frame Generator Enable */ +mipi_tx_ctrl_cfg (kmb, frame_id, ctrl_cfg); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x8 ,0xff ,0xff00 ,MIPI_CTRL6 ); +#endif + +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +return ret; +} + +#ifdef DPHY_READ_TESTCODE +int dphy_read_testcode (struct kmb_drm_private *kmb,int dphy_sel, +int test_code) +{ +u32 reg_wr_data; +u32 reg_rd_data; +int data; + + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data =0 ; + reg_wr_data =0 ; + reg_rd_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code >>8 &0xf ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code &0xff ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + +if ((dphy_sel >>0 &0xf ) >0 ) + reg_rd_data = kmb_read_mipi(kmb,
DPHY_TEST_DOUBT0_3);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+if ((dphy_sel >>4 &0xf ) >0 ) + reg_rd_data = kmb_read_mipi(kmb,
DPHY_TEST_DOUBT4_7);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+if ((dphy_sel >>8 &0x3 ) >0 ) + reg_rd_data = kmb_read_mipi(kmb,
DPHY_TEST_DOUBT8_9);Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+ +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + data = reg_rd_data >>0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + data = reg_rd_data >>8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 ))drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ data = reg_rd_data >>16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + data = reg_rd_data >>24 ; + +return data; +} +#endif + +static void test_mode_send(struct kmb_drm_private *kmb, u32
dphy_no,Quoted 45 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +45
-0+ u32 test_code, u32 test_data) +{ +if (test_code !=TEST_CODE_FSM_CONTROL ) +drm_dbg (&kmb->drm, +"test_code = %02x, test_data = %08x\n" , test_code, + test_data); +/* Steps to send test code: +* - set testclk HIGH +* - set testdin with test code +* - set testen HIGH +* - set testclk LOW +* - set testen LOW +*/ + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testdin */ +SET_TEST_DIN0_3 (kmb, dphy_no, test_code); + +/* Set testen high */ +SET_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +if (test_code) { +/* Steps to send test data: +* - set testen LOW +* - set testclk LOW +* - set testdin with data +* - set testclk HIGH +*/ + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set data in testdin */ + kmb_write_mipi(kmb,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+DPHY_TEST_DIN0_3 + ((dphy_no /0x4 ) *0x4 ), + test_data << ((dphy_no % 4) * 8)); + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + } +} + +static inline void + set_test_mode_src_osc_freq_target_low_bits(struct
kmb_drm_private*kmb,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ u32 dphy_no, + u32 freq) +{ + /* Typical rise/fall time=166, refer Table 1207 databook, + * sr_osc_freq_target[7:0] + */ + test_mode_send(kmb, dphy_no,
TEST_CODE_SLEW_RATE_DDL_CYCLES,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ (freq & 0x7f)); +} + +static inline void + set_test_mode_src_osc_freq_target_hi_bits(struct
kmb_drm_private*kmb,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +12
-0+ u32 dphy_no, + u32 freq) +{ +u32 data; + +/* Flag this as high nibble */ + data = ((freq >>6 ) &0x1f ) | (1 <<7 ); + +/* Typical rise/fall time=166, refer Table 1207 databook, +* sr_osc_freq_target[11:7] +*/ + test_mode_send(kmb, dphy_no,
TEST_CODE_SLEW_RATE_DDL_CYCLES, data);Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+} + +static void mipi_tx_get_vco_params (struct vco_params *vco) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (vco_table); i++) {drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+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(struct kmb_drm_private *kmb, u32
dphy_no,Quoted 59 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +59
-0+ u32 ref_clk_mhz, u32 target_freq_mhz) +{ +u32 best_n =0 , best_m =0 ; +u32 n =0 , m =0 , div =0 , delta, freq =0 , t_freq; +u32 best_freq_delta =3000 ; + +/* 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 , + }; + + 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;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ 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(kmb, dphy_no, TEST_CODE_PLL_VCO_CTRL,(vco_p.range
drivers/gpu/drm/kmb/kmb_dsi.c line 1210
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +13
-0+ | (1 << 6))); + +/* Program m, n pll parameters */ +drm_dbg (&kmb->drm,"m = %d n = %d\n" , best_m, best_n); + +/* PLL_Input_Divider_Ratio[3:0] = pll_n_ovr */ +test_mode_send (kmb, 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(kmb, dphy_no,
TEST_CODE_PLL_FEEDBACK_DIVIDER,drivers/gpu/drm/kmb/kmb_dsi.c line 1210
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ (best_m & 0x1f)); + +/* m - high nibble PLL_Loop_Divider_Ratio[4:0] +* pll_m_ovr[9:5] +*/ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_FEEDBACK_DIVIDER,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ ((best_m >> 5) & 0x1f) |
PLL_FEEDBACK_DIVIDER_HIGH);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ +/* Enable overwrite of n,m parameters :pll_n_ovr_en,
pll_m_ovr_en*/drivers/gpu/drm/kmb/kmb_dsi.c line 1210
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_OUTPUT_CLK_SEL,drivers/gpu/drm/kmb/kmb_dsi.c line 1213
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+ (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(kmb, dphy_no, +
TEST_CODE_PLL_PROPORTIONAL_CHARGE_PUMP_CTRL,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ ((t_freq > 1150) ? 0x0C : 0x0B)); + +/* pll_int_cntrl-fixed value for int_cntrl from DPHY doc */ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ 0x00); + +/* pll_gmp_cntrl-fixed value for gmp_cntrl from DPHY doci */ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_GMP_CTRL,
0x10);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* pll_cpbias_cntrl-fixed value for cpbias_cntrl from DPHY doc */ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_CHARGE_PUMP_BIAS,0x10);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +/* pll_th1 -Lock Detector Phase error threshold, +* document gives fixed value +*/ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_PHASE_ERR_CTRL,0x02);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +/* PLL Lock Configuration */ + +/* pll_th2 - Lock Filter length, document gives fixed value */ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_LOCK_FILTER,
0x60);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* pll_th3- PLL Unlocking filter, document gives fixed value */ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_UNLOCK_FILTER,
0x03);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +/* pll_lock_sel-PLL Lock Detector Selection, +* document gives fixed value +*/ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_LOCK_DETECTOR,
0x02);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+} + +#ifdef DPHY_GET_FSM +static void dphy_get_fsm (struct kmb_drm_private *kmb,u32 dphy_no) +{ + test_mode_send(kmb, dphy_no, TEST_CODE_FSM_CONTROL,
0x80);drivers/gpu/drm/kmb/kmb_dsi.c line 1256
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +drm_dbg (&kmb->drm,"dphy %d fsm_state = 0%x\n" , dphy_no, + kmb_read_mipi(kmb, DPHY_TEST_DOUBT4_7)); +} +#endif + +static void dphy_init_sequence (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg,u32 dphy_no, +int active_lanes,enum dphy_mode mode) +{This function is too long.
Try to:
- drop irrelevant debug prints
- make a few helpers - maybe the long if () else if () else could cll functions.Quoted 43 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +43
-0+u32 test_code =0 , test_data =0 , val; +int i =0 ; + +drm_info (&kmb->drm, +"dphy=%d mode=%d active_lanes=%d\n" , dphy_no, mode, + active_lanes); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Set D-PHY in shutdown mode */ +/* Assert RSTZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); + +/* Assert SHUTDOWNZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); + val =kmb_read_mipi (kmb,DPHY_INIT_CTRL0 ); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , val); + +/* Init D-PHY_n +* Pulse testclear signal to make sure the d-phy configuration +* starts from a clean base +*/ +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +SET_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); + +drm_dbg (&kmb->drm,"DPHY_TEST_CTRL0=0x%x\n" , +kmb_read_mipi (kmb,DPHY_TEST_CTRL0 )); + +/* Set mastermacro bit - Master or slave mode */ + test_code =TEST_CODE_MULTIPLE_PHY_CTRL ; + +/* DPHY has its own clock lane enabled (master) */ +if (mode ==MIPI_DPHY_MASTER ) + test_data =0x01 ; +else + test_data =0x00 ; + +/* Send the test code and data */ drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set the lane data rate */ +for (i =0 ; i <MIPI_DPHY_DEFAULT_BIT_RATES ; i++) { +if (mipi_hs_freq_range[i].default_bit_rate_mbps < + cfg->lane_rate_mbps) +continue ; + +/* Send the test code and data */ +/* bit[6:0] = hsfreqrange_ovr bit[7] = hsfreqrange_ovr_en */
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ test_code =TEST_CODE_HS_FREQ_RANGE_CFG ; + test_data = (mipi_hs_freq_range[i].hsfreqrange_code &
0x7f) |Quoted 100 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +100
-0+ (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); +break ; + } + +/* High-Speed Tx Slew Rate Calibration +* BitRate: > 1.5 Gbps && <= 2.5 Gbps: slew rate control OFF +*/ +if (cfg->lane_rate_mbps >1500 ) { +/* Bypass slew rate calibration algorithm +* bits[1:0} srcal_en_ovr_en, srcal_en_ovr +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data =0x02 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Disable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x00 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + }else if (cfg->lane_rate_mbps >1000 ) { +/* BitRate: > 1 Gbps && <= 1.5 Gbps: - slew rate control ON +* typical rise/fall times: 166 ps +*/ + +/* Do not bypass slew rate calibration algorithm +* bits[1:0}=srcal_en_ovr_en, srcal_en_ovr, bit[6]=sr_range +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[6:0] low nibble +* typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x72f &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble +* Typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x72f >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + }else { +/* lane_rate_mbps <= 1000 Mbps +* BitRate: <= 1 Gbps: +* - slew rate control ON +* - typical rise/fall times: 225 ps +*/ + +/* Do not bypass slew rate calibration algorithm */ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Typical rise/fall time=255, refer Table 1207 databook */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x523 &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x523 >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + } + +/* Set cfgclkfreqrange */ + val = (((cfg->cfg_clk_khz /1000 ) -17 ) *4 ) &0x3f ; +SET_DPHY_FREQ_CTRL0_3 (kmb, dphy_no, val); + +drm_dbg (&kmb->drm,"DPHY_FREQ = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_FREQ_CTRL0_3 +4 )); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Enable config clk for the corresponding d-phy */ +kmb_set_bit_mipi (kmb,DPHY_CFG_CLK_EN , dphy_no); + +drm_dbg (&kmb->drm,"DPHY_CFG_CLK_EN = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_CFG_CLK_EN )); + +/* PLL setup */ +if (mode ==MIPI_DPHY_MASTER ) { +/* Set PLL regulator in bypass */ + test_code =TEST_CODE_PLL_ANALOG_PROG ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* PLL Parameters Setup */ +mipi_tx_pll_setup (kmb, dphy_no, cfg->ref_clk_khz /1000 , + cfg->lane_rate_mbps /2 ); + +/* Set clksel */ +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL1 , +PLL_CLKSEL_0 ,2 ,0x01 ); + +/* Set pll_shadow_control */ + kmb_set_bit_mipi(kmb, DPHY_INIT_CTRL1,
PLL_SHADOW_CTRL);Quoted 57 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +57
-0+ +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL1 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL1 )); + } + +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +//#define MIPI_TX_FORCE_VOD +#ifdef MIPI_TX_FORCE_VOD +#define MIPI_TX_VOD_LVL 450 +#define TEST_CODE_BANDGAP 0x24 +/* Set bandgap/VOD level */ +switch (MIPI_TX_VOD_LVL ) { +case 200 : + test_data =0x00 ; +break ; +case 300 : + test_data =0x20 ; +break ; +case 350 : + test_data =0x40 ; +break ; +case 450 : + test_data =0x60 ; +break ; +case 400 : +default : + test_data =0x70 ; +break ; + } +test_mode_send (kmb, dphy_no,TEST_CODE_BANDGAP , test_data); +#endif + +/* Send NORMAL OPERATION test code */ + test_code =0x0 ; + test_data =0x0 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Configure BASEDIR for data lanes +* NOTE: basedir only applies to LANE_0 of each D-PHY. +* The other lanes keep their direction based on the D-PHY type, +* either Rx or Tx. +* bits[5:0] - BaseDir: 1 = Rx +* bits[9:6] - BaseDir: 0 = Tx +*/ +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL2 ,0 ,9 ,0x03f ); +ndelay (15 ); + +/* Enable CLOCK LANE +* Clock lane should be enabled regardless of the direction +* set for the D-PHY (Rx/Tx) +*/ +kmb_set_bit_mipi (kmb,DPHY_INIT_CTRL2 ,12 + dphy_no);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL2 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL2 )); + +/* Enable DATA LANES */ +kmb_write_bits_mipi (kmb,DPHY_ENABLE , dphy_no *2 ,2 , + ((1 << active_lanes) -1 )); + + drm_dbg(&kmb->drm, + "DPHY_ENABLE = 0x%x\n", kmb_read_mipi(kmb,
DPHY_ENABLE));Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ndelay (15 ); + +/* Take D-PHY out of shutdown mode */ +/* Deassert SHUTDOWNZ signal */ +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 ));drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+SET_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); +ndelay (15 ); + +/* Deassert RSTZ signal */ +SET_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL0 )); +} + +static void dphy_wait_fsm(struct kmb_drm_private *kmb, u32
dphy_no,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+ enum dphy_tx_fsm fsm_state) +{ + enum dphy_tx_fsm val = DPHY_TX_POWERDWN; + int i = 0; + int status = 1; + + do { + test_mode_send(kmb, dphy_no,
TEST_CODE_FSM_CONTROL,0x80);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ + val =GET_TEST_DOUT4_7 (kmb, dphy_no); + i++; +if (i >TIMEOUT ) { + status =0 ; +break ; + } + }while (val != fsm_state); + + drm_dbg(&kmb->drm, "%s: dphy %d val = %x\n", __func__,
dphy_no, val);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ drm_info(&kmb->drm, "********** DPHY %d WAIT_FSM %s**********\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ dphy_no, status ? "SUCCESS" : "FAILED"); +} + +static void wait_init_done(struct kmb_drm_private *kmb, u32
dphy_no,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+ u32 active_lanes) +{ +u32 stopstatedata =0 ; +u32 data_lanes = (1 << active_lanes) -1 ; +int i =0 , val; +int status =1 ; + + drm_dbg(&kmb->drm, "dphy=%d active_lanes=%ddata_lanes=%d\n",
dphy_no,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ active_lanes, data_lanes); + + do { + val = kmb_read_mipi(kmb, MIPI_DPHY_STAT4_7); + stopstatedata = GET_STOPSTATE_DATA(kmb, dphy_no) &
data_lanes;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+ +/* TODO-need to add a time out and return failure */ + i++; + +if (i >TIMEOUT ) { + status =0 ; + + drm_info(&kmb->drm, + "! WAIT_INIT_DONE: TIMINGOUT!(err_stat=%d)",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_read_mipi(kmb,
MIPI_DPHY_ERR_STAT6_7));Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+drm_dbg (&kmb->drm, +"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , val); +drm_dbg (&kmb->drm, +"stopdata = 0x%x data_lanes=0x%x\n" , + stopstatedata, data_lanes); + +break ; + } +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+if (i <3 ) { +drm_dbg (&kmb->drm, +"stopdata = 0x%x data_lanes=0x%x\n" , + stopstatedata, data_lanes); +drm_dbg (&kmb->drm, +"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , val); + } + }while (stopstatedata != data_lanes); + + drm_info(&kmb->drm, "********** DPHY %d INIT - %s**********\n",
Quoted 19 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +19
-0+ dphy_no, status ? "SUCCESS" : "FAILED"); +} + +static void wait_pll_lock (struct kmb_drm_private *kmb,u32 dphy_no) +{ +int i =0 ; +int status =1 ; + + do { + /* TODO-need to add a time out and return failure */ + i++; + if (i > TIMEOUT) { + status = 0; + + drm_info(&kmb->drm, "%s: timing out", __func__); + drm_dbg(&kmb->drm, + "%s : PLL_LOCK = 0x%x ", __func__, + kmb_read_mipi(kmb, DPHY_PLL_LOCK)); +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+break ; + } + +if ((i %100 ) ==0 ) +drm_dbg (&kmb->drm, +"%s : PLL_LOCK = 0x%x\n" , __func__, +kmb_read_mipi (kmb,DPHY_PLL_LOCK )); + }while (!GET_PLL_LOCK (kmb, dphy_no)); + + drm_info(&kmb->drm, "***** PLL Locked for DPHY %d - %s*****\n",
Quoted 27 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +27
-0+ dphy_no, status ? "SUCCESS" : "FAILED"); +} + +static u32 mipi_tx_init_dphy (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg) +{ +u32 dphy_no =MIPI_DPHY6 ; + +drm_info (&kmb->drm, +"active_lanes=%d lane_rate=%d\n" , cfg->active_lanes, +MIPI_TX_LANE_DATA_RATE_MBPS ); + +/* Multiple D-PHYs needed */ +if (cfg->active_lanes >MIPI_DPHY_D_LANES ) { +/* +*Initialization for Tx aggregation mode is done according to +*a. start init PHY1 +*b. poll for PHY1 FSM state LOCK +* b1. reg addr 0x03[3:0] - state_main[3:0] == 5 (LOCK) +*c. poll for PHY1 calibrations done : +* c1. termination calibration lower section: addr 0x22[5] +* - rescal_done +* c2. slewrate calibration (if data rate < = 1500 Mbps): +* addr 0xA7[3:2] - srcal_done, sr_finished +*d. start init PHY0 +*e. poll for PHY0 stopstate +*f. poll for PHY1 stopstate drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+*/ +/* PHY #N+1 ('slave') */ + +dphy_init_sequence (kmb, cfg, dphy_no +1 , + (cfg->active_lanes -MIPI_DPHY_D_LANES ), +MIPI_DPHY_SLAVE ); +dphy_wait_fsm (kmb, dphy_no +1 ,DPHY_TX_LOCK ); + +/* PHY #N master */ + dphy_init_sequence(kmb, cfg, dphy_no,
MIPI_DPHY_D_LANES,Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ MIPI_DPHY_MASTER); + +/* Wait for DPHY init to complete */ +wait_init_done (kmb, dphy_no,MIPI_DPHY_D_LANES ); +wait_init_done (kmb, dphy_no +1 , + cfg->active_lanes -MIPI_DPHY_D_LANES ); +wait_pll_lock (kmb, dphy_no); +wait_pll_lock (kmb, dphy_no +1 ); +dphy_wait_fsm (kmb, dphy_no,DPHY_TX_IDLE ); + }else {/* Single DPHY */ + dphy_init_sequence(kmb, cfg, dphy_no, cfg->active_lanes,drivers/gpu/drm/kmb/kmb_dsi.c line 1656
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ MIPI_DPHY_MASTER); +dphy_wait_fsm (kmb, dphy_no,DPHY_TX_IDLE ); +wait_init_done (kmb, dphy_no, cfg->active_lanes); +wait_pll_lock (kmb, dphy_no); + } + +return 0 ; +} + +void connect_lcd_to_mipi (struct kmb_drm_private *kmb)static
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +12
-0+{ +/* DISABLE MIPI->CIF CONNECTION */ +kmb_write_msscam (kmb,MSS_MIPI_CIF_CFG ,0 ); + +/* ENABLE LCD->MIPI CONNECTION */ +kmb_write_msscam (kmb,MSS_LCD_MIPI_CFG ,1 ); + +/* DISABLE LCD->CIF LOOPBACK */ +kmb_write_msscam (kmb,MSS_LOOPBACK_CFG ,0 ); +} + +int kmb_dsi_hw_init(struct drm_device *dev, struct drm_display_mode*mode)
drivers/gpu/drm/kmb/kmb_dsi.c line 1675
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+{ +struct kmb_drm_private *kmb =to_kmb (dev); +u64 data_rate; + + mipi_tx_init_cfg.active_lanes =MIPI_TX_ACTIVE_LANES ; + +if (mode) {I cannot see this function being called without a mode.
Quoted 17 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ mipi_tx_frame0_sect_cfg.width_pixels = mode-
crtc_hdisplay;drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ mipi_tx_frame0_sect_cfg.height_lines = mode-
crtc_vdisplay;drivers/gpu/drm/kmb/kmb_dsi.c new file +13
-0+ mipitx_frame0_cfg.vsync_width = + mode->crtc_vsync_end - mode->crtc_vsync_start; + mipitx_frame0_cfg.v_backporch = + mode->crtc_vtotal - mode->crtc_vsync_end; + mipitx_frame0_cfg.v_frontporch = + mode->crtc_vsync_start - mode->crtc_vdisplay; + mipitx_frame0_cfg.hsync_width = + mode->crtc_hsync_end - mode->crtc_hsync_start; + mipitx_frame0_cfg.h_backporch = + mode->crtc_htotal - mode->crtc_hsync_end; + mipitx_frame0_cfg.h_frontporch = + mode->crtc_hsync_start - mode->crtc_hdisplay; +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* Lane rate = (vtotal*htotal*fps*bpp)/4 / 1000000 +* to convert to Mbps +*/ + data_rate = ((((u32 )mode->crtc_vtotal * + (u32 )mode->crtc_htotal) * + (u32)(drm_mode_vrefresh (mode)) * +MIPI_TX_BPP ) / mipi_tx_init_cfg.active_lanes) / +1000000 ; + + drm_info(&kmb->drm, "htotal=%d vtotal=%drefresh=%d\n",
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ mode->crtc_htotal, mode->crtc_vtotal, + drm_mode_vrefresh(mode)); +drm_info (&kmb->drm,"data_rate=%u active_lanes=%d\n" , + (u32 )data_rate, mipi_tx_init_cfg.active_lanes); + +/* When late rate < 800, modeset fails with 4 lanes, drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+* so switch to 2 lanes +*/ +if (data_rate <800 ) { + mipi_tx_init_cfg.active_lanes =2 ; + mipi_tx_init_cfg.lane_rate_mbps = data_rate *2 ; + }else { + mipi_tx_init_cfg.lane_rate_mbps = data_rate; + } + drm_info(&kmb->drm, + "lane rate=%d\n",mipi_tx_init_cfg.lane_rate_mbps);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ drm_dbg(&kmb->drm, + "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%dhsync_len=%d lane-rate=%d",
Quoted 32 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +32
-0+ mipitx_frame0_cfg.v_frontporch, + mipitx_frame0_cfg.v_backporch, + mipitx_frame0_cfg.vsync_width, + mipitx_frame0_cfg.h_frontporch, + mipitx_frame0_cfg.h_backporch, + mipitx_frame0_cfg.hsync_width, + mipi_tx_init_cfg.lane_rate_mbps); + } + +if (hw_initialized) +return 0 ; + +kmb_write_mipi (kmb,DPHY_ENABLE ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL0 ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL1 ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL2 ,0 ); + +/* Initialize mipi controller */ +mipi_tx_init_cntrl (kmb, &mipi_tx_init_cfg); + +/* Dphy initialization */ +mipi_tx_init_dphy (kmb, &mipi_tx_init_cfg); +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +connect_lcd_to_mipi (kmb); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x15 ,0xff ,0xff00 ,MIPI_CTRL6 ); + + drm_dbg(&kmb->drm, "IRQ_STATUS = 0x%x\n",drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ GET_MIPI_TX_HS_IRQ_STATUS(kmb, MIPI_CTRL6)); +#endif //MIPI_TX_TEST_PATTERN_GENERATION + + hw_initialized = true; + +drm_dbg (&kmb->drm,"MIPI_TXm_HS_CTRL = 0x%x\n" , +kmb_read_mipi (kmb,MIPI_TXm_HS_CTRL (6 ))); +drm_dbg (&kmb->drm,"MIPI LOOP BACK = %x\n" , +kmb_read_mipi (kmb,MIPI_CTRL_DIG_LOOPBACK )); + drm_info(&kmb->drm, "mipi hw_initialized = %d\n",
hw_initialized);Quoted 33 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +33
-0+ +return 0 ; +} + +int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge) +{ +struct kmb_dsi *kmb_dsi; +struct drm_encoder *encoder; +struct kmb_connector *kmb_connector; +struct drm_connector *connector; +struct kmb_dsi_host *host; +int ret =0 ; + + kmb_dsi =kzalloc (sizeof (*kmb_dsi),GFP_KERNEL ); +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); +DRM_ERROR ("failed to allocate kmb_connector\n" ); +return -ENOMEM ; + } + + kmb_dsi->attached_connector = kmb_connector; + + host =kmb_dsi_host_init (dev, kmb_dsi); +if (!host) { +DRM_ERROR ("Failed to allocate host\n" ); +kfree (kmb_dsi); +kfree (kmb_connector);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+return -ENOMEM ; + } + + kmb_dsi->dsi_host = host; + 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,
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c line 1804
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ "MIPI-DSI");Use
drm_simple_encoder(). See other drivers how to do it.
I see that drm_simple_encoder() is used when the driver is either a bridge driver or component driver. Since this is not either, we can keep the drm_encoder_init() as in icl_dsi.c
Quoted 33 lines
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +drm_connector_init (dev, connector, &kmb_dsi_connector_funcs, +DRM_MODE_CONNECTOR_DSI ); + + drm_connector_helper_add(connector,
&kmb_dsi_connector_helper_funcs);drivers/gpu/drm/kmb/kmb_dsi.c line 1820
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ +drm_info (dev,"connector = %s encoder = %s\n" , connector->name, + encoder->name); + + ret =drm_connector_attach_encoder (connector, encoder); +drm_info (dev,"connector->encoder = 0x%p ret = %d\n" , + connector->encoder, + ret); + +/* Link drm_bridge to encoder */ + ret =drm_bridge_attach (encoder, bridge,NULL ,0 );This sequence is not optimal and not right.
The new way, which new drivers shall use, is to let the bridge drivers provide
relevant operations and then the display driver usesdrm_bridge_connector_init()
to create the connector.See for example
mtk_dsi_encoder_init()The current design uses a thight coupling between the display driver and the
kmb_dsi. I may be biased but to me it seems easier to makekmb_dsia real bridge driver so we have a chain of bridges like this:
Quoted 6 lines
--------------------+ +----------------+ +----------------+
| | | | |
kmb display driver +---+ kmb_dsi bridge +---+ adv7535 bridge +== HDMI
| | | | |
--------------------+ +----------------+ +----------------+As per our discussions through private emails, we will keep the current design for mipi dsi.
Quoted 119 lines
adv7535 then provides
get_edit, detect, and hot-plug detect operations to be used by the connector.Review
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+if (ret) { +DRM_ERROR ("failed to attach bridge to MIPI\n" ); +drm_encoder_cleanup (encoder); +return ret; + } +drm_info (dev,"Bridge attached : SUCCESS\n" ); +return 0 ; +}(quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_dsi.hQuoted 59 lines
new file mode 100644
index 0000000..c980823drivers/gpu/drm/kmb/kmb_dsi.h new file +54
-0@@ -0,0 +1,370 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright (c) 2019-2020 Intel Corporation +*/ + +#ifndef __KMB_DSI_H__ +#define __KMB_DSI_H__ + +#include <drm/drm_crtc.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_modes.h> +#include "kmb_drv.h" + +/* MIPI TX CFG*/ +#define MIPI_TX_LANE_DATA_RATE_MBPS 891 +#define MIPI_TX_REF_CLK_KHZ 24000 +#define MIPI_TX_CFG_CLK_KHZ 24000 +#define MIPI_TX_BPP 24 + +/* DPHY Tx test codes*/ +#define TEST_CODE_FSM_CONTROL 0x03 +#define TEST_CODE_MULTIPLE_PHY_CTRL 0x0C +#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 BIT(7) +#define TEST_CODE_PLL_OUTPUT_CLK_SEL 0x19 +#define PLL_N_OVR_EN BIT(4) +#define PLL_M_OVR_EN BIT(5) +#define TEST_CODE_VOD_LEVEL 0x24 +#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 + +/* DPHY 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 + +#define TIMEOUT 600 + +#define MIPI_TX_FRAME_GEN 4drivers/gpu/drm/kmb/kmb_dsi.h line 64
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+#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 511 +/* 2 Data Lanes per D-PHY */ +#define MIPI_DPHY_D_LANES 2 +#define MIPI_DPHY_DEFAULT_BIT_RATES 63 + +#define to_kmb_connector (x) container_of(x, struct kmb_connector,base)
Quoted 33 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +33
-0+#define to_kmb_host (x) container_of(x, struct kmb_dsi_host, base) +#define to_kmb_dsi (x) container_of(x, struct kmb_dsi, base) + +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 drm_bridge *bridge; +}; + +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; +}; + +/* DPHY Tx test codes */ + +enum mipi_ctrl_num { +MIPI_CTRL0 =0 , +MIPI_CTRL1 , +MIPI_CTRL2 , +MIPI_CTRL3 , +MIPI_CTRL4 ,
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.h line 104
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +7
-0+MIPI_CTRL5 , +MIPI_CTRL6 , +MIPI_CTRL7 , +MIPI_CTRL8 , +MIPI_CTRL9 , + MIPI_CTRL_NA +};Not used?
It is used
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +7
-0+ +enum mipi_dphy_num { +MIPI_DPHY0 =0 , +MIPI_DPHY1 , +MIPI_DPHY2 , +MIPI_DPHY3 , +MIPI_DPHY4 ,
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.h line 118
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +7
-0+MIPI_DPHY5 , +MIPI_DPHY6 , +MIPI_DPHY7 , +MIPI_DPHY8 , +MIPI_DPHY9 , + MIPI_DPHY_NA +};Not used?
It is used
Quoted 255 lines
Quoted 186 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +186
-0+ +enum mipi_dir { +MIPI_RX , +MIPI_TX +}; + +enum mipi_ctrl_type { +MIPI_DSI , +MIPI_CSI +}; + +enum mipi_data_if { +MIPI_IF_DMA , +MIPI_IF_PARALLEL +}; + +enum mipi_data_mode { +MIPI_DATA_MODE0 , +MIPI_DATA_MODE1 , +MIPI_DATA_MODE2 , +MIPI_DATA_MODE3 +}; + +enum mipi_dsi_video_mode { +DSI_VIDEO_MODE_NO_BURST_PULSE , +DSI_VIDEO_MODE_NO_BURST_EVENT , +DSI_VIDEO_MODE_BURST +}; + +enum mipi_dsi_blanking_mode { +TRANSITION_TO_LOW_POWER , +SEND_BLANK_PACKET +}; + +enum mipi_dsi_eotp { +DSI_EOTP_DISABLED , +DSI_EOTP_ENABLES +}; + +enum mipi_dsi_data_type { +DSI_SP_DT_RESERVED_00 =0x00 , +DSI_SP_DT_VSYNC_START =0x01 , +DSI_SP_DT_COLOR_MODE_OFF =0x02 , +DSI_SP_DT_GENERIC_SHORT_WR =0x03 , +DSI_SP_DT_GENERIC_RD =0x04 , +DSI_SP_DT_DCS_SHORT_WR =0x05 , +DSI_SP_DT_DCS_RD =0x06 , +DSI_SP_DT_EOTP =0x08 , +DSI_LP_DT_NULL =0x09 , +DSI_LP_DT_RESERVED_0A =0x0a , +DSI_LP_DT_RESERVED_0B =0x0b , +DSI_LP_DT_LPPS_YCBCR422_20B =0x0c , +DSI_LP_DT_PPS_RGB101010_30B =0x0d , +DSI_LP_DT_PPS_RGB565_16B =0x0e , +DSI_LP_DT_RESERVED_0F =0x0f , + +DSI_SP_DT_RESERVED_10 =0x10 , +DSI_SP_DT_VSYNC_END =0x11 , +DSI_SP_DT_COLOR_MODE_ON =0x12 , +DSI_SP_DT_GENERIC_SHORT_WR_1PAR =0x13 , +DSI_SP_DT_GENERIC_RD_1PAR =0x14 , +DSI_SP_DT_DCS_SHORT_WR_1PAR =0x15 , +DSI_SP_DT_RESERVED_16 =0x16 , +DSI_SP_DT_RESERVED_17 =0x17 , +DSI_SP_DT_RESERVED_18 =0x18 , +DSI_LP_DT_BLANK =0x19 , +DSI_LP_DT_RESERVED_1A =0x1a , +DSI_LP_DT_RESERVED_1B =0x1b , +DSI_LP_DT_PPS_YCBCR422_24B =0x1c , +DSI_LP_DT_PPS_RGB121212_36B =0x1d , +DSI_LP_DT_PPS_RGB666_18B =0x1e , +DSI_LP_DT_RESERVED_1F =0x1f , + +DSI_SP_DT_RESERVED_20 =0x20 , +DSI_SP_DT_HSYNC_START =0x21 , +DSI_SP_DT_SHUT_DOWN_PERIPH_CMD =0x22 , +DSI_SP_DT_GENERIC_SHORT_WR_2PAR =0x23 , +DSI_SP_DT_GENERIC_RD_2PAR =0x24 , +DSI_SP_DT_RESERVED_25 =0x25 , +DSI_SP_DT_RESERVED_26 =0x26 , +DSI_SP_DT_RESERVED_27 =0x27 , +DSI_SP_DT_RESERVED_28 =0x28 , +DSI_LP_DT_GENERIC_LONG_WR =0x29 , +DSI_LP_DT_RESERVED_2A =0x2a , +DSI_LP_DT_RESERVED_2B =0x2b , +DSI_LP_DT_PPS_YCBCR422_16B =0x2c , +DSI_LP_DT_RESERVED_2D =0x2d , +DSI_LP_DT_LPPS_RGB666_18B =0x2e , +DSI_LP_DT_RESERVED_2F =0x2f , + +DSI_SP_DT_RESERVED_30 =0x30 , +DSI_SP_DT_HSYNC_END =0x31 , +DSI_SP_DT_TURN_ON_PERIPH_CMD =0x32 , +DSI_SP_DT_RESERVED_33 =0x33 , +DSI_SP_DT_RESERVED_34 =0x34 , +DSI_SP_DT_RESERVED_35 =0x35 , +DSI_SP_DT_RESERVED_36 =0x36 , +DSI_SP_DT_SET_MAX_RETURN_PKT_SIZE =0x37 , +DSI_SP_DT_RESERVED_38 =0x38 , +DSI_LP_DT_DSC_LONG_WR =0x39 , +DSI_LP_DT_RESERVED_3A =0x3a , +DSI_LP_DT_RESERVED_3B =0x3b , +DSI_LP_DT_RESERVED_3C =0x3c , +DSI_LP_DT_PPS_YCBCR420_12B =0x3d , +DSI_LP_DT_PPS_RGB888_24B =0x3e , +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 +}; + +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 { +u8 size_constraint_pixels; +u8 size_constraint_bytes; +u8 pixels_per_pclk; +u8 bits_per_pclk; +}; + +struct mipi_tx_dsi_cfg { +u8 hfp_blank_en;/*horizontal front porch blanking enable */ +u8 eotp_en;/*End of transmission packet enable */ +/*last vertical front porch blanking mode */ +u8 lpm_last_vfp_line; +/*first vertical sync active blanking mode */ +u8 lpm_first_vsa_line; +u8 sync_pulse_eventn;/*sync type */ +u8 hfp_blanking;/*horizontal front porch blanking mode */ +u8 hbp_blanking;/*horizontal back porch blanking mode */ +u8 hsa_blanking;/*horizontal sync active blanking mode */ +u8 v_blanking;/*vertical timing blanking mode */ +}; + +struct mipi_tx_frame_section_cfg { +u32 dma_v_stride; +u16 dma_v_scale_cfg; +u16 width_pixels; +u16 height_lines; +u8 dma_packed; +u8 bpp; +u8 bpp_unpacked; +u8 dma_h_stride; +u8 data_type; +u8 data_mode; +u8 dma_flip_rotate_sel; +}; + +struct mipi_tx_frame_timing_cfg { +u32 bpp; +u32 lane_rate_mbps; +u32 hsync_width; +u32 h_backporch; +u32 h_frontporch; +u32 h_active; +u16 vsync_width; +u16 v_backporch; +u16 v_frontporch; +u16 v_active; +u8 active_lanes; +}; +drivers/gpu/drm/kmb/kmb_dsi.h
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+struct mipi_tx_frame_sect_phcfg { +u32 wc; +enum mipi_data_mode data_mode; +enum mipi_dsi_data_type data_type; +u8 vchannel; +u8 dma_packed; +}; + +struct mipi_tx_frame_cfg { +struct mipi_tx_frame_section_cfg *sections[MIPI_TX_FRAME_GEN_SECTIONS];
Quoted 18 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +18
-0+u32 hsync_width;/*in pixels */ +u32 h_backporch;/*in pixels */ +u32 h_frontporch;/*in pixels */ +u16 vsync_width;/*in lines */ +u16 v_backporch;/*in lines */ +u16 v_frontporch;/*in lines */ +}; + +struct mipi_tx_ctrl_cfg { +struct mipi_tx_frame_cfg *frames[MIPI_TX_FRAME_GEN ]; +struct mipi_tx_dsi_cfg *tx_dsi_cfg; +u8 line_sync_pkt_en; +u8 line_counter_active; +u8 frame_counter_active; +u8 tx_hsclkkidle_cnt; +u8 tx_hsexit_cnt; +u8 tx_crc_en; +u8 tx_hact_wait_stop;drivers/gpu/drm/kmb/kmb_dsi.h line 342
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+u8 tx_always_use_hact; +u8 tx_wait_trig; +u8 tx_wait_all_sect; +}; + +/*configuration structure for MIPI control */ +struct mipi_ctrl_cfg { +/* controller index : CTRL6 for connecting to LCD */ +u8 index; +u8 type;/* controller type : MIPI_DSI */ Some of the fields looks like they are only assigned but never used?
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +8
-0+u8 dir;/* controller direction : MIPI_TX */ +u8 active_lanes;/* # active lanes per controller 2/4 */ +u32 lane_rate_mbps;/*MBPS */ +u32 ref_clk_khz; +u32 cfg_clk_khz; +u32 data_if;/*MIPI_IF_DMA or MIPI_IF_PARALLEL */ +struct mipi_tx_ctrl_cfg tx_ctrl_cfg; +};drivers/gpu/drm/kmb/kmb_dsi.h line 360
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +10
-0+ +/* Structure for storing user specified interrupts that are enabled */ +union mipi_irq_cfg { +u8 value; +struct { +u8 line_compare:1 ; +u8 dma_event:1 ; +u8 frame_done:1 ; +u8 ctrl_error:1 ; +u8 dphy_error:1 ;Most fields are not used??
drivers/gpu/drm/kmb/kmb_dsi.h line 366
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +6
-0+ } irq_cfg; +}; + +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);Does not belong in this file
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.h line 367
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.h new file +1
-0+void mipi_tx_handle_irqs (struct kmb_drm_private *dev_p);Does not exist - delete
drivers/gpu/drm/kmb/kmb_dsi.h line 369
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +2
-0+void kmb_dsi_host_unregister (void ); +int kmb_dsi_hw_init(struct drm_device *dev, struct drm_display_mode*mode);
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.h new file +1
-0+#endif /* __KMB_DSI_H__ */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thomas Zimmermann
maintainerRe: [PATCH v6] drm/kmb: Add support for KeemBay Display
In reply to Anitha ChrisanthusHi,
thanks for the driver. Please see my comments below for a (partial) review.
Best regards
Thomas
Am 10.08.20 um 23:53 schrieb Anitha Chrisanthus:
Quoted 126 lines
This is a basic KMS atomic modesetting display driver for KeemBay family of SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.
Single CRTC with LCD
controller->mipiDSI-> ADV bridgeOnly 1080p resolution and single plane is supported at this time.
v2: moved extern to .h, removed license text
usedrm_dev_init, upclasseddev_private, removedHAVE_IRQ.v3: Squashed all 59 commits to one
v4: review changes from Sam Ravnborg
renameddev_pto kmb
moved clocks underkmb_clock, consolidated clk initializations use drmm functions
useDRM_GEM_CMA_DRIVER_OPS_VMAPv5: corrected spellings
v6: corrected checkpatch warningsCc Sam Ravnborg <[email protected]>Signed-off-by Anitha Chrisanthus <[email protected]>Reviewed-by Bob Paauwe <[email protected]>--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 13 + drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 217 +++++ drivers/gpu/drm/kmb/kmb_crtc.h | 36 + drivers/gpu/drm/kmb/kmb_drv.c | 725 ++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 172 ++++ drivers/gpu/drm/kmb/kmb_dsi.c | 1828 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/kmb/kmb_dsi.h | 370 ++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 519 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 124 +++ drivers/gpu/drm/kmb/kmb_regs.h | 748 ++++++++++++++++ 13 files changed, 4757 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.hdrivers/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 DRMdrivers/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 +13
-0@@ -0,0 +1,13 @@ +config DRM_KMB_DISPLAY + tristate "INTEL 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 Intel's KeemBay SOC which integrates + an ARM Cortex A53 CPU with an Intel Movidius VPU. + + If M is selected the module will be called kmb-drm.drivers/gpu/drm/kmb/Makefile new file +2
-0@@ -0,0 +1,2 @@ +kmb-drm-y := kmb_crtc.o kmb_drv.o kmb_plane.o kmb_dsi.o +obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb-drm.odrivers/gpu/drm/kmb/kmb_crtc.c new file +16
-0@@ -0,0 +1,217 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2018-2020 Intel Corporation +*/ + +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> + +#include <video/videomode.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_cma_helper.h>
drivers/gpu/drm/kmb/kmb_crtc.c line 26
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_plane_helper.h> + +#include "kmb_crtc.h" +#include "kmb_drv.h" +#include "kmb_plane.h" +#include "kmb_regs.h" +#include "kmb_dsi.h"
This include block needs to be sorted alphabetically.
drivers/gpu/drm/kmb/kmb_crtc.c line 31
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +5
-0+ +static void kmb_crtc_cleanup (struct drm_crtc *crtc) +{ +drm_crtc_cleanup (crtc); +}
Leave out the wrapper and use drm_crtc_cleanup() directly.
Quoted 31 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +31
-0+ +static int kmb_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +/* Clear interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +/* Set which interval to generate vertical interrupt */ +kmb_write_lcd (kmb,LCD_VSTATUS_COMPARE , +LCD_VSTATUS_COMPARE_VSYNC ); +/* Enable vertical interrupt */ +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); +return 0 ; +} + +static void kmb_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +/* Clear interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +/* Disable vertical interrupt */ +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); +} + +static const struct drm_crtc_funcs kmb_crtc_funcs = { + .destroy = kmb_crtc_cleanup,
drivers/gpu/drm/kmb/kmb_crtc.c line 72
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+ .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .reset = drm_atomic_helper_crtc_reset, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = kmb_crtc_enable_vblank, + .disable_vblank = kmb_crtc_disable_vblank, +}; + +static void kmb_crtc_mode_set_nofb (struct drm_crtc *crtc)
This name sounds a lot like the old non-atomic driver interface. To avoid confusion, I'd suggest to call it kmb_crtc_set_mode().
Quoted 27 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +27
-0+{ +struct drm_device *dev = crtc->dev; +struct drm_display_mode *m = &crtc->state->adjusted_mode; +struct kmb_crtc_timing vm; +int vsync_start_offset; +int vsync_end_offset; +struct kmb_drm_private *kmb =to_kmb (dev); +unsigned int val =0 ; + +/* Initialize mipi */ +kmb_dsi_hw_init (dev, m); +drm_info (dev, +"vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d hsync_len=%d\n" , + m->crtc_vsync_start - m->crtc_vdisplay, + m->crtc_vtotal - m->crtc_vsync_end, + m->crtc_vsync_end - m->crtc_vsync_start, + m->crtc_hsync_start - m->crtc_hdisplay, + m->crtc_htotal - m->crtc_hsync_end, + m->crtc_hsync_end - m->crtc_hsync_start); + val =kmb_read_lcd (kmb,LCD_INT_ENABLE ); +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , val); +kmb_set_bitmask_lcd (kmb,LCD_INT_CLEAR , ~0x0 ); + vm.vfront_porch =2 ; + vm.vback_porch =2 ; + vm.vsync_len =8 ; + vm.hfront_porch =0 ; + vm.hback_porch =0 ;
drivers/gpu/drm/kmb/kmb_crtc.c line 109
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+ vm.hsync_len =28 ; + + vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; + vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; + +drm_dbg (dev,"%s : %dactive height= %d vbp=%d vfp=%d vsync-w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d" , + __func__, __LINE__, + m->crtc_vdisplay, vm.vback_porch, vm.vfront_porch, + vm.vsync_len, m->crtc_hdisplay, vm.hback_porch, + vm.hfront_porch, vm.hsync_len);
It might just be because of the email fornmting, but the indention appears to be wrong here.
Quoted 39 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +39
-0+kmb_write_lcd (kmb,LCD_V_ACTIVEHEIGHT , + m->crtc_vdisplay -1 ); +kmb_write_lcd (kmb,LCD_V_BACKPORCH , vm.vback_porch); +kmb_write_lcd (kmb,LCD_V_FRONTPORCH , vm.vfront_porch); +kmb_write_lcd (kmb,LCD_VSYNC_WIDTH , vm.vsync_len -1 ); +kmb_write_lcd (kmb,LCD_H_ACTIVEWIDTH , + m->crtc_hdisplay -1 ); +kmb_write_lcd (kmb,LCD_H_BACKPORCH , vm.hback_porch); +kmb_write_lcd (kmb,LCD_H_FRONTPORCH , vm.hfront_porch); +kmb_write_lcd (kmb,LCD_HSYNC_WIDTH , vm.hsync_len -1 ); +/* This is hardcoded as 0 in the Myriadx code */ +kmb_write_lcd (kmb,LCD_VSYNC_START ,0 ); +kmb_write_lcd (kmb,LCD_VSYNC_END ,0 ); +/* Back ground color */ +kmb_write_lcd (kmb,LCD_BG_COLOUR_LS ,0x4 ); +if (m->flags ==DRM_MODE_FLAG_INTERLACE ) { +kmb_write_lcd (kmb, +LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); +kmb_write_lcd (kmb, +LCD_V_BACKPORCH_EVEN , vm.vback_porch); +kmb_write_lcd (kmb, +LCD_V_FRONTPORCH_EVEN , vm.vfront_porch); +kmb_write_lcd (kmb,LCD_V_ACTIVEHEIGHT_EVEN , + m->crtc_vdisplay -1 ); +/* This is hardcoded as 10 in the Myriadx code */ +kmb_write_lcd (kmb,LCD_VSYNC_START_EVEN ,10 ); +kmb_write_lcd (kmb,LCD_VSYNC_END_EVEN ,10 ); + } +kmb_write_lcd (kmb,LCD_TIMING_GEN_TRIG ,ENABLE ); +kmb_set_bitmask_lcd (kmb,LCD_CONTROL ,LCD_CTRL_ENABLE ); +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE , val); +} + +static void kmb_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc); + +clk_prepare_enable (lcd->clk);
drivers/gpu/drm/kmb/kmb_crtc.c line 158
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+kmb_crtc_mode_set_nofb (crtc); +drm_crtc_vblank_on (crtc); +} + +static void kmb_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc); + +/* Always disable planes on the CRTC that is being turned off */
Instead of this general note, rather put here a rational for why disabling planes is requires. Because usually DRM's atomic helpers take take of all this.
Quoted 80 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +59
-0+drm_atomic_helper_disable_planes_on_crtc (old_state, false); + +drm_crtc_vblank_off (crtc); +clk_disable_unprepare (lcd->clk); +} + +static void kmb_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); +} + +static void kmb_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); + +spin_lock_irq (&crtc->dev->event_lock); +if (crtc->state->event) +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; +spin_unlock_irq (&crtc->dev->event_lock); +} + +static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = { + .atomic_begin = kmb_crtc_atomic_begin, + .atomic_enable = kmb_crtc_atomic_enable, + .atomic_disable = kmb_crtc_atomic_disable, + .atomic_flush = kmb_crtc_atomic_flush, +}; + +int kmb_setup_crtc (struct drm_device *drm) +{ +struct kmb_drm_private *kmb =to_kmb (drm); +struct kmb_plane *primary; +int ret; + + primary =kmb_plane_init (drm); +if (IS_ERR (primary)) +return PTR_ERR (primary); + + ret =drm_crtc_init_with_planes (drm, &kmb->crtc, &primary->base_plane, +NULL , &kmb_crtc_funcs,NULL ); +if (ret) { +kmb_plane_destroy (&primary->base_plane); +return ret; + } + +drm_crtc_helper_add (&kmb->crtc, &kmb_crtc_helper_funcs); +return 0 ; +}drivers/gpu/drm/kmb/kmb_crtc.h new file +15
-0@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright © 2018-2020 Intel Corporation +*/ + +#ifndef __KMB_CRTC_H__ +#define __KMB_CRTC_H__ + +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> +#include <video/videomode.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h>
drivers/gpu/drm/kmb/kmb_crtc.h line 25
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.h new file +10
-0+#include <drm/drm_fb_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> +#include <linux/wait.h> +#include "kmb_drv.h"
This include block needs to be cleaned up or even removed. You're including tons of files for adecalring a trivial structure. Do you actually need kmb_crtc.h?
Quoted 41 lines
drivers/gpu/drm/kmb/kmb_crtc.h new file +11
-0+ +struct kmb_crtc_timing { +u32 vfront_porch; +u32 vback_porch; +u32 vsync_len; +u32 hfront_porch; +u32 hback_porch; +u32 hsync_len; +}; + +#endif /* __KMB_CRTC_H__ */ drivers/gpu/drm/kmb/kmb_drv.c new file +24
-0@@ -0,0 +1,725 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2018-2020 Intel Corporation +*/ + +#include <linux/clk.h> +#include <linux/console.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/of_graph.h> +#include <linux/of_reserved_mem.h> +#include <linux/pm_runtime.h> +#include <linux/spinlock.h> + +#include <drm/drm.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_irq.h>
drivers/gpu/drm/kmb/kmb_drv.c line 34
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+#include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> + +#include "kmb_crtc.h" +#include "kmb_drv.h" +#include "kmb_dsi.h" +#include "kmb_plane.h" +#include "kmb_regs.h" + +/* #define DEBUG */
This line is noise. Please remove or document.
Quoted 66 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +66
-0+ +int kmb_under_flow =0 , kmb_flush_done =0 , layer_no =0 ; +static struct kmb_clock kmb_clk; + +static struct drm_bridge *adv_bridge; + +int kmb_display_clk_enable (struct kmb_drm_private *kmb) +{ +int ret =0 ; + + ret =clk_prepare_enable (kmb_clk.clk_lcd); +if (ret) { +drm_err (&kmb->drm,"Failed to enable LCD clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (kmb_clk.clk_mipi); +if (ret) { +drm_err (&kmb->drm,"Failed to enable MIPI clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (kmb_clk.clk_mipi_ecfg); +if (ret) { +drm_err (&kmb->drm, +"Failed to enable MIPI_ECFG clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (kmb_clk.clk_mipi_cfg); +if (ret) { +drm_err (&kmb->drm, +"Failed to enable MIPI_CFG clock: %d\n" , ret); +return ret; + } +DRM_INFO ("SUCCESS : enabled LCD MIPI clocks\n" ); +return 0 ; +} + +int kmb_initialize_clocks (struct kmb_drm_private *kmb,struct device *dev) +{ +struct device_node *vpu_dev; +unsigned long clk; +int ret =0 ; + + kmb_clk.clk_lcd =clk_get (dev,"clk_lcd" ); +if (IS_ERR (kmb_clk.clk_lcd)) { +drm_err (&kmb->drm,"clk_get() failed clk_lcd\n" ); +return PTR_ERR (kmb_clk.clk_lcd); + } + + kmb_clk.clk_mipi =clk_get (dev,"clk_mipi" ); +if (IS_ERR (kmb_clk.clk_mipi)) { +drm_err (&kmb->drm,"clk_get() failed clk_mipi\n" ); +return PTR_ERR (kmb_clk.clk_mipi); + } + + kmb_clk.clk_mipi_ecfg =clk_get (dev,"clk_mipi_ecfg" ); +if (IS_ERR (kmb_clk.clk_mipi_ecfg)) { +drm_err (&kmb->drm,"clk_get() failed clk_mipi_ecfg\n" ); +return PTR_ERR (kmb_clk.clk_mipi_ecfg); + } + + kmb_clk.clk_mipi_cfg =clk_get (dev,"clk_mipi_cfg" ); +if (IS_ERR (kmb_clk.clk_mipi_cfg)) { +drm_err (&kmb->drm,"clk_get() failed clk_mipi_cfg\n" );
drivers/gpu/drm/kmb/kmb_drv.c line 110
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+return PTR_ERR (kmb_clk.clk_mipi_cfg); + } + vpu_dev =of_find_node_by_path ("/soc/vpu-ipc" ); + kmb_clk.clk_pll0 =of_clk_get_by_name (vpu_dev,"pll_0_out_0" ); +if (IS_ERR (kmb_clk.clk_pll0)) { +drm_err (&kmb->drm,"clk_get() failed clk_pll0 " ); +return PTR_ERR (kmb_clk.clk_pll0); + } + kmb->sys_clk_mhz =clk_get_rate (kmb_clk.clk_pll0) /1000000 ; +drm_info (&kmb->drm,"system clk = %d Mhz" , kmb->sys_clk_mhz);
All these drm_info messages are really just noise. It' should be drm_dbg_() of some kind; or drm_warn()/drm_err() if it reports an actual problem. Here and through-out the rest of the driver.
Quoted 71 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +71
-0+ +/* Set LCD clock to 200 Mhz */ +clk_set_rate (kmb_clk.clk_lcd,KMB_LCD_DEFAULT_CLK ); +if (clk_get_rate (kmb_clk.clk_lcd) !=KMB_LCD_DEFAULT_CLK ) { +drm_err (&kmb->drm,"failed to set to clk_lcd to %d\n" , +KMB_LCD_DEFAULT_CLK ); +return -1 ; + } +drm_info (&kmb->drm,"clk_lcd = %ld\n" ,clk_get_rate (kmb_clk.clk_lcd)); + +/* Set MIPI clock to 24 Mhz */ +clk_set_rate (kmb_clk.clk_mipi,KMB_MIPI_DEFAULT_CLK ); +if (clk_get_rate (kmb_clk.clk_mipi) !=KMB_MIPI_DEFAULT_CLK ) { +drm_err (&kmb->drm,"failed to set to clk_mipi to %d\n" , +KMB_MIPI_DEFAULT_CLK ); +return -1 ; + } +drm_info (&kmb->drm,"clk_mipi = %ld\n" ,clk_get_rate (kmb_clk.clk_mipi)); + + clk =clk_get_rate (kmb_clk.clk_mipi_ecfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +/* Set MIPI_ECFG clock to 24 Mhz */ +clk_set_rate (kmb_clk.clk_mipi_ecfg,KMB_MIPI_DEFAULT_CFG_CLK ); + clk =clk_get_rate (kmb_clk.clk_mipi_ecfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +drm_err (&kmb->drm, +"failed to set to clk_mipi_ecfg to %d\n" , +KMB_MIPI_DEFAULT_CFG_CLK ); +return -1 ; + } + +drm_info (&kmb->drm,"clk_mipi_ecfg after set = %ld\n" , clk); + } + + clk =clk_get_rate (kmb_clk.clk_mipi_cfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +/* Set MIPI_CFG clock to 24 Mhz */ +clk_set_rate (kmb_clk.clk_mipi_cfg,24000000 ); + clk =clk_get_rate (kmb_clk.clk_mipi_cfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +drm_err (&kmb->drm, +"failed to set clk_mipi_cfg to %d\n" , +KMB_MIPI_DEFAULT_CFG_CLK ); +return -1 ; + } +drm_info (&kmb->drm, +"Get clk_mipi_cfg after set = %ld\n" , clk); + } + + ret =kmb_display_clk_enable (kmb); +if (ret) +return ret; + +/* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */ +kmb_set_bitmask_msscam (kmb,MSS_CAM_CLK_CTRL ,0x1fff ); +kmb_set_bitmask_msscam (kmb,MSS_CAM_RSTN_CTRL ,0xffffffff ); +return 0 ; +} + +static int kmb_display_clk_disable (void ) +{ +if (kmb_clk.clk_lcd) +clk_disable_unprepare (kmb_clk.clk_lcd); +if (kmb_clk.clk_mipi) +clk_disable_unprepare (kmb_clk.clk_mipi); +if (kmb_clk.clk_mipi_ecfg) +clk_disable_unprepare (kmb_clk.clk_mipi_ecfg); +if (kmb_clk.clk_mipi_cfg) +clk_disable_unprepare (kmb_clk.clk_mipi_cfg); +return 0 ; +}
drivers/gpu/drm/kmb/kmb_drv.c line 191
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ +static void __iomem *kmb_map_mmio (struct device *dev,char *name) +{ +struct resource *res; +struct platform_device *pdev =to_platform_device (dev); +void __iomem *mem; + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM , name); +if (!res) { +DRM_ERROR ("failed to get resource for %s\n" , name);
These old logging macros have to be replaced by drm_err() et al. Here and everywere else.
drivers/gpu/drm/kmb/kmb_drv.c line 200
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9
-0+return ERR_PTR (-ENOMEM ); + } + mem =devm_ioremap_resource (dev, res); +if (IS_ERR (mem)) +DRM_ERROR ("failed to ioremap %s registers\n" , name); +return mem; +} + +static int kmb_load (struct drm_device *drm,unsigned long flags)
Load and unload are names of deprecated interfaces in struct drm_driver. Better not use them to avoid confusion. But also see my comments on restructuring the device setup: load and unload should go away IMHO.
Quoted 88 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +88
-0+{ +struct kmb_drm_private *kmb =to_kmb (drm); +struct platform_device *pdev =to_platform_device (drm->dev); +int irq_lcd; +int ret =0 ; + +/* Map LCD MMIO registers */ + kmb->lcd_mmio =kmb_map_mmio (drm->dev,"lcd_regs" ); +if (IS_ERR (kmb->lcd_mmio)) { +drm_err (&kmb->drm,"failed to map LCD registers\n" ); +return -ENOMEM ; + } + +/* Map MIPI MMIO registers */ + kmb->mipi_mmio =kmb_map_mmio (drm->dev,"mipi_regs" ); +if (IS_ERR (kmb->mipi_mmio)) { +drm_err (&kmb->drm,"failed to map MIPI registers\n" ); +iounmap (kmb->lcd_mmio); +return -ENOMEM ; + } + +/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and +* MSS_CAM_CLK_CTRL register +*/ + kmb->msscam_mmio =kmb_map_mmio (drm->dev,"msscam_regs" ); +if (IS_ERR (kmb->msscam_mmio)) { +drm_err (&kmb->drm,"failed to map MSSCAM registers\n" ); +iounmap (kmb->lcd_mmio); +iounmap (kmb->mipi_mmio); +return -ENOMEM ; + } + +if (IS_ERR (kmb->msscam_mmio)) { +drm_err (&kmb->drm,"failed to map MSSCAM registers\n" ); +iounmap (kmb->lcd_mmio); +iounmap (kmb->mipi_mmio); +return -ENOMEM ; + } +/* Enable display clocks */ +kmb_initialize_clocks (kmb, &pdev->dev); + +/* Register irqs here - section 17.3 in databook +* lists LCD at 79 and 82 for MIPI under MSS CPU - +* firmware has redirected 79 to A53 IRQ 33 +*/ + +/* Allocate LCD interrupt resources, enable interrupt line, +* and setup IRQ handling +*/ + irq_lcd =platform_get_irq_byname (pdev,"irq_lcd" ); +if (irq_lcd <0 ) { +drm_err (&kmb->drm,"irq_lcd not found" ); + goto setup_fail; + } + +/* Get the optional framebuffer memory resource */ + ret =of_reserved_mem_device_init (drm->dev); +if (ret && ret != -ENODEV ) +return ret; + +spin_lock_init (&kmb->irq_lock); + + ret =kmb_setup_crtc (drm); +if (ret <0 ) { +drm_err (&kmb->drm,"failed to create crtc\n" ); + goto setup_fail; + } + +/* Initialize MIPI DSI */ + ret =kmb_dsi_init (drm, adv_bridge); +if (ret) { +drm_err (&kmb->drm,"failed to initialize DSI\n" ); + goto setup_fail; + } + + ret =drm_irq_install (drm, irq_lcd); +if (ret <0 ) { +drm_err (&kmb->drm,"failed to install IRQ handler\n" ); + goto irq_fail; + } + + kmb->irq_lcd = irq_lcd; + +return 0 ; + + irq_fail: +drm_crtc_cleanup (&kmb->crtc); + setup_fail:
drivers/gpu/drm/kmb/kmb_drv.c line 298
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+of_reserved_mem_device_release (drm->dev); + +return ret; +} + +int kmb_atomic_helper_check (struct drm_device *dev, +struct drm_atomic_state *state) +{ +if (!state) +return 0 ;
Why is this necessary?
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +12
-0+ +return drm_atomic_helper_check (dev, state); +} + +static const struct drm_mode_config_funcs kmb_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = kmb_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static int kmb_setup_mode_config (struct drm_device *drm) +{
drivers/gpu/drm/kmb/kmb_drv.c line 320
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+int ret; + + ret =drmm_mode_config_init (drm); +if (ret) +return ret; + drm->mode_config.min_width =KMB_MIN_WIDTH ; + drm->mode_config.min_height =KMB_MIN_HEIGHT ; + drm->mode_config.max_width =KMB_MAX_WIDTH ; + drm->mode_config.max_height =KMB_MAX_HEIGHT ; + drm->mode_config.funcs = &kmb_mode_config_funcs;
Setup your CRTCs, planes, encoders, etc here. Then do drm_mode_config_reset() to initialize all state.
Quoted 106 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +106
-0+return 0 ; +} + +static irqreturn_t handle_lcd_irq (struct drm_device *dev) +{ +unsigned long status, val, val1; +int plane_id, dma0_state, dma1_state; +struct kmb_drm_private *kmb =to_kmb (dev); + + status =kmb_read_lcd (kmb,LCD_INT_STATUS ); + +if (status &LCD_INT_EOF ) { +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_EOF ); + +/* When disabling/enabling LCD layers, the change takes effect +* immediately and does not wait for EOF (end of frame). +* When kmb_plane_atomic_disable is called, mark the plane as +* disabled but actually disable the plane when EOF irq is +* being handled. +*/ +for (plane_id =LAYER_0 ; + plane_id < kmb->n_layers; plane_id++) { +if (plane_status[plane_id].disable) { +kmb_clr_bitmask_lcd (kmb, +LCD_LAYERn_DMA_CFG + (plane_id), +LCD_DMA_LAYER_ENABLE ); + +kmb_clr_bitmask_lcd (kmb,LCD_CONTROL , + plane_status[plane_id].ctrl); + + plane_status[plane_id].disable = false; + } + } +if (kmb_under_flow) { +/* DMA Recovery after underflow */ + dma0_state = (layer_no ==0 ) ? +LCD_VIDEO0_DMA0_STATE :LCD_VIDEO1_DMA0_STATE ; + dma1_state = (layer_no ==0 ) ? +LCD_VIDEO0_DMA1_STATE :LCD_VIDEO1_DMA1_STATE ; + +do { +kmb_write_lcd (kmb,LCD_FIFO_FLUSH ,1 ); + val =kmb_read_lcd (kmb, dma0_state) + &LCD_DMA_STATE_ACTIVE ; + val1 =kmb_read_lcd (kmb, dma1_state) + &LCD_DMA_STATE_ACTIVE ; + }while ((val || val1)); +/* disable dma */ +kmb_clr_bitmask_lcd (kmb,LCD_LAYERn_DMA_CFG (layer_no), +LCD_DMA_LAYER_ENABLE ); +kmb_write_lcd (kmb,LCD_FIFO_FLUSH ,1 ); + kmb_flush_done =1 ; + kmb_under_flow =0 ; + } + } + +if (status &LCD_INT_LINE_CMP ) { +/* clear line compare interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_LINE_CMP ); + } + +if (status &LCD_INT_VERT_COMP ) { +/* Read VSTATUS */ + val =kmb_read_lcd (kmb,LCD_VSTATUS ); + val = (val &LCD_VSTATUS_VERTICAL_STATUS_MASK ); +switch (val) { +case LCD_VSTATUS_COMPARE_VSYNC : +/* Clear vertical compare interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +if (kmb_flush_done) { +kmb_set_bitmask_lcd (kmb, +LCD_LAYERn_DMA_CFG + (layer_no), +LCD_DMA_LAYER_ENABLE ); + kmb_flush_done =0 ; + } +drm_handle_vblank (dev,0 ); +break ; +case LCD_VSTATUS_COMPARE_BACKPORCH : +case LCD_VSTATUS_COMPARE_ACTIVE : +case LCD_VSTATUS_COMPARE_FRONT_PORCH : +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +break ; + } + } +if (status &LCD_INT_DMA_ERR ) { + val = + (status &LCD_INT_DMA_ERR & +kmb_read_lcd (kmb,LCD_INT_ENABLE )); +/* LAYER0 - VL0 */ +if (val & (LAYER0_DMA_FIFO_UNDERFLOW | +LAYER0_DMA_CB_FIFO_UNDERFLOW | +LAYER0_DMA_CR_FIFO_UNDERFLOW )) { + kmb_under_flow++; +drm_info (&kmb->drm, +"!LAYER0:VL0 DMA UNDERFLOW val = 0x%lx,under_flow=%d" , + val, kmb_under_flow); +/* disable underflow interrupt */ +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , +LAYER0_DMA_FIFO_UNDERFLOW | +LAYER0_DMA_CB_FIFO_UNDERFLOW | +LAYER0_DMA_CR_FIFO_UNDERFLOW ); + kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, + LAYER0_DMA_CB_FIFO_UNDERFLOW | + LAYER0_DMA_FIFO_UNDERFLOW |
drivers/gpu/drm/kmb/kmb_drv.c line 436
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ LAYER0_DMA_CR_FIFO_UNDERFLOW); +/* disable auto restart mode */ +kmb_clr_bitmask_lcd (kmb,LCD_LAYERn_DMA_CFG (0 ), +LCD_DMA_LAYER_CONT_PING_PONG_UPDATE ); + layer_no =0 ; + } + +if (val &LAYER0_DMA_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER0:VL0 DMA OVERFLOW val = 0x%lx" , val);
You're not really doing anything here and in the branches below. This looks like debugging code, so it should use drm_dbg_*(). If it's a n error it should use drm_warn() or drm_err().
Quoted 65 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +65
-0+if (val &LAYER0_DMA_CB_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER0:VL0 DMA CB OVERFLOW val = 0x%lx" , val); +if (val &LAYER0_DMA_CR_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER0:VL0 DMA CR OVERFLOW val = 0x%lx" , val); + +/* LAYER1 - VL1 */ +if (val & (LAYER1_DMA_FIFO_UNDERFLOW | +LAYER1_DMA_CB_FIFO_UNDERFLOW | +LAYER1_DMA_CR_FIFO_UNDERFLOW )) { + kmb_under_flow++; +drm_info (&kmb->drm, +"!LAYER1:VL1 DMA UNDERFLOW val = 0x%lx, under_flow=%d" , + val, kmb_under_flow); +/* disable underflow interrupt */ +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , +LAYER1_DMA_FIFO_UNDERFLOW | +LAYER1_DMA_CB_FIFO_UNDERFLOW | +LAYER1_DMA_CR_FIFO_UNDERFLOW ); +kmb_set_bitmask_lcd (kmb,LCD_INT_CLEAR , +LAYER1_DMA_CB_FIFO_UNDERFLOW | +LAYER1_DMA_FIFO_UNDERFLOW | +LAYER1_DMA_CR_FIFO_UNDERFLOW ); +/* disable auto restart mode */ +kmb_clr_bitmask_lcd (kmb,LCD_LAYERn_DMA_CFG (1 ), +LCD_DMA_LAYER_CONT_PING_PONG_UPDATE ); + layer_no =1 ; + } + +/* LAYER1 - VL1 */ +if (val &LAYER1_DMA_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER1:VL1 DMA OVERFLOW val = 0x%lx" , val); +if (val &LAYER1_DMA_CB_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER1:VL1 DMA CB OVERFLOW val = 0x%lx" , val); +if (val &LAYER1_DMA_CR_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER1:VL1 DMA CR OVERFLOW val = 0x%lx" , val); + +/* LAYER2 - GL0 */ +if (val &LAYER2_DMA_FIFO_UNDERFLOW ) +drm_info (&kmb->drm, +"LAYER2:GL0 DMA UNDERFLOW val = 0x%lx" , val); +if (val &LAYER2_DMA_FIFO_OVERFLOW ) +drm_info (&kmb->drm, +"LAYER2:GL0 DMA OVERFLOW val = 0x%lx" , val); + +/* LAYER3 - GL1 */ +if (val &LAYER3_DMA_FIFO_UNDERFLOW ) +drm_info (&kmb->drm, +"LAYER3:GL1 DMA UNDERFLOW val = 0x%lx" , val); +if (val &LAYER3_DMA_FIFO_UNDERFLOW ) +drm_info (&kmb->drm, +"LAYER3:GL1 DMA OVERFLOW val = 0x%lx" , val); + } + +if (status &LCD_INT_LAYER ) { +/* Clear layer interrupts */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_LAYER ); + } + +/* Clear all interrupts */ +kmb_set_bitmask_lcd (kmb,LCD_INT_CLEAR ,1 );
drivers/gpu/drm/kmb/kmb_drv.c line 511
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+return IRQ_HANDLED ; +} + +/* IRQ handler */ +static irqreturn_t kmb_isr (int irq,void *arg) +{ +struct drm_device *dev = (struct drm_device *)arg; +irqreturn_t ret =IRQ_NONE ; + + ret =handle_lcd_irq (dev);
There's no need for 'ret'. Or maybe just inline handle_lcd_irq
Quoted 25 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +25
-0+return ret; +} + +static void kmb_irq_reset (struct drm_device *drm) +{ +kmb_write_lcd (to_kmb (drm),LCD_INT_CLEAR ,0xFFFF ); +kmb_write_lcd (to_kmb (drm),LCD_INT_ENABLE ,0 ); +} + +DEFINE_DRM_GEM_CMA_FOPS (fops); + +static struct drm_driver kmb_driver = { + .driver_features =DRIVER_GEM | +DRIVER_MODESET |DRIVER_ATOMIC , + .irq_handler = kmb_isr, + .irq_preinstall = kmb_irq_reset, + .irq_uninstall = kmb_irq_reset, +/* GEM Operations */ + .fops = &fops, +DRM_GEM_CMA_DRIVER_OPS_VMAP , + .name ="kmb-drm" , + .desc ="KEEMBAY DISPLAY DRIVER " , + .date ="20190122" , + .major =1 , + .minor =0 ,
drivers/gpu/drm/kmb/kmb_drv.c line 546
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+}; + +static void kmb_drm_unload (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *kmb =to_kmb (drm); + +#ifdef DEBUG +dump_stack (); +#endif
No.
drivers/gpu/drm/kmb/kmb_drv.c line 557
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11
-0+drm_dev_unregister (drm); +drm_kms_helper_poll_fini (drm); +of_node_put (kmb->crtc.port); + kmb->crtc.port =NULL ; +pm_runtime_get_sync (drm->dev); +drm_irq_uninstall (drm); +pm_runtime_put_sync (drm->dev); +pm_runtime_disable (drm->dev); + +if (kmb->lcd_mmio) { +iounmap (kmb->lcd_mmio);
Mapped with devm_ function. Don't unmap manually.
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+release_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ); + } + +if (kmb->mipi_mmio) { +iounmap (kmb->mipi_mmio);
drivers/gpu/drm/kmb/kmb_drv.c line 572
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+release_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); + } + +if (kmb->msscam_mmio) { +iounmap (kmb->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);
You used drmm_mode_config_init(). Don't cleanup manually.
Quoted 36 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36
-0+ +/* Release clks */ +kmb_display_clk_disable (); +clk_put (kmb_clk.clk_lcd); +clk_put (kmb_clk.clk_mipi); + +dev_set_drvdata (dev,NULL ); + +/* Unregister DSI host */ +kmb_dsi_host_unregister (); +} + +static int kmb_probe (struct platform_device *pdev) +{ +struct device *dev =get_device (&pdev->dev); +struct kmb_drm_private *kmb; +int ret =0 ; + +/* The bridge (ADV 7535) will return -EPROBE_DEFER until it +* has a mipi_dsi_host to register its device to. So, we +* first register the DSI host during probe time, and then return +* -EPROBE_DEFER until the bridge is loaded. Probe will be called again +* and then the rest of the driver initialization can proceed +* afterwards and the bridge can be successfully attached. +*/ + adv_bridge =kmb_dsi_host_bridge_init (dev); + +if (adv_bridge ==ERR_PTR (-EPROBE_DEFER )) { +return -EPROBE_DEFER ; + }else if (IS_ERR (adv_bridge)) { +DRM_ERROR ("probe failed to initialize DSI host bridge\n" ); +return PTR_ERR (adv_bridge); + } + +/* Create DRM device */ + kmb = devm_drm_dev_alloc(dev, &kmb_driver,
drivers/gpu/drm/kmb/kmb_drv.c line 618
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ struct kmb_drm_private, drm); +if (IS_ERR (kmb)) +return PTR_ERR (kmb); + +dev_set_drvdata (dev, &kmb->drm); + + ret =kmb_setup_mode_config (&kmb->drm); +if (ret) + goto err_free; +dev_set_drvdata (dev, &kmb->drm);
You already did this.
drivers/gpu/drm/kmb/kmb_drv.c line 621
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+ +/* Load driver */ + kmb->n_layers =KMB_MAX_PLANES ;
I don't see n_layers being not KMB_MAX_PLANES; it's just a constant. Therefore remove n_layers entirely.
drivers/gpu/drm/kmb/kmb_drv.c line 622
Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1
-0+ ret =kmb_load (&kmb->drm,0 );
The whole setup process looks unintuitive and fragile to me. Here are a few steps to simplify:
* inline kmb_load()
* reorganize the device setup to first map I/O resouces, then setup
all mode-config structures (CRTCs, planes, etc)
drivers/gpu/drm/kmb/kmb_drv.c line 624
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+if (ret == -EPROBE_DEFER ) { +drm_info (&kmb->drm,"wait for external bridge driver DT\n" );
drm_warn() or drm_dbg_*() here.
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6
-0+return -EPROBE_DEFER ; + }else if (ret) { + goto err_free; + } + +/* Set the CRTC's port so that the encoder component can find it */
drivers/gpu/drm/kmb/kmb_drv.c line 640
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ kmb->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); + ret =drm_vblank_init (&kmb->drm, kmb->drm.mode_config.num_crtc); +drm_info (&kmb->drm,"mode_config.num_crtc=%d\n" , + kmb->drm.mode_config.num_crtc); +if (ret <0 ) { +drm_err (&kmb->drm,"failed to initialize vblank\n" ); + goto err_vblank; + } + +drm_mode_config_reset (&kmb->drm);
This call should better be located at the end of kmb_setup_mode_config().
drivers/gpu/drm/kmb/kmb_drv.c line 645
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+drm_kms_helper_poll_init (&kmb->drm); + +/* Register graphics device with the kernel */ + ret =drm_dev_register (&kmb->drm,0 ); +
No empty line here.
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+if (ret) + goto err_register; + +return 0 ; + + err_register: +drm_kms_helper_poll_fini (&kmb->drm); + err_vblank: +pm_runtime_disable (kmb->drm.dev); + err_free:
drivers/gpu/drm/kmb/kmb_drv.c line 665
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+drm_mode_config_cleanup (&kmb->drm); +dev_set_drvdata (dev,NULL ); +kmb_dsi_host_unregister (); + +return ret; +} + +static int kmb_remove (struct platform_device *pdev) +{ +kmb_drm_unload (&pdev->dev);
Inline kmb_drm_unload().
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7
-0+return 0 ; +} + +static const struct of_device_id kmb_of_match[] = { + {.compatible ="intel,kmb_display" }, + {}, +};
drivers/gpu/drm/kmb/kmb_drv.c line 682
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ +MODULE_DEVICE_TABLE (of, kmb_of_match); + +static int __maybe_unused kmb_pm_suspend (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *kmb = drm ?to_kmb (drm) :NULL ; + +if (!kmb) +return 0 ;
That cannot happpen.
Quoted 26 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +26
-0+ +drm_kms_helper_poll_disable (drm); + + kmb->state =drm_atomic_helper_suspend (drm); +if (IS_ERR (kmb->state)) { +drm_kms_helper_poll_enable (drm); +return PTR_ERR (kmb->state); + } + +return 0 ; +} + +static int __maybe_unused kmb_pm_resume (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *kmb = drm ?to_kmb (drm) :NULL ; + +if (!kmb) +return 0 ; + +drm_atomic_helper_resume (drm, kmb->state); +drm_kms_helper_poll_enable (drm); + +return 0 ; +} +
drivers/gpu/drm/kmb/kmb_drv.c line 718
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend, kmb_pm_resume); + +static struct platform_driver kmb_platform_driver = { + .probe = kmb_probe, + .remove = kmb_remove, + .driver = { + .name ="kmb-drm" , + .pm = &kmb_pm_ops, + .of_match_table = kmb_of_match, + },
Bad indention. Here and elsewhere.
Quoted 23 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7
-0+}; + +module_platform_driver (kmb_platform_driver); + +MODULE_AUTHOR ("Intel Corporation" ); +MODULE_DESCRIPTION ("Keembay Display driver" ); +MODULE_LICENSE ("GPL v2" );drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0@@ -0,0 +1,172 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright © 2018-2020 Intel Corporation +*/ + +#ifndef __KMB_DRV_H__ +#define __KMB_DRV_H__ + +#include "kmb_regs.h" +
drivers/gpu/drm/kmb/kmb_drv.h line 20
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+#define KMB_MAX_WIDTH 1920/*max width in pixels */ +#define KMB_MAX_HEIGHT 1080/*max height in pixels */ +#define KMB_MIN_WIDTH 1920/*max width in pixels */ +#define KMB_MIN_HEIGHT 1080/*max height in pixels */ +#define KMB_LCD_DEFAULT_CLK 200000000 +#define KMB_MIPI_DEFAULT_CLK 24000000 +#define KMB_MIPI_DEFAULT_CFG_CLK 24000000 +#define KMB_SYS_CLK_MHZ 500 + +#define crtc_to_kmb_priv (x) container_of(x, struct kmb_drm_private, crtc)
static inline function?
drivers/gpu/drm/kmb/kmb_drv.h line 24
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +4
-0+ +#define ICAM_MMIO 0x3b100000 +#define ICAM_LCD_OFFSET 0x1080 +#define ICAM_MMIO_SIZE 0x2000
Empty line here.
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 2,839 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +148
-0+struct 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; +int sys_clk_mhz; +dma_addr_t fb_addr; +}; + +struct kmb_clock { +struct clk *clk_lcd; +struct clk *clk_mipi; +struct clk *clk_mipi_ecfg; +struct clk *clk_mipi_cfg; +struct clk *clk_pll0; +}; + +static inline struct kmb_drm_private *to_kmb (const struct drm_device *dev) +{ + return container_of(dev, struct kmb_drm_private, drm); +} + +struct blt_layer_config { +unsigned char layer_format; +}; + +static inline void kmb_write_lcd (struct kmb_drm_private *dev_p, +unsigned int reg,u32 value) +{ +writel (value, (dev_p->lcd_mmio + reg)); +} + +static inline void kmb_write_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 value) +{ +writel (value, (dev_p->mipi_mmio + reg)); +} + +static inline void kmb_write_msscam (struct kmb_drm_private *dev_p, +unsigned int reg,u32 value) +{ +writel (value, (dev_p->msscam_mmio + reg)); +} + +static inline u32 kmb_read_msscam (struct kmb_drm_private *dev_p, +unsigned int reg) +{ +return readl (dev_p->msscam_mmio + reg); +} + +static inline void kmb_set_bitmask_msscam (struct kmb_drm_private *dev_p, +unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_msscam (dev_p, reg); + +kmb_write_msscam (dev_p, reg, (reg_val | mask)); +} + +static inline u32 kmb_read_lcd (struct kmb_drm_private *dev_p,unsigned int reg) +{ +return readl (dev_p->lcd_mmio + reg); +} + +static inline void kmb_set_bitmask_lcd (struct kmb_drm_private *dev_p, +unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_lcd (dev_p, reg); + +kmb_write_lcd (dev_p, reg, (reg_val | mask)); +} + +static inline void kmb_clr_bitmask_lcd (struct kmb_drm_private *dev_p, +unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_lcd (dev_p, reg); + +kmb_write_lcd (dev_p, reg, (reg_val & (~mask))); +} + +static inline u32 kmb_read_mipi (struct kmb_drm_private *dev_p,unsigned int reg) +{ +return readl (dev_p->mipi_mmio + reg); +} + +static inline void kmb_write_bits_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 offset, +u32 num_bits,u32 value) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); +u32 mask = (1 << num_bits) -1 ; + + value &= mask; + mask <<= offset; + reg_val &= (~mask); + reg_val |= (value << offset); +#ifdef DEBUG +if (reg ==DPHY_FREQ_CTRL0_3 +4 ) { +DRM_INFO ("%s : %d reg=0x%x offset=%d num_bits=%d val=0x%x\n" , + __func__, __LINE__, reg, offset, num_bits, + reg_val); + } +#endif +kmb_write_mipi (dev_p, reg, reg_val); +} + +static inline void kmb_set_bit_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 offset) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, reg_val | (1 << offset)); +} + +static inline void kmb_clr_bit_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 offset) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, reg_val & (~(1 << offset))); +} + +static inline void kmb_set_bitmask_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, (reg_val | mask)); +} + +static inline void kmb_clr_bitmask_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, (reg_val & (~mask))); +} + +int kmb_setup_crtc (struct drm_device *dev); +void kmb_set_scanout (struct kmb_drm_private *lcd); +#endif /* __KMB_DRV_H__ */ drivers/gpu/drm/kmb/kmb_dsi.c new file +1828
-0@@ -0,0 +1,1828 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2019-2020 Intel Corporation +*/ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/slab.h> +#include <linux/spinlock.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "kmb_drv.h" +#include "kmb_dsi.h" +#include "kmb_regs.h" + +static int hw_initialized; +/* #define MIPI_TX_TEST_PATTERN_GENERATION */ +/* #define DPHY_GET_FSM */ +/* #define DPHY_READ_TESTCODE */ + +static struct mipi_dsi_host *dsi_host; +static struct mipi_dsi_device *dsi_device; + +/* Default setting is 1080p, 4 lanes */ +#define IMG_HEIGHT_LINES 1080 +#define IMG_WIDTH_PX 1920 +#define MIPI_TX_ACTIVE_LANES 4 + +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 , + .dma_packed =0 +}; + +struct mipi_tx_frame_cfg mipitx_frame0_cfg = { + .sections[0 ] = &mipi_tx_frame0_sect_cfg, + .sections[1 ] =NULL , + .sections[2 ] =NULL , + .sections[3 ] =NULL , + .vsync_width =5 , + .v_backporch =36 , + .v_frontporch =4 , + .hsync_width =44 , + .h_backporch =148 , + .h_frontporch =88 +}; + +struct mipi_tx_dsi_cfg mipitx_dsi_cfg = { + .hfp_blank_en =0 , + .eotp_en =0 , + .lpm_last_vfp_line =0 , + .lpm_first_vsa_line =0 , + .sync_pulse_eventn =DSI_VIDEO_MODE_NO_BURST_EVENT , + .hfp_blanking =SEND_BLANK_PACKET , + .hbp_blanking =SEND_BLANK_PACKET , + .hsa_blanking =SEND_BLANK_PACKET , + .v_blanking =SEND_BLANK_PACKET , +}; + +struct mipi_ctrl_cfg mipi_tx_init_cfg = { + .index =MIPI_CTRL6 , + .type =MIPI_DSI , + .dir =MIPI_TX , + .active_lanes =MIPI_TX_ACTIVE_LANES , + .lane_rate_mbps =MIPI_TX_LANE_DATA_RATE_MBPS , + .ref_clk_khz =MIPI_TX_REF_CLK_KHZ , + .cfg_clk_khz =MIPI_TX_CFG_CLK_KHZ , + .data_if =MIPI_IF_PARALLEL , + .tx_ctrl_cfg = { + .frames[0 ] = &mipitx_frame0_cfg, + .frames[1 ] =NULL , + .frames[2 ] =NULL , + .frames[3 ] =NULL , + .tx_dsi_cfg = &mipitx_dsi_cfg, + .line_sync_pkt_en =0 , + .line_counter_active =0 , + .frame_counter_active =0 , + .tx_always_use_hact =1 , + .tx_hact_wait_stop =1 , + } +}; + +struct mipi_hs_freq_range_cfg { +u16 default_bit_rate_mbps; +u8 hsfreqrange_code; +}; + +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 struct mipi_hs_freq_range_cfg +mipi_hs_freq_range[MIPI_DPHY_DEFAULT_BIT_RATES ] = { + {.default_bit_rate_mbps =80 , .hsfreqrange_code =0x00 }, + {.default_bit_rate_mbps =90 , .hsfreqrange_code =0x10 }, + {.default_bit_rate_mbps =100 , .hsfreqrange_code =0x20 }, + {.default_bit_rate_mbps =110 , .hsfreqrange_code =0x30 }, + {.default_bit_rate_mbps =120 , .hsfreqrange_code =0x01 }, + {.default_bit_rate_mbps =130 , .hsfreqrange_code =0x11 }, + {.default_bit_rate_mbps =140 , .hsfreqrange_code =0x21 }, + {.default_bit_rate_mbps =150 , .hsfreqrange_code =0x31 }, + {.default_bit_rate_mbps =160 , .hsfreqrange_code =0x02 }, + {.default_bit_rate_mbps =170 , .hsfreqrange_code =0x12 }, + {.default_bit_rate_mbps =180 , .hsfreqrange_code =0x22 }, + {.default_bit_rate_mbps =190 , .hsfreqrange_code =0x32 }, + {.default_bit_rate_mbps =205 , .hsfreqrange_code =0x03 }, + {.default_bit_rate_mbps =220 , .hsfreqrange_code =0x13 }, + {.default_bit_rate_mbps =235 , .hsfreqrange_code =0x23 }, + {.default_bit_rate_mbps =250 , .hsfreqrange_code =0x33 }, + {.default_bit_rate_mbps =275 , .hsfreqrange_code =0x04 }, + {.default_bit_rate_mbps =300 , .hsfreqrange_code =0x14 }, + {.default_bit_rate_mbps =325 , .hsfreqrange_code =0x25 }, + {.default_bit_rate_mbps =350 , .hsfreqrange_code =0x35 }, + {.default_bit_rate_mbps =400 , .hsfreqrange_code =0x05 }, + {.default_bit_rate_mbps =450 , .hsfreqrange_code =0x16 }, + {.default_bit_rate_mbps =500 , .hsfreqrange_code =0x26 }, + {.default_bit_rate_mbps =550 , .hsfreqrange_code =0x37 }, + {.default_bit_rate_mbps =600 , .hsfreqrange_code =0x07 }, + {.default_bit_rate_mbps =650 , .hsfreqrange_code =0x18 }, + {.default_bit_rate_mbps =700 , .hsfreqrange_code =0x28 }, + {.default_bit_rate_mbps =750 , .hsfreqrange_code =0x39 }, + {.default_bit_rate_mbps =800 , .hsfreqrange_code =0x09 }, + {.default_bit_rate_mbps =850 , .hsfreqrange_code =0x19 }, + {.default_bit_rate_mbps =900 , .hsfreqrange_code =0x29 }, + {.default_bit_rate_mbps =1000 , .hsfreqrange_code =0x0A }, + {.default_bit_rate_mbps =1050 , .hsfreqrange_code =0x1A }, + {.default_bit_rate_mbps =1100 , .hsfreqrange_code =0x2A }, + {.default_bit_rate_mbps =1150 , .hsfreqrange_code =0x3B }, + {.default_bit_rate_mbps =1200 , .hsfreqrange_code =0x0B }, + {.default_bit_rate_mbps =1250 , .hsfreqrange_code =0x1B }, + {.default_bit_rate_mbps =1300 , .hsfreqrange_code =0x2B }, + {.default_bit_rate_mbps =1350 , .hsfreqrange_code =0x3C }, + {.default_bit_rate_mbps =1400 , .hsfreqrange_code =0x0C }, + {.default_bit_rate_mbps =1450 , .hsfreqrange_code =0x1C }, + {.default_bit_rate_mbps =1500 , .hsfreqrange_code =0x2C }, + {.default_bit_rate_mbps =1550 , .hsfreqrange_code =0x3D }, + {.default_bit_rate_mbps =1600 , .hsfreqrange_code =0x0D }, + {.default_bit_rate_mbps =1650 , .hsfreqrange_code =0x1D }, + {.default_bit_rate_mbps =1700 , .hsfreqrange_code =0x2E }, + {.default_bit_rate_mbps =1750 , .hsfreqrange_code =0x3E }, + {.default_bit_rate_mbps =1800 , .hsfreqrange_code =0x0E }, + {.default_bit_rate_mbps =1850 , .hsfreqrange_code =0x1E }, + {.default_bit_rate_mbps =1900 , .hsfreqrange_code =0x2F }, + {.default_bit_rate_mbps =1950 , .hsfreqrange_code =0x3F }, + {.default_bit_rate_mbps =2000 , .hsfreqrange_code =0x0F }, + {.default_bit_rate_mbps =2050 , .hsfreqrange_code =0x40 }, + {.default_bit_rate_mbps =2100 , .hsfreqrange_code =0x41 }, + {.default_bit_rate_mbps =2150 , .hsfreqrange_code =0x42 }, + {.default_bit_rate_mbps =2200 , .hsfreqrange_code =0x43 }, + {.default_bit_rate_mbps =2250 , .hsfreqrange_code =0x44 }, + {.default_bit_rate_mbps =2300 , .hsfreqrange_code =0x45 }, + {.default_bit_rate_mbps =2350 , .hsfreqrange_code =0x46 }, + {.default_bit_rate_mbps =2400 , .hsfreqrange_code =0x47 }, + {.default_bit_rate_mbps =2450 , .hsfreqrange_code =0x48 }, + {.default_bit_rate_mbps =2500 , .hsfreqrange_code =0x49 } +}; + +union mipi_irq_cfg int_cfg = { + .irq_cfg.frame_done =1 , + .irq_cfg.ctrl_error =1 , +}; + +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 ; +} + +static int kmb_dsi_get_modes (struct drm_connector *connector) +{ +int num_modes =0 ; + + num_modes =drm_add_modes_noedid (connector, + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); + +DRM_INFO ("width=%d height=%d\n" , + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); +DRM_INFO ("num modes=%d\n" , num_modes); + +return num_modes; +} + +void kmb_dsi_host_unregister (void ) +{ +mipi_dsi_host_unregister (dsi_host); +kfree (dsi_host); +} + +static void kmb_dsi_connector_destroy (struct drm_connector *connector) +{ +struct kmb_connector *kmb_connector =to_kmb_connector (connector); + +drm_connector_cleanup (connector); +kfree (kmb_connector); +} + +static void kmb_dsi_encoder_destroy (struct drm_encoder *encoder) +{ +struct kmb_dsi *kmb_dsi =to_kmb_dsi (encoder); + +if (!kmb_dsi) +return ; + +kfree (kmb_dsi->dsi_host); + +drm_encoder_cleanup (encoder); + +kmb_dsi_connector_destroy (&kmb_dsi->attached_connector->base); + +kfree (kmb_dsi); +if (!dsi_device) +kfree (dsi_device); +} + +static const struct drm_encoder_funcs kmb_dsi_funcs = { + .destroy = kmb_dsi_encoder_destroy, +}; + +static const struct +drm_connector_helper_funcs kmb_dsi_connector_helper_funcs = { + .get_modes = kmb_dsi_get_modes, + .mode_valid = kmb_dsi_mode_valid, +}; + +static const struct drm_connector_funcs kmb_dsi_connector_funcs = { + .destroy = kmb_dsi_connector_destroy, + .fill_modes = drm_helper_probe_single_connector_modes, + .reset = drm_atomic_helper_connector_reset, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .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 drm_device *drm, +struct kmb_dsi *kmb_dsi) +{ +struct kmb_dsi_host *host; + + host =kzalloc (sizeof (*host),GFP_KERNEL ); +if (!host) +return NULL ; + + host->base = dsi_host; + host->base->ops = &kmb_dsi_host_ops; + host->kmb_dsi = kmb_dsi; + + host->base->dev = drm->dev; + + dsi_device->host = host->base; + host->device = dsi_device; +return host; +} + +struct drm_bridge *kmb_dsi_host_bridge_init (struct device *dev) +{ +struct drm_bridge *bridge =NULL ; +struct device_node *encoder_node; + +/* Create and register MIPI DSI host */ +if (!dsi_host) { + dsi_host =kzalloc (sizeof (*dsi_host),GFP_KERNEL ); +if (!dsi_host) +return ERR_PTR (-ENOMEM ); + + dsi_host->ops = &kmb_dsi_host_ops; + +if (!dsi_device) { + dsi_device =kzalloc (sizeof (*dsi_device),GFP_KERNEL ); +if (!dsi_device) { +kfree (dsi_host); +return ERR_PTR (-ENOMEM ); + } + } + + dsi_host->dev = dev; +mipi_dsi_host_register (dsi_host); + } +/* Find ADV7535 node and initialize it */ + encoder_node =of_parse_phandle (dev->of_node,"encoder-slave" ,0 ); + +if (!encoder_node) { +DRM_ERROR ("Failed to get bridge info from DT\n" ); +return ERR_PTR (-EINVAL ); + } + +/* Locate drm bridge from the hdmi encoder DT node */ + bridge =of_drm_find_bridge (encoder_node); +of_node_put (encoder_node); +if (!bridge) { +DRM_INFO ("Wait for external bridge driver DT\n" ); +return ERR_PTR (-EPROBE_DEFER ); + } +return bridge; +} + +u32 mipi_get_datatype_params (u32 data_type,u32 data_mode, +struct mipi_data_type_params *params) +{ +struct mipi_data_type_params data_type_param; + +switch (data_type) { +case DSI_LP_DT_PPS_YCBCR420_12B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =3 ; +switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_YCBCR422_16B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =4 ; +switch (data_mode) { +/* Case 0 and 1 not supported according +* to MDK +*/ +case 2 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_LPPS_YCBCR422_20B : +case DSI_LP_DT_PPS_YCBCR422_24B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =6 ; +switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB565_16B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =2 ; +switch (data_mode) { +case 0 : +case 1 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_mode %d\n" , data_mode); +return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB666_18B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =9 ; + data_type_param.bits_per_pclk =18 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_LPPS_RGB666_18B : +case DSI_LP_DT_PPS_RGB888_24B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =3 ; + data_type_param.bits_per_pclk =24 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_PPS_RGB101010_30B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =15 ; + data_type_param.bits_per_pclk =30 ; + data_type_param.pixels_per_pclk =1 ; +break ; +default : +DRM_ERROR ("DSI: Invalid data_type %d\n" , data_type); +return -EINVAL ; + }; + + *params = data_type_param; +return 0 ; +} + +static u32 compute_wc (u32 width_px,u8 size_constr_p,u8 size_constr_b) +{ +/* Calculate the word count for each long packet */ +return (((width_px / size_constr_p) * size_constr_b) &0xffff ); +} + +static u32 compute_unpacked_bytes (u32 wc,u8 bits_per_pclk) +{ +/* Number of PCLK cycles needed to transfer a line +* with each PCLK cycle, 4 Bytes are sent through the PPL module +*/ +return ((wc *8 ) / bits_per_pclk) *4 ; +} + +static u32 mipi_tx_fg_section_cfg_regs (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, +u32 height_lines,u32 unpacked_bytes, +struct mipi_tx_frame_sect_phcfg *ph_cfg) +{ +u32 cfg =0 ; +u32 ctrl_no =MIPI_CTRL6 ; +u32 reg_adr; + +/* Frame section packet header */ +/* Word count bits [15:0] */ + cfg = (ph_cfg->wc &MIPI_TX_SECT_WC_MASK ) <<0 ; + +/* Data type (bits [21:16]) */ + cfg |= ((ph_cfg->data_type &MIPI_TX_SECT_DT_MASK ) + <<MIPI_TX_SECT_DT_SHIFT ); + +/* Virtual channel (bits [23:22]) */ + cfg |= ((ph_cfg->vchannel &MIPI_TX_SECT_VC_MASK ) + <<MIPI_TX_SECT_VC_SHIFT ); + +/* Data mode (bits [24:25]) */ + cfg |= ((ph_cfg->data_mode &MIPI_TX_SECT_DM_MASK ) + <<MIPI_TX_SECT_DM_SHIFT ); +if (ph_cfg->dma_packed) + cfg |=MIPI_TX_SECT_DMA_PACKED ; + +drm_dbg (&kmb->drm, +"ctrl=%d frame_id=%d section=%d cfg=%x packed=%d\n" , + ctrl_no, frame_id, section, cfg, ph_cfg->dma_packed); +kmb_write_mipi (kmb, + (MIPI_TXm_HS_FGn_SECTo_PH (ctrl_no, frame_id, section)), + cfg); + +/* Unpacked bytes */ + +/* There are 4 frame generators and each fg has 4 sections +* There are 2 registers for unpacked bytes (# bytes each +* section occupies in memory) +* REG_UNPACKED_BYTES0: [15:0]-BYTES0, [31:16]-BYTES1 +* REG_UNPACKED_BYTES1: [15:0]-BYTES2, [31:16]-BYTES3 +*/ + reg_adr = +MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0 (ctrl_no, + frame_id) + (section /2 ) *4 ; +kmb_write_bits_mipi (kmb, reg_adr, (section %2 ) *16 ,16 , + unpacked_bytes); +drm_dbg (&kmb->drm, +"unpacked_bytes = %d, wordcount = %d\n" , unpacked_bytes, + ph_cfg->wc); + +/* Line config */ + reg_adr =MIPI_TXm_HS_FGn_SECTo_LINE_CFG (ctrl_no, frame_id, section); +kmb_write_mipi (kmb, reg_adr, height_lines); +return 0 ; +} + +static u32 mipi_tx_fg_section_cfg (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, +struct mipi_tx_frame_section_cfg *frame_scfg, +u32 *bits_per_pclk,u32 *wc) +{ +u32 ret =0 ; +u32 unpacked_bytes; +struct mipi_data_type_params data_type_parameters; +struct mipi_tx_frame_sect_phcfg ph_cfg; + + ret =mipi_get_datatype_params (frame_scfg->data_type, + frame_scfg->data_mode, + &data_type_parameters); +if (ret) +return ret; + +/* Packet width has to be a multiple of the minimum packet width +* (in pixels) set for each data type +*/ +if (frame_scfg->width_pixels % + data_type_parameters.size_constraint_pixels !=0 ) +return -EINVAL ; + + *wc =compute_wc (frame_scfg->width_pixels, + data_type_parameters.size_constraint_pixels, + data_type_parameters.size_constraint_bytes); + unpacked_bytes =compute_unpacked_bytes (*wc, + data_type_parameters.bits_per_pclk); + 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 (kmb, frame_id, section, + frame_scfg->height_lines, + unpacked_bytes, &ph_cfg); + +/* Caller needs bits_per_clk for additional caluclations */ + *bits_per_pclk = data_type_parameters.bits_per_pclk; + +return 0 ; +} + +static void mipi_tx_fg_cfg_regs (struct kmb_drm_private *kmb,u8 frame_gen, +struct mipi_tx_frame_timing_cfg *fg_cfg) +{ +u32 sysclk; +u32 ppl_llp_ratio; +u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; + +/* 500 Mhz system clock minus 50 to account for the difference in +* MIPI clock speed in RTL tests +*/ + sysclk = kmb->sys_clk_mhz -50 ; + +/* 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 maintain precision */ + ppl_llp_ratio = ((fg_cfg->bpp /8 ) * sysclk *1000 ) / + ((fg_cfg->lane_rate_mbps /8 ) * fg_cfg->active_lanes); + +drm_dbg (&kmb->drm,"ppl_llp_ratio=%d\n" , ppl_llp_ratio); +drm_dbg (&kmb->drm,"bpp=%d sysclk=%d lane-rate=%d active-lanes=%d\n" , + fg_cfg->bpp, sysclk, fg_cfg->lane_rate_mbps, + fg_cfg->active_lanes); + +/* Frame generator number of lines */ + reg_adr =MIPI_TXm_HS_FGn_NUM_LINES (ctrl_no, frame_gen); +kmb_write_mipi (kmb, 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 /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->vsync_width); + +/* vertical backporch (vbp) */ + reg_adr =MIPI_TXm_HS_V_BACKPORCHESn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_backporch); + +/* vertical frontporch (vfp) */ + reg_adr =MIPI_TXm_HS_V_FRONTPORCHESn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_frontporch); + +/* vertical active (vactive) */ + reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_active); + +/* hsync width */ + reg_adr =MIPI_TXm_HS_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->hsync_width * ppl_llp_ratio) /1000 ); + +/* horizontal backporch (hbp) */ + reg_adr =MIPI_TXm_HS_H_BACKPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_backporch * ppl_llp_ratio) /1000 ); + +/* horizontal frontporch (hfp) */ + reg_adr =MIPI_TXm_HS_H_FRONTPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_frontporch * ppl_llp_ratio) /1000 ); + +/* horizontal active (ha) */ + 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_mipi (kmb, reg_adr, val); + +/* llp hsync width */ + reg_adr =MIPI_TXm_HS_LLP_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, 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_mipi (kmb, 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_mipi (kmb, reg_adr, + fg_cfg->h_frontporch * (fg_cfg->bpp /8 )); +} + +static void mipi_tx_fg_cfg (struct kmb_drm_private *kmb,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]) + 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 (kmb, frame_gen, &fg_t_cfg); +} + +static void mipi_tx_multichannel_fifo_cfg (struct kmb_drm_private *kmb, +u8 active_lanes,u8 vchannel_id) +{ +u32 fifo_size, fifo_rthreshold; +u32 ctrl_no =MIPI_CTRL6 ; + +/* Clear all mc fifo channel sizes and thresholds */ +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CTRL_EN ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC1 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD1 ,0 ); + + fifo_size = ((active_lanes >MIPI_D_LANES_PER_DPHY ) ? +MIPI_CTRL_4LANE_MAX_MC_FIFO_LOC : +MIPI_CTRL_2LANE_MAX_MC_FIFO_LOC ) -1 ; + +/* MC fifo size for virtual channels 0-3 +* REG_MC_FIFO_CHAN_ALLOC0: [8:0]-channel0, [24:16]-channel1 +* REG_MC_FIFO_CHAN_ALLOC1: [8:0]-2, [24:16]-channel3 +*/ +SET_MC_FIFO_CHAN_ALLOC (kmb, ctrl_no, vchannel_id, fifo_size); + +/* Set threshold to half the fifo size, actual size=size*16 */ + fifo_rthreshold = ((fifo_size) *8 ) &BIT_MASK_16 ; +SET_MC_FIFO_RTHRESHOLD (kmb, ctrl_no, vchannel_id, fifo_rthreshold); + +/* Enable the MC FIFO channel corresponding to the Virtual Channel */ +kmb_set_bit_mipi (kmb,MIPI_TXm_HS_MC_FIFO_CTRL_EN (ctrl_no), + vchannel_id); +} + +static void mipi_tx_ctrl_cfg (struct kmb_drm_private *kmb,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); + +drm_dbg (&kmb->drm,"sync_cfg=%d fg_en=%d\n" , sync_cfg, fg_en); + +/* MIPI_TX_HS_CTRL */ + +/* type:DSI, source:LCD */ + ctrl =HS_CTRL_EN |TX_SOURCE ; + ctrl |=LCD_VC (fg_id); + ctrl |=ACTIVE_LANES (ctrl_cfg->active_lanes -1 ); +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 ; + +/*67 ns stop time */ + ctrl |=HSEXIT_CNT (0x43 ); + +kmb_write_mipi (kmb,MIPI_TXm_HS_SYNC_CFG (ctrl_no), sync_cfg); +kmb_write_mipi (kmb,MIPI_TXm_HS_CTRL (ctrl_no), ctrl); +} + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +static void mipi_tx_hs_tp_gen (struct kmb_drm_private *kmb,int vc, +int tp_sel,u32 stripe_width,u32 color0, +u32 color1,u32 ctrl_no) +{ +int val =0 ; + +/* Select test pattern mode on the virtual channel */ + val =TP_SEL_VCm (vc, tp_sel); + +/* Configure test pattern colors */ +kmb_write_mipi (kmb,MIPI_TXm_HS_TEST_PAT_COLOR0 (ctrl_no), color0); +kmb_write_mipi (kmb,MIPI_TXm_HS_TEST_PAT_COLOR1 (ctrl_no), color1); + +/* Enable test pattern generation on the virtual channel */ + val |=TP_EN_VCm (vc); +kmb_write_mipi (kmb,MIPI_TXm_HS_TEST_PAT_CTRL (ctrl_no), val); +} +#endif + +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *ctrl_cfg) +{ +u32 ret =0 ; +u8 active_vchannels =0 ; +u8 frame_id, sect; +u32 bits_per_pclk =0 ; +u32 word_count =0 ; +struct mipi_tx_frame_cfg *frame; + +/* This is the order to initialize MIPI TX: +* 1. set frame section parameters +* 2. set frame specific parameters +* 3. connect lcd to mipi +* 4. multi channel fifo cfg +* 5. set mipitxcctrlcfg +*/ + +for (frame_id =0 ; frame_id <4 ; frame_id++) { + frame = ctrl_cfg->tx_ctrl_cfg.frames[frame_id]; + +/* Find valid frame, assume only one valid frame */ +if (!frame) +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 (!frame->sections[sect]) +continue ; + + ret =mipi_tx_fg_section_cfg (kmb, frame_id, sect, + frame->sections[sect], + &bits_per_pclk, + &word_count); +if (ret) +return ret; + } + +/* Set frame specific parameters */ +mipi_tx_fg_cfg (kmb, frame_id, ctrl_cfg->active_lanes, + bits_per_pclk, word_count, + ctrl_cfg->lane_rate_mbps, frame); + + active_vchannels++; + +/* Stop iterating as only one virtual channel +* shall be used for LCD connection +*/ +break ; + } + +if (active_vchannels ==0 ) +return -EINVAL ; +/* Multi-Channel FIFO Configuration */ +mipi_tx_multichannel_fifo_cfg (kmb, ctrl_cfg->active_lanes, frame_id); + +/* Frame Generator Enable */ +mipi_tx_ctrl_cfg (kmb, frame_id, ctrl_cfg); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x8 ,0xff ,0xff00 ,MIPI_CTRL6 ); +#endif + +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +return ret; +} + +#ifdef DPHY_READ_TESTCODE +int dphy_read_testcode (struct kmb_drm_private *kmb,int dphy_sel, +int test_code) +{ +u32 reg_wr_data; +u32 reg_rd_data; +int data; + + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data =0 ; + reg_wr_data =0 ; + reg_rd_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code >>8 &0xf ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code &0xff ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + +if ((dphy_sel >>0 &0xf ) >0 ) + reg_rd_data =kmb_read_mipi (kmb,DPHY_TEST_DOUBT0_3 ); +if ((dphy_sel >>4 &0xf ) >0 ) + reg_rd_data =kmb_read_mipi (kmb,DPHY_TEST_DOUBT4_7 ); +if ((dphy_sel >>8 &0x3 ) >0 ) + reg_rd_data =kmb_read_mipi (kmb,DPHY_TEST_DOUBT8_9 ); + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + data = reg_rd_data >>0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + data = reg_rd_data >>8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + data = reg_rd_data >>16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + data = reg_rd_data >>24 ; + +return data; +} +#endif + +static void test_mode_send (struct kmb_drm_private *kmb,u32 dphy_no, +u32 test_code,u32 test_data) +{ +if (test_code !=TEST_CODE_FSM_CONTROL ) +drm_dbg (&kmb->drm, +"test_code = %02x, test_data = %08x\n" , test_code, + test_data); +/* Steps to send test code: +* - set testclk HIGH +* - set testdin with test code +* - set testen HIGH +* - set testclk LOW +* - set testen LOW +*/ + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testdin */ +SET_TEST_DIN0_3 (kmb, dphy_no, test_code); + +/* Set testen high */ +SET_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +if (test_code) { +/* Steps to send test data: +* - set testen LOW +* - set testclk LOW +* - set testdin with data +* - set testclk HIGH +*/ + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set data in testdin */ +kmb_write_mipi (kmb, +DPHY_TEST_DIN0_3 + ((dphy_no /0x4 ) *0x4 ), + test_data << ((dphy_no %4 ) *8 )); + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + } +} + +static inline void +set_test_mode_src_osc_freq_target_low_bits (struct kmb_drm_private *kmb, +u32 dphy_no, +u32 freq) +{ +/* Typical rise/fall time=166, refer Table 1207 databook, +* sr_osc_freq_target[7:0] +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_SLEW_RATE_DDL_CYCLES , + (freq &0x7f )); +} + +static inline void +set_test_mode_src_osc_freq_target_hi_bits (struct kmb_drm_private *kmb, +u32 dphy_no, +u32 freq) +{ +u32 data; + +/* Flag this as high nibble */ + data = ((freq >>6 ) &0x1f ) | (1 <<7 ); + +/* Typical rise/fall time=166, refer Table 1207 databook, +* sr_osc_freq_target[11:7] +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_SLEW_RATE_DDL_CYCLES , data); +} + +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 (struct kmb_drm_private *kmb,u32 dphy_no, +u32 ref_clk_mhz,u32 target_freq_mhz) +{ +u32 best_n =0 , best_m =0 ; +u32 n =0 , m =0 , div =0 , delta, freq =0 , t_freq; +u32 best_freq_delta =3000 ; + +/* 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 , + }; + + 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 (kmb, dphy_no,TEST_CODE_PLL_VCO_CTRL , (vco_p.range + | (1 <<6 ))); + +/* Program m, n pll parameters */ +drm_dbg (&kmb->drm,"m = %d n = %d\n" , best_m, best_n); + +/* PLL_Input_Divider_Ratio[3:0] = pll_n_ovr */ +test_mode_send (kmb, 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 (kmb, 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 (kmb, 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 (kmb, 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 (kmb, 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 (kmb, dphy_no,TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL , +0x00 ); + +/* pll_gmp_cntrl-fixed value for gmp_cntrl from DPHY doci */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_GMP_CTRL ,0x10 ); + +/* pll_cpbias_cntrl-fixed value for cpbias_cntrl from DPHY doc */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_CHARGE_PUMP_BIAS ,0x10 ); + +/* pll_th1 -Lock Detector Phase error threshold, +* document gives fixed value +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_PHASE_ERR_CTRL ,0x02 ); + +/* PLL Lock Configuration */ + +/* pll_th2 - Lock Filter length, document gives fixed value */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_LOCK_FILTER ,0x60 ); + +/* pll_th3- PLL Unlocking filter, document gives fixed value */ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_UNLOCK_FILTER ,0x03 ); + +/* pll_lock_sel-PLL Lock Detector Selection, +* document gives fixed value +*/ +test_mode_send (kmb, dphy_no,TEST_CODE_PLL_LOCK_DETECTOR ,0x02 ); +} + +#ifdef DPHY_GET_FSM +static void dphy_get_fsm (struct kmb_drm_private *kmb,u32 dphy_no) +{ +test_mode_send (kmb, dphy_no,TEST_CODE_FSM_CONTROL ,0x80 ); + +drm_dbg (&kmb->drm,"dphy %d fsm_state = 0%x\n" , dphy_no, +kmb_read_mipi (kmb,DPHY_TEST_DOUBT4_7 )); +} +#endif + +static void dphy_init_sequence (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg,u32 dphy_no, +int active_lanes,enum dphy_mode mode) +{ +u32 test_code =0 , test_data =0 , val; +int i =0 ; + +drm_info (&kmb->drm, +"dphy=%d mode=%d active_lanes=%d\n" , dphy_no, mode, + active_lanes); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Set D-PHY in shutdown mode */ +/* Assert RSTZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); + +/* Assert SHUTDOWNZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); + val =kmb_read_mipi (kmb,DPHY_INIT_CTRL0 ); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , val); + +/* Init D-PHY_n +* Pulse testclear signal to make sure the d-phy configuration +* starts from a clean base +*/ +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +SET_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); + +drm_dbg (&kmb->drm,"DPHY_TEST_CTRL0=0x%x\n" , +kmb_read_mipi (kmb,DPHY_TEST_CTRL0 )); + +/* Set mastermacro bit - Master or slave mode */ + test_code =TEST_CODE_MULTIPLE_PHY_CTRL ; + +/* DPHY has its own clock lane enabled (master) */ +if (mode ==MIPI_DPHY_MASTER ) + test_data =0x01 ; +else + test_data =0x00 ; + +/* Send the test code and data */ +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set the lane data rate */ +for (i =0 ; i <MIPI_DPHY_DEFAULT_BIT_RATES ; i++) { +if (mipi_hs_freq_range[i].default_bit_rate_mbps < + cfg->lane_rate_mbps) +continue ; + +/* Send the test code and data */ +/* bit[6:0] = hsfreqrange_ovr bit[7] = hsfreqrange_ovr_en */ + test_code =TEST_CODE_HS_FREQ_RANGE_CFG ; + test_data = (mipi_hs_freq_range[i].hsfreqrange_code &0x7f ) | + (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); +break ; + } + +/* High-Speed Tx Slew Rate Calibration +* BitRate: > 1.5 Gbps && <= 2.5 Gbps: slew rate control OFF +*/ +if (cfg->lane_rate_mbps >1500 ) { +/* Bypass slew rate calibration algorithm +* bits[1:0} srcal_en_ovr_en, srcal_en_ovr +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data =0x02 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Disable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x00 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + }else if (cfg->lane_rate_mbps >1000 ) { +/* BitRate: > 1 Gbps && <= 1.5 Gbps: - slew rate control ON +* typical rise/fall times: 166 ps +*/ + +/* Do not bypass slew rate calibration algorithm +* bits[1:0}=srcal_en_ovr_en, srcal_en_ovr, bit[6]=sr_range +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[6:0] low nibble +* typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x72f &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble +* Typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x72f >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + }else { +/* lane_rate_mbps <= 1000 Mbps +* BitRate: <= 1 Gbps: +* - slew rate control ON +* - typical rise/fall times: 225 ps +*/ + +/* Do not bypass slew rate calibration algorithm */ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Typical rise/fall time=255, refer Table 1207 databook */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x523 &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x523 >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + } + +/* Set cfgclkfreqrange */ + val = (((cfg->cfg_clk_khz /1000 ) -17 ) *4 ) &0x3f ; +SET_DPHY_FREQ_CTRL0_3 (kmb, dphy_no, val); + +drm_dbg (&kmb->drm,"DPHY_FREQ = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_FREQ_CTRL0_3 +4 )); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Enable config clk for the corresponding d-phy */ +kmb_set_bit_mipi (kmb,DPHY_CFG_CLK_EN , dphy_no); + +drm_dbg (&kmb->drm,"DPHY_CFG_CLK_EN = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_CFG_CLK_EN )); + +/* PLL setup */ +if (mode ==MIPI_DPHY_MASTER ) { +/* Set PLL regulator in bypass */ + test_code =TEST_CODE_PLL_ANALOG_PROG ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* PLL Parameters Setup */ +mipi_tx_pll_setup (kmb, dphy_no, cfg->ref_clk_khz /1000 , + cfg->lane_rate_mbps /2 ); + +/* Set clksel */ +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL1 , +PLL_CLKSEL_0 ,2 ,0x01 ); + +/* Set pll_shadow_control */ +kmb_set_bit_mipi (kmb,DPHY_INIT_CTRL1 ,PLL_SHADOW_CTRL ); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL1 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL1 )); + } + +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +//#define MIPI_TX_FORCE_VOD +#ifdef MIPI_TX_FORCE_VOD +#define MIPI_TX_VOD_LVL 450 +#define TEST_CODE_BANDGAP 0x24 +/* Set bandgap/VOD level */ +switch (MIPI_TX_VOD_LVL ) { +case 200 : + test_data =0x00 ; +break ; +case 300 : + test_data =0x20 ; +break ; +case 350 : + test_data =0x40 ; +break ; +case 450 : + test_data =0x60 ; +break ; +case 400 : +default : + test_data =0x70 ; +break ; + } +test_mode_send (kmb, dphy_no,TEST_CODE_BANDGAP , test_data); +#endif + +/* Send NORMAL OPERATION test code */ + test_code =0x0 ; + test_data =0x0 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Configure BASEDIR for data lanes +* NOTE: basedir only applies to LANE_0 of each D-PHY. +* The other lanes keep their direction based on the D-PHY type, +* either Rx or Tx. +* bits[5:0] - BaseDir: 1 = Rx +* bits[9:6] - BaseDir: 0 = Tx +*/ +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL2 ,0 ,9 ,0x03f ); +ndelay (15 ); + +/* Enable CLOCK LANE +* Clock lane should be enabled regardless of the direction +* set for the D-PHY (Rx/Tx) +*/ +kmb_set_bit_mipi (kmb,DPHY_INIT_CTRL2 ,12 + dphy_no); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL2 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL2 )); + +/* Enable DATA LANES */ +kmb_write_bits_mipi (kmb,DPHY_ENABLE , dphy_no *2 ,2 , + ((1 << active_lanes) -1 )); + +drm_dbg (&kmb->drm, +"DPHY_ENABLE = 0x%x\n" ,kmb_read_mipi (kmb,DPHY_ENABLE )); +ndelay (15 ); + +/* Take D-PHY out of shutdown mode */ +/* Deassert SHUTDOWNZ signal */ +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); +SET_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); +ndelay (15 ); + +/* Deassert RSTZ signal */ +SET_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL0 )); +} + +static void dphy_wait_fsm (struct kmb_drm_private *kmb,u32 dphy_no, +enum dphy_tx_fsm fsm_state) +{ +enum dphy_tx_fsm val =DPHY_TX_POWERDWN ; +int i =0 ; +int status =1 ; + +do { +test_mode_send (kmb, dphy_no,TEST_CODE_FSM_CONTROL ,0x80 ); + + val =GET_TEST_DOUT4_7 (kmb, dphy_no); + i++; +if (i >TIMEOUT ) { + status =0 ; +break ; + } + }while (val != fsm_state); + +drm_dbg (&kmb->drm,"%s: dphy %d val = %x\n" , __func__, dphy_no, val); +drm_info (&kmb->drm,"********** DPHY %d WAIT_FSM %s **********\n" , + dphy_no, status ?"SUCCESS" :"FAILED" ); +} + +static void wait_init_done (struct kmb_drm_private *kmb,u32 dphy_no, +u32 active_lanes) +{ +u32 stopstatedata =0 ; +u32 data_lanes = (1 << active_lanes) -1 ; +int i =0 , val; +int status =1 ; + +drm_dbg (&kmb->drm,"dphy=%d active_lanes=%d data_lanes=%d\n" , dphy_no, + active_lanes, data_lanes); + +do { + val =kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 ); + stopstatedata =GET_STOPSTATE_DATA (kmb, dphy_no) & data_lanes; + +/* TODO-need to add a time out and return failure */ + i++; + +if (i >TIMEOUT ) { + status =0 ; + +drm_info (&kmb->drm, +"! WAIT_INIT_DONE: TIMING OUT!(err_stat=%d)" , +kmb_read_mipi (kmb,MIPI_DPHY_ERR_STAT6_7 )); +drm_dbg (&kmb->drm, +"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , val); +drm_dbg (&kmb->drm, +"stopdata = 0x%x data_lanes=0x%x\n" , + stopstatedata, data_lanes); + +break ; + } + +if (i <3 ) { +drm_dbg (&kmb->drm, +"stopdata = 0x%x data_lanes=0x%x\n" , + stopstatedata, data_lanes); +drm_dbg (&kmb->drm, +"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , val); + } + }while (stopstatedata != data_lanes); + +drm_info (&kmb->drm,"********** DPHY %d INIT - %s **********\n" , + dphy_no, status ?"SUCCESS" :"FAILED" ); +} + +static void wait_pll_lock (struct kmb_drm_private *kmb,u32 dphy_no) +{ +int i =0 ; +int status =1 ; + +do { +/* TODO-need to add a time out and return failure */ + i++; +if (i >TIMEOUT ) { + status =0 ; + +drm_info (&kmb->drm,"%s: timing out" , __func__); +drm_dbg (&kmb->drm, +"%s : PLL_LOCK = 0x%x " , __func__, +kmb_read_mipi (kmb,DPHY_PLL_LOCK )); + +break ; + } + +if ((i %100 ) ==0 ) +drm_dbg (&kmb->drm, +"%s : PLL_LOCK = 0x%x\n" , __func__, +kmb_read_mipi (kmb,DPHY_PLL_LOCK )); + }while (!GET_PLL_LOCK (kmb, dphy_no)); + +drm_info (&kmb->drm,"***** PLL Locked for DPHY %d - %s *****\n" , + dphy_no, status ?"SUCCESS" :"FAILED" ); +} + +static u32 mipi_tx_init_dphy (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg) +{ +u32 dphy_no =MIPI_DPHY6 ; + +drm_info (&kmb->drm, +"active_lanes=%d lane_rate=%d\n" , cfg->active_lanes, +MIPI_TX_LANE_DATA_RATE_MBPS ); + +/* Multiple D-PHYs needed */ +if (cfg->active_lanes >MIPI_DPHY_D_LANES ) { +/* +*Initialization for Tx aggregation mode is done according to +*a. start init PHY1 +*b. poll for PHY1 FSM state LOCK +* b1. reg addr 0x03[3:0] - state_main[3:0] == 5 (LOCK) +*c. poll for PHY1 calibrations done : +* c1. termination calibration lower section: addr 0x22[5] +* - rescal_done +* c2. slewrate calibration (if data rate < = 1500 Mbps): +* addr 0xA7[3:2] - srcal_done, sr_finished +*d. start init PHY0 +*e. poll for PHY0 stopstate +*f. poll for PHY1 stopstate +*/ +/* PHY #N+1 ('slave') */ + +dphy_init_sequence (kmb, cfg, dphy_no +1 , + (cfg->active_lanes -MIPI_DPHY_D_LANES ), +MIPI_DPHY_SLAVE ); +dphy_wait_fsm (kmb, dphy_no +1 ,DPHY_TX_LOCK ); + +/* PHY #N master */ +dphy_init_sequence (kmb, cfg, dphy_no,MIPI_DPHY_D_LANES , +MIPI_DPHY_MASTER ); + +/* Wait for DPHY init to complete */ +wait_init_done (kmb, dphy_no,MIPI_DPHY_D_LANES ); +wait_init_done (kmb, dphy_no +1 , + cfg->active_lanes -MIPI_DPHY_D_LANES ); +wait_pll_lock (kmb, dphy_no); +wait_pll_lock (kmb, dphy_no +1 ); +dphy_wait_fsm (kmb, dphy_no,DPHY_TX_IDLE ); + }else {/* Single DPHY */ +dphy_init_sequence (kmb, cfg, dphy_no, cfg->active_lanes, +MIPI_DPHY_MASTER ); +dphy_wait_fsm (kmb, dphy_no,DPHY_TX_IDLE ); +wait_init_done (kmb, dphy_no, cfg->active_lanes); +wait_pll_lock (kmb, dphy_no); + } + +return 0 ; +} + +void connect_lcd_to_mipi (struct kmb_drm_private *kmb) +{ +/* DISABLE MIPI->CIF CONNECTION */ +kmb_write_msscam (kmb,MSS_MIPI_CIF_CFG ,0 ); + +/* ENABLE LCD->MIPI CONNECTION */ +kmb_write_msscam (kmb,MSS_LCD_MIPI_CFG ,1 ); + +/* DISABLE LCD->CIF LOOPBACK */ +kmb_write_msscam (kmb,MSS_LOOPBACK_CFG ,0 ); +} + +int kmb_dsi_hw_init (struct drm_device *dev,struct drm_display_mode *mode) +{ +struct kmb_drm_private *kmb =to_kmb (dev); +u64 data_rate; + + mipi_tx_init_cfg.active_lanes =MIPI_TX_ACTIVE_LANES ; + +if (mode) { + mipi_tx_frame0_sect_cfg.width_pixels = mode->crtc_hdisplay; + mipi_tx_frame0_sect_cfg.height_lines = mode->crtc_vdisplay; + mipitx_frame0_cfg.vsync_width = + mode->crtc_vsync_end - mode->crtc_vsync_start; + mipitx_frame0_cfg.v_backporch = + mode->crtc_vtotal - mode->crtc_vsync_end; + mipitx_frame0_cfg.v_frontporch = + mode->crtc_vsync_start - mode->crtc_vdisplay; + mipitx_frame0_cfg.hsync_width = + mode->crtc_hsync_end - mode->crtc_hsync_start; + mipitx_frame0_cfg.h_backporch = + mode->crtc_htotal - mode->crtc_hsync_end; + mipitx_frame0_cfg.h_frontporch = + mode->crtc_hsync_start - mode->crtc_hdisplay; + +/* Lane rate = (vtotal*htotal*fps*bpp)/4 / 1000000 +* to convert to Mbps +*/ + data_rate = ((((u32 )mode->crtc_vtotal * + (u32 )mode->crtc_htotal) * + (u32)(drm_mode_vrefresh (mode)) * +MIPI_TX_BPP ) / mipi_tx_init_cfg.active_lanes) / +1000000 ; + +drm_info (&kmb->drm,"htotal=%d vtotal=%d refresh=%d\n" , + mode->crtc_htotal, mode->crtc_vtotal, +drm_mode_vrefresh (mode)); +drm_info (&kmb->drm,"data_rate=%u active_lanes=%d\n" , + (u32 )data_rate, mipi_tx_init_cfg.active_lanes); + +/* When late rate < 800, modeset fails with 4 lanes, +* so switch to 2 lanes +*/ +if (data_rate <800 ) { + mipi_tx_init_cfg.active_lanes =2 ; + mipi_tx_init_cfg.lane_rate_mbps = data_rate *2 ; + }else { + mipi_tx_init_cfg.lane_rate_mbps = data_rate; + } +drm_info (&kmb->drm, +"lane rate=%d\n" , mipi_tx_init_cfg.lane_rate_mbps); +drm_dbg (&kmb->drm, +"vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%d hsync_len=%d lane-rate=%d" , + mipitx_frame0_cfg.v_frontporch, + mipitx_frame0_cfg.v_backporch, + mipitx_frame0_cfg.vsync_width, + mipitx_frame0_cfg.h_frontporch, + mipitx_frame0_cfg.h_backporch, + mipitx_frame0_cfg.hsync_width, + mipi_tx_init_cfg.lane_rate_mbps); + } + +if (hw_initialized) +return 0 ; + +kmb_write_mipi (kmb,DPHY_ENABLE ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL0 ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL1 ,0 ); +kmb_write_mipi (kmb,DPHY_INIT_CTRL2 ,0 ); + +/* Initialize mipi controller */ +mipi_tx_init_cntrl (kmb, &mipi_tx_init_cfg); + +/* Dphy initialization */ +mipi_tx_init_dphy (kmb, &mipi_tx_init_cfg); +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +connect_lcd_to_mipi (kmb); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x15 ,0xff ,0xff00 ,MIPI_CTRL6 ); + +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); +#endif //MIPI_TX_TEST_PATTERN_GENERATION + + hw_initialized = true; + +drm_dbg (&kmb->drm,"MIPI_TXm_HS_CTRL = 0x%x\n" , +kmb_read_mipi (kmb,MIPI_TXm_HS_CTRL (6 ))); +drm_dbg (&kmb->drm,"MIPI LOOP BACK = %x\n" , +kmb_read_mipi (kmb,MIPI_CTRL_DIG_LOOPBACK )); +drm_info (&kmb->drm,"mipi hw_initialized = %d\n" , hw_initialized); + +return 0 ; +} + +int kmb_dsi_init (struct drm_device *dev,struct drm_bridge *bridge) +{ +struct kmb_dsi *kmb_dsi; +struct drm_encoder *encoder; +struct kmb_connector *kmb_connector; +struct drm_connector *connector; +struct kmb_dsi_host *host; +int ret =0 ; + + kmb_dsi =kzalloc (sizeof (*kmb_dsi),GFP_KERNEL ); +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); +DRM_ERROR ("failed to allocate kmb_connector\n" ); +return -ENOMEM ; + } + + kmb_dsi->attached_connector = kmb_connector; + + host =kmb_dsi_host_init (dev, kmb_dsi); +if (!host) { +DRM_ERROR ("Failed to allocate host\n" ); +kfree (kmb_dsi); +kfree (kmb_connector); +return -ENOMEM ; + } + + kmb_dsi->dsi_host = host; + 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" ); + +drm_connector_init (dev, connector, &kmb_dsi_connector_funcs, +DRM_MODE_CONNECTOR_DSI ); + +drm_connector_helper_add (connector, &kmb_dsi_connector_helper_funcs); + +drm_info (dev,"connector = %s encoder = %s\n" , connector->name, + encoder->name); + + ret =drm_connector_attach_encoder (connector, encoder); +drm_info (dev,"connector->encoder = 0x%p ret = %d\n" , + connector->encoder, + ret); + +/* Link drm_bridge to encoder */ + ret =drm_bridge_attach (encoder, bridge,NULL ,0 );Lines of this file are not shown. View the raw message.
drivers/gpu/drm/kmb/kmb_dsi.h new file +370
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/kmb/kmb_plane.c new file +475
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is incorrect. You allocate with drmm_kzalloc() but free with kfree() in the plane's destroy callback. Memory returned by drmm_kzalloc wil be freed by DRM automatically.
Instead of allocating each plane individually, it's better to allocate the whole plane array with drmm_kzalloc() first and that's all you need. The plane init loop then doesn't have to bother about memory allocation/freeing.
drivers/gpu/drm/kmb/kmb_regs.h
Quoted 205 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +44
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/kmb/kmb_plane.h new file +124
-0Lines of this file are not shown. View the raw message.
drivers/gpu/drm/kmb/kmb_regs.h new file +25
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
What's the point of shifting 0 by 0?
Quoted 724 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +723
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
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.
Chrisanthus, Anitha
maintainerRE: [PATCH v6] drm/kmb: Add support for KeemBay Display
Hi Thomas,
Thanks a lot for the review - very helpful. I will address your comments in v7. For those that are not addressed, please see my reply inline.
Anitha
Quoted 1,016 lines
-----Original Message-----
From: Thomas Zimmermann <[email protected]>
Sent: Friday, August 21, 2020 1:30 AM
To: Chrisanthus, Anitha <[email protected]>; dri- [email protected]; Paauwe, Bob J <[email protected]>; Dea, Edmund J <[email protected]>
Cc: Vetter, Daniel <[email protected]>; intel- [email protected]; [email protected]
Subject: Re: [PATCH v6] drm/kmb: Add support for KeemBay DisplayHi,
thanks for the driver. Please see my comments below for a (partial) review.
Best regards
ThomasAm 10.08.20 um 23:53 schrieb Anitha Chrisanthus:
Quoted 1 line
This is a basic KMS atomic modesetting display driver for KeemBay family
of
Quoted 24 lines
SOCs. Driver has no 2D or 3D graphics.It calls into the ADV bridge driver at the connector level.
Single CRTC with LCD
controller->mipiDSI-> ADV bridgeOnly 1080p resolution and single plane is supported at this time.
v2: moved extern to .h, removed license text
usedrm_dev_init, upclasseddev_private, removedHAVE_IRQ.v3: Squashed all 59 commits to one
v4: review changes from Sam Ravnborg
renameddev_pto kmb
moved clocks underkmb_clock, consolidated clk initializations use drmm functions
useDRM_GEM_CMA_DRIVER_OPS_VMAPv5: corrected spellings
v6: corrected checkpatch warningsCc Sam Ravnborg <[email protected]>Signed-off-by Anitha Chrisanthus <[email protected]>Reviewed-by Bob Paauwe <[email protected]>Quoted 10 lines
--- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/kmb/Kconfig | 13 + drivers/gpu/drm/kmb/Makefile | 2 + drivers/gpu/drm/kmb/kmb_crtc.c | 217 +++++ drivers/gpu/drm/kmb/kmb_crtc.h | 36 + drivers/gpu/drm/kmb/kmb_drv.c | 725 ++++++++++++++++ drivers/gpu/drm/kmb/kmb_drv.h | 172 ++++ drivers/gpu/drm/kmb/kmb_dsi.c | 1828+++++++++++++++++++++++++++++++++++++++
Review
Quoted 43 lines
drivers/gpu/drm/kmb/kmb_dsi.h | 370 ++++++++ drivers/gpu/drm/kmb/kmb_plane.c | 519 +++++++++++ drivers/gpu/drm/kmb/kmb_plane.h | 124 +++ drivers/gpu/drm/kmb/kmb_regs.h | 748 ++++++++++++++++ 13 files changed, 4757 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.hdrivers/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 DRMdrivers/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/(quoted diff) +0
-0b/drivers/gpu/drm/kmb/Kconfig
Quoted 5 lines
new file mode 100644
index 0000000..e18b74cdrivers/gpu/drm/kmb/Kconfig line 10
Quoted 10 lines
drivers/gpu/drm/kmb/Kconfig new file +10
-0@@ -0,0 +1,13 @@ +config DRM_KMB_DISPLAY + tristate "INTEL 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 Intel's KeemBay SOC whichintegrates
Review
Quoted 4 lines
drivers/gpu/drm/kmb/Kconfig new file +3
-0+ an ARM Cortex A53 CPU with an Intel Movidius VPU. + + If M is selected the module will be called kmb-drm.(quoted diff) +0
-0b/drivers/gpu/drm/kmb/Makefile
Review
Quoted 8 lines
new file mode 100644
index 0000000..527d737drivers/gpu/drm/kmb/Makefile new file +2
-0@@ -0,0 +1,2 @@ +kmb-drm-y := kmb_crtc.o kmb_drv.o kmb_plane.o kmb_dsi.o +obj-$(CONFIG_DRM_KMB_DISPLAY) += kmb-drm.o(quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_crtc.cQuoted 21 lines
new file mode 100644
index 0000000..dfb6946drivers/gpu/drm/kmb/kmb_crtc.c new file +16
-0@@ -0,0 +1,217 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2018-2020 Intel Corporation +*/ + +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> + +#include <video/videomode.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_cma_helper.h> drivers/gpu/drm/kmb/kmb_crtc.c line 26
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_plane_helper.h> + +#include "kmb_crtc.h" +#include "kmb_drv.h" +#include "kmb_plane.h" +#include "kmb_regs.h" +#include "kmb_dsi.h" This include block needs to be sorted alphabetically.
drivers/gpu/drm/kmb/kmb_crtc.c line 31
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +5
-0+ +static void kmb_crtc_cleanup (struct drm_crtc *crtc) +{ +drm_crtc_cleanup (crtc); +}Leave out the wrapper and use
drm_crtc_cleanup()directly.Quoted 25 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +25
-0+ +static int kmb_crtc_enable_vblank (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +/* Clear interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +/* Set which interval to generate vertical interrupt */ +kmb_write_lcd (kmb,LCD_VSTATUS_COMPARE , +LCD_VSTATUS_COMPARE_VSYNC ); +/* Enable vertical interrupt */ +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); +return 0 ; +} + +static void kmb_crtc_disable_vblank (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +/* Clear interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_VERT_COMP ); +/* Disable vertical interrupt */ drivers/gpu/drm/kmb/kmb_crtc.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); +} + +static const struct drm_crtc_funcs kmb_crtc_funcs = { + .destroy = kmb_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .reset = drm_atomic_helper_crtc_reset, + .atomic_duplicate_state =
drm_atomic_helper_crtc_duplicate_state,drivers/gpu/drm/kmb/kmb_crtc.c line 72
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +6
-0+ .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = kmb_crtc_enable_vblank, + .disable_vblank = kmb_crtc_disable_vblank, +}; + +static void kmb_crtc_mode_set_nofb (struct drm_crtc *crtc)This name sounds a lot like the old non-atomic driver interface. To avoid confusion, I'd suggest to call it
kmb_crtc_set_mode().drivers/gpu/drm/kmb/kmb_crtc.c
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +13
-0+{ +struct drm_device *dev = crtc->dev; +struct drm_display_mode *m = &crtc->state->adjusted_mode; +struct kmb_crtc_timing vm; +int vsync_start_offset; +int vsync_end_offset; +struct kmb_drm_private *kmb =to_kmb (dev); +unsigned int val =0 ; + +/* Initialize mipi */ +kmb_dsi_hw_init (dev, m); + drm_info(dev, + "vfp= %d vbp= %d vsyc_len=%d hfp=%d hbp=%dhsync_len=%d\n",
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+ m->crtc_vsync_start - m->crtc_vdisplay, + m->crtc_vtotal - m->crtc_vsync_end, + m->crtc_vsync_end - m->crtc_vsync_start, + m->crtc_hsync_start - m->crtc_hdisplay, + m->crtc_htotal - m->crtc_hsync_end, + m->crtc_hsync_end - m->crtc_hsync_start); + val =kmb_read_lcd (kmb,LCD_INT_ENABLE ); +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , val); +kmb_set_bitmask_lcd (kmb,LCD_INT_CLEAR , ~0x0 ); + vm.vfront_porch =2 ;drivers/gpu/drm/kmb/kmb_crtc.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+ vm.vback_porch =2 ; + vm.vsync_len =8 ; + vm.hfront_porch =0 ; + vm.hback_porch =0 ; + vm.hsync_len =28 ; + + vsync_start_offset = m->crtc_vsync_start - m->crtc_hsync_start; + vsync_end_offset = m->crtc_vsync_end - m->crtc_hsync_end; + + drm_dbg(dev, "%s : %dactive height= %d vbp=%d vfp=%d vsync-w=%d h-active=%d h-bp=%d h-fp=%d hysnc-l=%d",
drivers/gpu/drm/kmb/kmb_crtc.c line 107
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2
-0+ __func__, __LINE__, + m->crtc_vdisplay, vm.vback_porch,vm.vfront_porch,
drivers/gpu/drm/kmb/kmb_crtc.c line 109
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +2
-0+ vm.vsync_len, m->crtc_hdisplay, vm.hback_porch, + vm.hfront_porch, vm.hsync_len);It might just be because of the email fornmting, but the indention appears to be wrong here.
Quoted 39 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +39
-0+kmb_write_lcd (kmb,LCD_V_ACTIVEHEIGHT , + m->crtc_vdisplay -1 ); +kmb_write_lcd (kmb,LCD_V_BACKPORCH , vm.vback_porch); +kmb_write_lcd (kmb,LCD_V_FRONTPORCH , vm.vfront_porch); +kmb_write_lcd (kmb,LCD_VSYNC_WIDTH , vm.vsync_len -1 ); +kmb_write_lcd (kmb,LCD_H_ACTIVEWIDTH , + m->crtc_hdisplay -1 ); +kmb_write_lcd (kmb,LCD_H_BACKPORCH , vm.hback_porch); +kmb_write_lcd (kmb,LCD_H_FRONTPORCH , vm.hfront_porch); +kmb_write_lcd (kmb,LCD_HSYNC_WIDTH , vm.hsync_len -1 ); +/* This is hardcoded as 0 in the Myriadx code */ +kmb_write_lcd (kmb,LCD_VSYNC_START ,0 ); +kmb_write_lcd (kmb,LCD_VSYNC_END ,0 ); +/* Back ground color */ +kmb_write_lcd (kmb,LCD_BG_COLOUR_LS ,0x4 ); +if (m->flags ==DRM_MODE_FLAG_INTERLACE ) { +kmb_write_lcd (kmb, +LCD_VSYNC_WIDTH_EVEN , vm.vsync_len -1 ); +kmb_write_lcd (kmb, +LCD_V_BACKPORCH_EVEN , vm.vback_porch); +kmb_write_lcd (kmb, +LCD_V_FRONTPORCH_EVEN , vm.vfront_porch); +kmb_write_lcd (kmb,LCD_V_ACTIVEHEIGHT_EVEN , + m->crtc_vdisplay -1 ); +/* This is hardcoded as 10 in the Myriadx code */ +kmb_write_lcd (kmb,LCD_VSYNC_START_EVEN ,10 ); +kmb_write_lcd (kmb,LCD_VSYNC_END_EVEN ,10 ); + } +kmb_write_lcd (kmb,LCD_TIMING_GEN_TRIG ,ENABLE ); +kmb_set_bitmask_lcd (kmb,LCD_CONTROL ,LCD_CTRL_ENABLE ); +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE , val); +} + +static void kmb_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc); + +clk_prepare_enable (lcd->clk);drivers/gpu/drm/kmb/kmb_crtc.c line 158
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +10
-0+kmb_crtc_mode_set_nofb (crtc); +drm_crtc_vblank_on (crtc); +} + +static void kmb_crtc_atomic_disable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) +{ +struct kmb_drm_private *lcd =crtc_to_kmb_priv (crtc); + +/* Always disable planes on the CRTC that is being turned off */ Instead of this general note, rather put here a rational for why disabling planes is requires. Because usually DRM's atomic helpers take take of all this.
Review
Quoted 61 lines
drivers/gpu/drm/kmb/kmb_crtc.c new file +50
-0+drm_atomic_helper_disable_planes_on_crtc (old_state, false); + +drm_crtc_vblank_off (crtc); +clk_disable_unprepare (lcd->clk); +} + +static void kmb_crtc_atomic_begin (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); +} + +static void kmb_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_crtc_state *state) +{ +struct drm_device *dev = crtc->dev; +struct kmb_drm_private *kmb =to_kmb (dev); + +kmb_set_bitmask_lcd (kmb,LCD_INT_ENABLE , +LCD_INT_VERT_COMP ); + +spin_lock_irq (&crtc->dev->event_lock); +if (crtc->state->event) +drm_crtc_send_vblank_event (crtc, crtc->state->event); + crtc->state->event =NULL ; +spin_unlock_irq (&crtc->dev->event_lock); +} + +static const struct drm_crtc_helper_funcs kmb_crtc_helper_funcs = { + .atomic_begin = kmb_crtc_atomic_begin, + .atomic_enable = kmb_crtc_atomic_enable, + .atomic_disable = kmb_crtc_atomic_disable, + .atomic_flush = kmb_crtc_atomic_flush, +}; + +int kmb_setup_crtc (struct drm_device *drm) +{ +struct kmb_drm_private *kmb =to_kmb (drm); +struct kmb_plane *primary; +int ret; + + primary =kmb_plane_init (drm); +if (IS_ERR (primary)) +return PTR_ERR (primary); + + ret = drm_crtc_init_with_planes(drm, &kmb->crtc, &primary-
base_plane,drivers/gpu/drm/kmb/kmb_crtc.c new file +9
-0+ NULL, &kmb_crtc_funcs, NULL); +if (ret) { +kmb_plane_destroy (&primary->base_plane); +return ret; + } + +drm_crtc_helper_add (&kmb->crtc, &kmb_crtc_helper_funcs); +return 0 ; +}(quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_crtc.hQuoted 20 lines
new file mode 100644
index 0000000..d363066drivers/gpu/drm/kmb/kmb_crtc.h new file +15
-0@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Copyright © 2018-2020 Intel Corporation +*/ + +#ifndef __KMB_CRTC_H__ +#define __KMB_CRTC_H__ + +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> +#include <video/videomode.h> +#include <drm/drm_debugfs.h> +#include <drm/drm_device.h> +#include <drm/drm_drv.h> drivers/gpu/drm/kmb/kmb_crtc.h line 25
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_crtc.h new file +10
-0+#include <drm/drm_fb_helper.h> +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> +#include <linux/wait.h> +#include "kmb_drv.h" This include block needs to be cleaned up or even removed. You're including tons of files for adecalring a trivial structure. Do you actually need
kmb_crtc.h?Review
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_crtc.h new file +11
-0+ +struct kmb_crtc_timing { +u32 vfront_porch; +u32 vback_porch; +u32 vsync_len; +u32 hfront_porch; +u32 hback_porch; +u32 hsync_len; +}; + +#endif /* __KMB_CRTC_H__ */ (quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_drv.cQuoted 29 lines
new file mode 100644
index 0000000..255048fdrivers/gpu/drm/kmb/kmb_drv.c new file +24
-0@@ -0,0 +1,725 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2018-2020 Intel Corporation +*/ + +#include <linux/clk.h> +#include <linux/console.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/of_graph.h> +#include <linux/of_reserved_mem.h> +#include <linux/pm_runtime.h> +#include <linux/spinlock.h> + +#include <drm/drm.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_ioctl.h> +#include <drm/drm_irq.h> drivers/gpu/drm/kmb/kmb_drv.c line 34
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+#include <drm/drm_of.h> +#include <drm/drm_probe_helper.h> + +#include "kmb_crtc.h" +#include "kmb_drv.h" +#include "kmb_dsi.h" +#include "kmb_plane.h" +#include "kmb_regs.h" + +/* #define DEBUG */ This line is noise. Please remove or document.
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +13
-0+ +int kmb_under_flow =0 , kmb_flush_done =0 , layer_no =0 ; +static struct kmb_clock kmb_clk; + +static struct drm_bridge *adv_bridge; + +int kmb_display_clk_enable (struct kmb_drm_private *kmb) +{ +int ret =0 ; + + ret =clk_prepare_enable (kmb_clk.clk_lcd); +if (ret) { + drm_err(&kmb->drm, "Failed to enable LCD clock: %d\n",ret);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6
-0+return ret; + } + + ret =clk_prepare_enable (kmb_clk.clk_mipi); +if (ret) { + drm_err(&kmb->drm, "Failed to enable MIPI clock: %d\n",ret);
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11
-0+return ret; + } + + ret =clk_prepare_enable (kmb_clk.clk_mipi_ecfg); +if (ret) { +drm_err (&kmb->drm, +"Failed to enable MIPI_ECFG clock: %d\n" , ret); +return ret; + } + + ret =clk_prepare_enable (kmb_clk.clk_mipi_cfg);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+if (ret) { +drm_err (&kmb->drm, +"Failed to enable MIPI_CFG clock: %d\n" , ret); +return ret; + } +DRM_INFO ("SUCCESS : enabled LCD MIPI clocks\n" ); +return 0 ; +} + +int kmb_initialize_clocks(struct kmb_drm_private *kmb, struct device*dev)
Quoted 36 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +36
-0+{ +struct device_node *vpu_dev; +unsigned long clk; +int ret =0 ; + + kmb_clk.clk_lcd =clk_get (dev,"clk_lcd" ); +if (IS_ERR (kmb_clk.clk_lcd)) { +drm_err (&kmb->drm,"clk_get() failed clk_lcd\n" ); +return PTR_ERR (kmb_clk.clk_lcd); + } + + kmb_clk.clk_mipi =clk_get (dev,"clk_mipi" ); +if (IS_ERR (kmb_clk.clk_mipi)) { +drm_err (&kmb->drm,"clk_get() failed clk_mipi\n" ); +return PTR_ERR (kmb_clk.clk_mipi); + } + + kmb_clk.clk_mipi_ecfg =clk_get (dev,"clk_mipi_ecfg" ); +if (IS_ERR (kmb_clk.clk_mipi_ecfg)) { +drm_err (&kmb->drm,"clk_get() failed clk_mipi_ecfg\n" ); +return PTR_ERR (kmb_clk.clk_mipi_ecfg); + } + + kmb_clk.clk_mipi_cfg =clk_get (dev,"clk_mipi_cfg" ); +if (IS_ERR (kmb_clk.clk_mipi_cfg)) { +drm_err (&kmb->drm,"clk_get() failed clk_mipi_cfg\n" ); +return PTR_ERR (kmb_clk.clk_mipi_cfg); + } + vpu_dev =of_find_node_by_path ("/soc/vpu-ipc" ); + kmb_clk.clk_pll0 =of_clk_get_by_name (vpu_dev,"pll_0_out_0" ); +if (IS_ERR (kmb_clk.clk_pll0)) { +drm_err (&kmb->drm,"clk_get() failed clk_pll0 " ); +return PTR_ERR (kmb_clk.clk_pll0); + } + kmb->sys_clk_mhz =clk_get_rate (kmb_clk.clk_pll0) /1000000 ; + drm_info(&kmb->drm, "system clk = %d Mhz", kmb-Quoted 1 line
sys_clk_mhz);All these
drm_infomessages are really just noise. It' should bedrm_dbg_()of some kind; or drm_warn()/drm_err() if it reports an actual problem. Here and through-out the rest of the driver.drivers/gpu/drm/kmb/kmb_drv.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9
-0+ +/* Set LCD clock to 200 Mhz */ +clk_set_rate (kmb_clk.clk_lcd,KMB_LCD_DEFAULT_CLK ); +if (clk_get_rate (kmb_clk.clk_lcd) !=KMB_LCD_DEFAULT_CLK ) { +drm_err (&kmb->drm,"failed to set to clk_lcd to %d\n" , +KMB_LCD_DEFAULT_CLK ); +return -1 ; + } + drm_info(&kmb->drm, "clk_lcd = %ld\n",
clk_get_rate(kmb_clk.clk_lcd));drivers/gpu/drm/kmb/kmb_drv.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9
-0+ +/* Set MIPI clock to 24 Mhz */ +clk_set_rate (kmb_clk.clk_mipi,KMB_MIPI_DEFAULT_CLK ); +if (clk_get_rate (kmb_clk.clk_mipi) !=KMB_MIPI_DEFAULT_CLK ) { +drm_err (&kmb->drm,"failed to set to clk_mipi to %d\n" , +KMB_MIPI_DEFAULT_CLK ); +return -1 ; + } + drm_info(&kmb->drm, "clk_mipi = %ld\n",
clk_get_rate(kmb_clk.clk_mipi));drivers/gpu/drm/kmb/kmb_drv.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+ + clk =clk_get_rate (kmb_clk.clk_mipi_ecfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +/* Set MIPI_ECFG clock to 24 Mhz */ + clk_set_rate(kmb_clk.clk_mipi_ecfg,
KMB_MIPI_DEFAULT_CFG_CLK);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9
-0+ clk =clk_get_rate (kmb_clk.clk_mipi_ecfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +drm_err (&kmb->drm, +"failed to set to clk_mipi_ecfg to %d\n" , +KMB_MIPI_DEFAULT_CFG_CLK ); +return -1 ; + } + + drm_info(&kmb->drm, "clk_mipi_ecfg after set = %ld\n",clk);
Quoted 37 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +37
-0+ } + + clk =clk_get_rate (kmb_clk.clk_mipi_cfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +/* Set MIPI_CFG clock to 24 Mhz */ +clk_set_rate (kmb_clk.clk_mipi_cfg,24000000 ); + clk =clk_get_rate (kmb_clk.clk_mipi_cfg); +if (clk !=KMB_MIPI_DEFAULT_CFG_CLK ) { +drm_err (&kmb->drm, +"failed to set clk_mipi_cfg to %d\n" , +KMB_MIPI_DEFAULT_CFG_CLK ); +return -1 ; + } +drm_info (&kmb->drm, +"Get clk_mipi_cfg after set = %ld\n" , clk); + } + + ret =kmb_display_clk_enable (kmb); +if (ret) +return ret; + +/* Enable MSS_CAM_CLK_CTRL for MIPI TX and LCD */ +kmb_set_bitmask_msscam (kmb,MSS_CAM_CLK_CTRL ,0x1fff ); +kmb_set_bitmask_msscam (kmb,MSS_CAM_RSTN_CTRL ,0xffffffff ); +return 0 ; +} + +static int kmb_display_clk_disable (void ) +{ +if (kmb_clk.clk_lcd) +clk_disable_unprepare (kmb_clk.clk_lcd); +if (kmb_clk.clk_mipi) +clk_disable_unprepare (kmb_clk.clk_mipi); +if (kmb_clk.clk_mipi_ecfg) +clk_disable_unprepare (kmb_clk.clk_mipi_ecfg); +if (kmb_clk.clk_mipi_cfg) +clk_disable_unprepare (kmb_clk.clk_mipi_cfg);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+return 0 ; +} + +static void __iomem *kmb_map_mmio (struct device *dev,char *name) +{ +struct resource *res; +struct platform_device *pdev =to_platform_device (dev); +void __iomem *mem; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM,name);
drivers/gpu/drm/kmb/kmb_drv.c line 191
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+if (!res) { +DRM_ERROR ("failed to get resource for %s\n" , name);These old logging macros have to be replaced by
drm_err()et al. Here and everywere else.drivers/gpu/drm/kmb/kmb_drv.c line 200
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9
-0+return ERR_PTR (-ENOMEM ); + } + mem =devm_ioremap_resource (dev, res); +if (IS_ERR (mem)) +DRM_ERROR ("failed to ioremap %s registers\n" , name); +return mem; +} + +static int kmb_load (struct drm_device *drm,unsigned long flags)Load and unload are names of deprecated interfaces in struct
drm_driver. Better not use them to avoid confusion. But also see my comments on restructuring the device setup: load and unload should go away IMHO.Quoted 15 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +15
-0+{ +struct kmb_drm_private *kmb =to_kmb (drm); +struct platform_device *pdev =to_platform_device (drm->dev); +int irq_lcd; +int ret =0 ; + +/* Map LCD MMIO registers */ + kmb->lcd_mmio =kmb_map_mmio (drm->dev,"lcd_regs" ); +if (IS_ERR (kmb->lcd_mmio)) { +drm_err (&kmb->drm,"failed to map LCD registers\n" ); +return -ENOMEM ; + } + +/* Map MIPI MMIO registers */ + kmb->mipi_mmio =kmb_map_mmio (drm->dev,"mipi_regs" );drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+if (IS_ERR (kmb->mipi_mmio)) { +drm_err (&kmb->drm,"failed to map MIPI registers\n" ); +iounmap (kmb->lcd_mmio); +return -ENOMEM ; + } + +/* This is only for MIPI_TX_MSS_LCD_MIPI_CFG and +* MSS_CAM_CLK_CTRL register +*/ + kmb->msscam_mmio = kmb_map_mmio(drm->dev,"
msscam_regs");drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+if (IS_ERR (kmb->msscam_mmio)) { + drm_err(&kmb->drm, "failed to map MSSCAMregisters\n");
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7
-0+iounmap (kmb->lcd_mmio); +iounmap (kmb->mipi_mmio); +return -ENOMEM ; + } + +if (IS_ERR (kmb->msscam_mmio)) { + drm_err(&kmb->drm, "failed to map MSSCAMregisters\n");
Quoted 54 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +54
-0+iounmap (kmb->lcd_mmio); +iounmap (kmb->mipi_mmio); +return -ENOMEM ; + } +/* Enable display clocks */ +kmb_initialize_clocks (kmb, &pdev->dev); + +/* Register irqs here - section 17.3 in databook +* lists LCD at 79 and 82 for MIPI under MSS CPU - +* firmware has redirected 79 to A53 IRQ 33 +*/ + +/* Allocate LCD interrupt resources, enable interrupt line, +* and setup IRQ handling +*/ + irq_lcd =platform_get_irq_byname (pdev,"irq_lcd" ); +if (irq_lcd <0 ) { +drm_err (&kmb->drm,"irq_lcd not found" ); + goto setup_fail; + } + +/* Get the optional framebuffer memory resource */ + ret =of_reserved_mem_device_init (drm->dev); +if (ret && ret != -ENODEV ) +return ret; + +spin_lock_init (&kmb->irq_lock); + + ret =kmb_setup_crtc (drm); +if (ret <0 ) { +drm_err (&kmb->drm,"failed to create crtc\n" ); + goto setup_fail; + } + +/* Initialize MIPI DSI */ + ret =kmb_dsi_init (drm, adv_bridge); +if (ret) { +drm_err (&kmb->drm,"failed to initialize DSI\n" ); + goto setup_fail; + } + + ret =drm_irq_install (drm, irq_lcd); +if (ret <0 ) { +drm_err (&kmb->drm,"failed to install IRQ handler\n" ); + goto irq_fail; + } + + kmb->irq_lcd = irq_lcd; + +return 0 ; + + irq_fail: +drm_crtc_cleanup (&kmb->crtc); + setup_fail:drivers/gpu/drm/kmb/kmb_drv.c line 298
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+of_reserved_mem_device_release (drm->dev); + +return ret; +} + +int kmb_atomic_helper_check (struct drm_device *dev, +struct drm_atomic_state *state) +{ +if (!state) +return 0 ;Why is this necessary?
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +12
-0+ +return drm_atomic_helper_check (dev, state); +} + +static const struct drm_mode_config_funcs kmb_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = kmb_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static int kmb_setup_mode_config (struct drm_device *drm) +{drivers/gpu/drm/kmb/kmb_drv.c line 320
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+int ret; + + ret =drmm_mode_config_init (drm); +if (ret) +return ret; + drm->mode_config.min_width =KMB_MIN_WIDTH ; + drm->mode_config.min_height =KMB_MIN_HEIGHT ; + drm->mode_config.max_width =KMB_MAX_WIDTH ; + drm->mode_config.max_height =KMB_MAX_HEIGHT ; + drm->mode_config.funcs = &kmb_mode_config_funcs;Setup your CRTCs, planes, encoders, etc here. Then do
drm_mode_config_reset()to initialize all state.Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+return 0 ; +} + +static irqreturn_t handle_lcd_irq (struct drm_device *dev) +{drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+unsigned long status, val, val1; +int plane_id, dma0_state, dma1_state; +struct kmb_drm_private *kmb =to_kmb (dev); + + status =kmb_read_lcd (kmb,LCD_INT_STATUS ); + +if (status &LCD_INT_EOF ) { +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_EOF ); + +/* When disabling/enabling LCD layers, the change takes effect
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+* immediately and does not wait for EOF (end of frame). +* When kmb_plane_atomic_disable is called, mark the plane as
drivers/gpu/drm/kmb/kmb_drv.c line 348
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+* disabled but actually disable the plane when EOF irq is +* being handled. +*/ +for (plane_id =LAYER_0 ; + plane_id < kmb->n_layers; plane_id++) { +if (plane_status[plane_id].disable) { + kmb_clr_bitmask_lcd(kmb, + LCD_LAYERn_DMA_CFG + (plane_id), +
LCD_DMA_LAYER_ENABLE);drivers/gpu/drm/kmb/kmb_drv.c line 351
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+ + kmb_clr_bitmask_lcd(kmb, LCD_CONTROL, +plane_status[plane_id].ctrl);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8
-0+ + plane_status[plane_id].disable = false; + } + } +if (kmb_under_flow) { +/* DMA Recovery after underflow */ + dma0_state = (layer_no ==0 ) ? + LCD_VIDEO0_DMA0_STATE :
LCD_VIDEO1_DMA0_STATE;drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+ dma1_state = (layer_no ==0 ) ? + LCD_VIDEO0_DMA1_STATE :
LCD_VIDEO1_DMA1_STATE;drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ +do { +kmb_write_lcd (kmb,LCD_FIFO_FLUSH ,1 ); + val =kmb_read_lcd (kmb, dma0_state) + &LCD_DMA_STATE_ACTIVE ; + val1 =kmb_read_lcd (kmb, dma1_state) + &LCD_DMA_STATE_ACTIVE ; + }while ((val || val1)); +/* disable dma */ + kmb_clr_bitmask_lcd(kmb,
LCD_LAYERn_DMA_CFG(layer_no),Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ LCD_DMA_LAYER_ENABLE); +kmb_write_lcd (kmb,LCD_FIFO_FLUSH ,1 ); + kmb_flush_done =1 ; + kmb_under_flow =0 ; + } + } + +if (status &LCD_INT_LINE_CMP ) { +/* clear line compare interrupt */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_LINE_CMP );drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ } + +if (status &LCD_INT_VERT_COMP ) { +/* Read VSTATUS */ + val =kmb_read_lcd (kmb,LCD_VSTATUS ); + val = (val &LCD_VSTATUS_VERTICAL_STATUS_MASK ); +switch (val) { +case LCD_VSTATUS_COMPARE_VSYNC : +/* Clear vertical compare interrupt */ + kmb_write_lcd(kmb, LCD_INT_CLEAR,
LCD_INT_VERT_COMP);drivers/gpu/drm/kmb/kmb_drv.c line 433
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+if (kmb_flush_done) { + kmb_set_bitmask_lcd(kmb, + LCD_LAYERn_DMA_CFG + (layer_no), +
LCD_DMA_LAYER_ENABLE);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8
-0+ kmb_flush_done =0 ; + } +drm_handle_vblank (dev,0 ); +break ; +case LCD_VSTATUS_COMPARE_BACKPORCH : +case LCD_VSTATUS_COMPARE_ACTIVE : +case LCD_VSTATUS_COMPARE_FRONT_PORCH : + kmb_write_lcd(kmb, LCD_INT_CLEAR,
LCD_INT_VERT_COMP);Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4
-0+break ; + } + } +if (status &LCD_INT_DMA_ERR ) {drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ val = + (status &LCD_INT_DMA_ERR & +kmb_read_lcd (kmb,LCD_INT_ENABLE )); +/* LAYER0 - VL0 */ +if (val & (LAYER0_DMA_FIFO_UNDERFLOW | +LAYER0_DMA_CB_FIFO_UNDERFLOW | +LAYER0_DMA_CR_FIFO_UNDERFLOW )) { + kmb_under_flow++; + drm_info(&kmb->drm, + "!LAYER0:VL0 DMA UNDERFLOW val =0x%lx,under_flow=%d",
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4
-0+ val, kmb_under_flow); +/* disable underflow interrupt */ +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , + LAYER0_DMA_FIFO_UNDERFLOW|
Quoted 1 line
+
LAYER0_DMA_CB_FIFO_UNDERFLOW|Quoted 1 line
+
LAYER0_DMA_CR_FIFO_UNDERFLOW);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+ kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, +
LAYER0_DMA_CB_FIFO_UNDERFLOW|drivers/gpu/drm/kmb/kmb_drv.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1
-0+LAYER0_DMA_FIFO_UNDERFLOW |
Quoted 1 line
+
LAYER0_DMA_CR_FIFO_UNDERFLOW);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+/* disable auto restart mode */ + kmb_clr_bitmask_lcd(kmb,
LCD_LAYERn_DMA_CFG(0),Quoted 1 line
+
LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6
-0+ layer_no =0 ; + } + +if (val &LAYER0_DMA_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER0:VL0 DMA OVERFLOW val = 0x%lx",val);
You're not really doing anything here and in the branches below. This looks like debugging code, so it should use drm_dbg_*(). If it's a n error it should use
drm_warn()ordrm_err().drivers/gpu/drm/kmb/kmb_drv.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+if (val &LAYER0_DMA_CB_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER0:VL0 DMA CB OVERFLOW val =0x%lx", val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+if (val &LAYER0_DMA_CR_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER0:VL0 DMA CR OVERFLOW val =0x%lx", val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8
-0+ +/* LAYER1 - VL1 */ +if (val & (LAYER1_DMA_FIFO_UNDERFLOW | +LAYER1_DMA_CB_FIFO_UNDERFLOW | +LAYER1_DMA_CR_FIFO_UNDERFLOW )) { + kmb_under_flow++; + drm_info(&kmb->drm, + "!LAYER1:VL1 DMA UNDERFLOW val =0x%lx, under_flow=%d",
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4
-0+ val, kmb_under_flow); +/* disable underflow interrupt */ +kmb_clr_bitmask_lcd (kmb,LCD_INT_ENABLE , + LAYER1_DMA_FIFO_UNDERFLOW|
Quoted 1 line
+
LAYER1_DMA_CB_FIFO_UNDERFLOW|Quoted 1 line
+
LAYER1_DMA_CR_FIFO_UNDERFLOW);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+ kmb_set_bitmask_lcd(kmb, LCD_INT_CLEAR, +
LAYER1_DMA_CB_FIFO_UNDERFLOW|drivers/gpu/drm/kmb/kmb_drv.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1
-0+LAYER1_DMA_FIFO_UNDERFLOW |
Quoted 1 line
+
LAYER1_DMA_CR_FIFO_UNDERFLOW);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+/* disable auto restart mode */ + kmb_clr_bitmask_lcd(kmb,
LCD_LAYERn_DMA_CFG(1),Quoted 1 line
+
LCD_DMA_LAYER_CONT_PING_PONG_UPDATE);drivers/gpu/drm/kmb/kmb_drv.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7
-0+ layer_no =1 ; + } + +/* LAYER1 - VL1 */ +if (val &LAYER1_DMA_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER1:VL1 DMA OVERFLOW val = 0x%lx",val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+if (val &LAYER1_DMA_CB_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER1:VL1 DMA CB OVERFLOW val =0x%lx", val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+if (val &LAYER1_DMA_CR_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER1:VL1 DMA CR OVERFLOW val =0x%lx", val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+ +/* LAYER2 - GL0 */ +if (val &LAYER2_DMA_FIFO_UNDERFLOW ) + drm_info(&kmb->drm, + "LAYER2:GL0 DMA UNDERFLOW val =0x%lx", val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+if (val &LAYER2_DMA_FIFO_OVERFLOW ) + drm_info(&kmb->drm, + "LAYER2:GL0 DMA OVERFLOW val = 0x%lx",val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+ +/* LAYER3 - GL1 */ +if (val &LAYER3_DMA_FIFO_UNDERFLOW ) + drm_info(&kmb->drm, + "LAYER3:GL1 DMA UNDERFLOW val =0x%lx", val);
drivers/gpu/drm/kmb/kmb_drv.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+if (val &LAYER3_DMA_FIFO_UNDERFLOW ) + drm_info(&kmb->drm, + "LAYER3:GL1 DMA OVERFLOW val = 0x%lx",val);
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +13
-0+ } + +if (status &LCD_INT_LAYER ) { +/* Clear layer interrupts */ +kmb_write_lcd (kmb,LCD_INT_CLEAR ,LCD_INT_LAYER ); + } + +/* Clear all interrupts */ +kmb_set_bitmask_lcd (kmb,LCD_INT_CLEAR ,1 ); +return IRQ_HANDLED ; +} + +/* IRQ handler */
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c line 511
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +6
-0+static irqreturn_t kmb_isr (int irq,void *arg) +{ +struct drm_device *dev = (struct drm_device *)arg; +irqreturn_t ret =IRQ_NONE ; + + ret =handle_lcd_irq (dev);There's no need for 'ret'. Or maybe just inline
handle_lcd_irq
Looked at other drivers, most of them are returning IRQ_HANDLED, will do the same.
Quoted 3,305 lines
Quoted 25 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +25
-0+return ret; +} + +static void kmb_irq_reset (struct drm_device *drm) +{ +kmb_write_lcd (to_kmb (drm),LCD_INT_CLEAR ,0xFFFF ); +kmb_write_lcd (to_kmb (drm),LCD_INT_ENABLE ,0 ); +} + +DEFINE_DRM_GEM_CMA_FOPS (fops); + +static struct drm_driver kmb_driver = { + .driver_features =DRIVER_GEM | +DRIVER_MODESET |DRIVER_ATOMIC , + .irq_handler = kmb_isr, + .irq_preinstall = kmb_irq_reset, + .irq_uninstall = kmb_irq_reset, +/* GEM Operations */ + .fops = &fops, +DRM_GEM_CMA_DRIVER_OPS_VMAP , + .name ="kmb-drm" , + .desc ="KEEMBAY DISPLAY DRIVER " , + .date ="20190122" , + .major =1 , + .minor =0 ,drivers/gpu/drm/kmb/kmb_drv.c line 546
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+}; + +static void kmb_drm_unload (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *kmb =to_kmb (drm); + +#ifdef DEBUG +dump_stack (); +#endif No.
drivers/gpu/drm/kmb/kmb_drv.c line 557
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11
-0+drm_dev_unregister (drm); +drm_kms_helper_poll_fini (drm); +of_node_put (kmb->crtc.port); + kmb->crtc.port =NULL ; +pm_runtime_get_sync (drm->dev); +drm_irq_uninstall (drm); +pm_runtime_put_sync (drm->dev); +pm_runtime_disable (drm->dev); + +if (kmb->lcd_mmio) { +iounmap (kmb->lcd_mmio);Mapped with
devm_function. Don't unmap manually.drivers/gpu/drm/kmb/kmb_drv.c
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +11
-0+release_mem_region (LCD_BASE_ADDR ,LCD_MMIO_SIZE ); + } + +if (kmb->mipi_mmio) { +iounmap (kmb->mipi_mmio); +release_mem_region (MIPI_BASE_ADDR ,MIPI_MMIO_SIZE ); + } + +if (kmb->msscam_mmio) { +iounmap (kmb->msscam_mmio); + release_mem_region(MSS_CAM_BASE_ADDR,
MSS_CAM_MMIO_SIZE);drivers/gpu/drm/kmb/kmb_drv.c line 572
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +4
-0+ } + +of_reserved_mem_device_release (drm->dev); +drm_mode_config_cleanup (drm);You used
drmm_mode_config_init(). Don't cleanup manually.Quoted 12 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +12
-0+ +/* Release clks */ +kmb_display_clk_disable (); +clk_put (kmb_clk.clk_lcd); +clk_put (kmb_clk.clk_mipi); + +dev_set_drvdata (dev,NULL ); + +/* Unregister DSI host */ +kmb_dsi_host_unregister (); +} +drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+static int kmb_probe (struct platform_device *pdev) +{ +struct device *dev =get_device (&pdev->dev); +struct kmb_drm_private *kmb; +int ret =0 ; + +/* The bridge (ADV 7535) will return -EPROBE_DEFER until it +* has a mipi_dsi_host to register its device to. So, we +* first register the DSI host during probe time, and then return +* -EPROBE_DEFER until the bridge is loaded. Probe will be called again
Quoted 14 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +14
-0+* and then the rest of the driver initialization can proceed +* afterwards and the bridge can be successfully attached. +*/ + adv_bridge =kmb_dsi_host_bridge_init (dev); + +if (adv_bridge ==ERR_PTR (-EPROBE_DEFER )) { +return -EPROBE_DEFER ; + }else if (IS_ERR (adv_bridge)) { +DRM_ERROR ("probe failed to initialize DSI host bridge\n" ); +return PTR_ERR (adv_bridge); + } + +/* Create DRM device */ + kmb = devm_drm_dev_alloc(dev, &kmb_driver,drivers/gpu/drm/kmb/kmb_drv.c line 618
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ struct kmb_drm_private, drm); +if (IS_ERR (kmb)) +return PTR_ERR (kmb); + +dev_set_drvdata (dev, &kmb->drm); + + ret =kmb_setup_mode_config (&kmb->drm); +if (ret) + goto err_free; +dev_set_drvdata (dev, &kmb->drm);You already did this.
drivers/gpu/drm/kmb/kmb_drv.c line 621
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +3
-0+ +/* Load driver */ + kmb->n_layers =KMB_MAX_PLANES ;I don't see
n_layersbeing notKMB_MAX_PLANES; it's just a constant. Therefore removen_layersentirely.drivers/gpu/drm/kmb/kmb_drv.c line 622
Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.c new file +1
-0+ ret =kmb_load (&kmb->drm,0 );The whole setup process looks unintuitive and fragile to me. Here are a few steps to simplify:
* inline
kmb_load()
* reorganize the device setup to first map I/O resouces, then setup
all mode-config structures (CRTCs, planes, etc)drivers/gpu/drm/kmb/kmb_drv.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +2
-0+if (ret == -EPROBE_DEFER ) { + drm_info(&kmb->drm, "wait for external bridge driverDT\n");
drm_warn()or drm_dbg_*() here.Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8
-0+return -EPROBE_DEFER ; + }else if (ret) { + goto err_free; + } + +/* Set the CRTC's port so that the encoder component can find it */ + kmb->crtc.port =of_graph_get_port_by_id (dev->of_node,0 ); + ret = drm_vblank_init(&kmb->drm, kmb-drm.mode_config.num_crtc);
drivers/gpu/drm/kmb/kmb_drv.c line 640
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +8
-0+drm_info (&kmb->drm,"mode_config.num_crtc=%d\n" , + kmb->drm.mode_config.num_crtc); +if (ret <0 ) { +drm_err (&kmb->drm,"failed to initialize vblank\n" ); + goto err_vblank; + } + +drm_mode_config_reset (&kmb->drm);This call should better be located at the end of
kmb_setup_mode_config().drivers/gpu/drm/kmb/kmb_drv.c line 645
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +5
-0+drm_kms_helper_poll_init (&kmb->drm); + +/* Register graphics device with the kernel */ + ret =drm_dev_register (&kmb->drm,0 ); +No empty line here.
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+if (ret) + goto err_register; + +return 0 ; + + err_register: +drm_kms_helper_poll_fini (&kmb->drm); + err_vblank: +pm_runtime_disable (kmb->drm.dev); + err_free:drivers/gpu/drm/kmb/kmb_drv.c line 665
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+drm_mode_config_cleanup (&kmb->drm); +dev_set_drvdata (dev,NULL ); +kmb_dsi_host_unregister (); + +return ret; +} + +static int kmb_remove (struct platform_device *pdev) +{ +kmb_drm_unload (&pdev->dev);Inline
kmb_drm_unload().Quoted 7 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7
-0+return 0 ; +} + +static const struct of_device_id kmb_of_match[] = { + {.compatible ="intel,kmb_display" }, + {}, +};drivers/gpu/drm/kmb/kmb_drv.c line 682
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+ +MODULE_DEVICE_TABLE (of, kmb_of_match); + +static int __maybe_unused kmb_pm_suspend (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *kmb = drm ?to_kmb (drm) :NULL ; + +if (!kmb) +return 0 ;That cannot happpen.
Quoted 17 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +17
-0+ +drm_kms_helper_poll_disable (drm); + + kmb->state =drm_atomic_helper_suspend (drm); +if (IS_ERR (kmb->state)) { +drm_kms_helper_poll_enable (drm); +return PTR_ERR (kmb->state); + } + +return 0 ; +} + +static int __maybe_unused kmb_pm_resume (struct device *dev) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct kmb_drm_private *kmb = drm ?to_kmb (drm) :NULL ; +drivers/gpu/drm/kmb/kmb_drv.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +10
-0+if (!kmb) +return 0 ; + +drm_atomic_helper_resume (drm, kmb->state); +drm_kms_helper_poll_enable (drm); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(kmb_pm_ops, kmb_pm_suspend,
kmb_pm_resume);drivers/gpu/drm/kmb/kmb_drv.c line 718
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +9
-0+ +static struct platform_driver kmb_platform_driver = { + .probe = kmb_probe, + .remove = kmb_remove, + .driver = { + .name ="kmb-drm" , + .pm = &kmb_pm_ops, + .of_match_table = kmb_of_match, + },Bad indention. Here and elsewhere.
Review
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.c new file +7
-0+}; + +module_platform_driver (kmb_platform_driver); + +MODULE_AUTHOR ("Intel Corporation" ); +MODULE_DESCRIPTION ("Keembay Display driver" ); +MODULE_LICENSE ("GPL v2" );(quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_drv.hQuoted 6 lines
new file mode 100644
index 0000000..22a293edrivers/gpu/drm/kmb/kmb_drv.h new file +1
-0@@ -0,0 +1,172 @@ +/* SPDX-License-Identifier: GPL-2.0-only drivers/gpu/drm/kmb/kmb_drv.h line 11
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+* +* Copyright © 2018-2020 Intel Corporation +*/ + +#ifndef __KMB_DRV_H__ +#define __KMB_DRV_H__ + +#include "kmb_regs.h" + +#define KMB_MAX_WIDTH 1920/*max width in pixels */
drivers/gpu/drm/kmb/kmb_drv.h line 12
Quoted 1 line
drivers/gpu/drm/kmb/kmb_drv.h new file +1
-0+#define KMB_MAX_HEIGHT 1080/*max height in pixels */
drivers/gpu/drm/kmb/kmb_drv.h
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8
-0+#define KMB_MIN_WIDTH 1920/*max width in pixels */ +#define KMB_MIN_HEIGHT 1080/*max height in pixels */ +#define KMB_LCD_DEFAULT_CLK 200000000 +#define KMB_MIPI_DEFAULT_CLK 24000000 +#define KMB_MIPI_DEFAULT_CFG_CLK 24000000 +#define KMB_SYS_CLK_MHZ 500 + +#define crtc_to_kmb_priv (x) container_of(x, struct
kmb_drm_private, crtc)static inline function?
drivers/gpu/drm/kmb/kmb_drv.h line 24
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +4
-0+ +#define ICAM_MMIO 0x3b100000 +#define ICAM_LCD_OFFSET 0x1080 +#define ICAM_MMIO_SIZE 0x2000Empty line here.
Quoted 16 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +16
-0+struct 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; +int sys_clk_mhz; +dma_addr_t fb_addr; +};drivers/gpu/drm/kmb/kmb_drv.h
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+ +struct kmb_clock { +struct clk *clk_lcd; +struct clk *clk_mipi; +struct clk *clk_mipi_ecfg; +struct clk *clk_mipi_cfg; +struct clk *clk_pll0; +}; + +static inline struct kmb_drm_private *to_kmb(const struct drm_device*dev)
Quoted 23 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +23
-0+{ + return container_of(dev, struct kmb_drm_private, drm); +} + +struct blt_layer_config { +unsigned char layer_format; +}; + +static inline void kmb_write_lcd (struct kmb_drm_private *dev_p, +unsigned int reg,u32 value) +{ +writel (value, (dev_p->lcd_mmio + reg)); +} + +static inline void kmb_write_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 value) +{ +writel (value, (dev_p->mipi_mmio + reg)); +} + +static inline void kmb_write_msscam (struct kmb_drm_private *dev_p, +unsigned int reg,u32 value) +{drivers/gpu/drm/kmb/kmb_drv.h
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+writel (value, (dev_p->msscam_mmio + reg)); +} + +static inline u32 kmb_read_msscam (struct kmb_drm_private *dev_p, +unsigned int reg) +{ +return readl (dev_p->msscam_mmio + reg); +} + +static inline void kmb_set_bitmask_msscam(struct kmb_drm_private
*dev_p,drivers/gpu/drm/kmb/kmb_drv.h
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8
-0+ unsigned int reg, u32 mask) +{ +u32 reg_val =kmb_read_msscam (dev_p, reg); + +kmb_write_msscam (dev_p, reg, (reg_val | mask)); +} + +static inline u32 kmb_read_lcd(struct kmb_drm_private *dev_p,unsigned int reg)
drivers/gpu/drm/kmb/kmb_drv.h
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +5
-0+{ +return readl (dev_p->lcd_mmio + reg); +} + +static inline void kmb_set_bitmask_lcd(struct kmb_drm_private
*dev_p,Quoted 6 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +6
-0+ unsigned int reg, u32 mask) +{ +u32 reg_val =kmb_read_lcd (dev_p, reg); + +kmb_write_lcd (dev_p, reg, (reg_val | mask)); +}drivers/gpu/drm/kmb/kmb_drv.h
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+ +static inline void kmb_clr_bitmask_lcd (struct kmb_drm_private *dev_p, +unsigned int reg,u32 mask) +{ +u32 reg_val =kmb_read_lcd (dev_p, reg); + +kmb_write_lcd (dev_p, reg, (reg_val & (~mask))); +} + +static inline u32 kmb_read_mipi(struct kmb_drm_private *dev_p,unsigned int reg)
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8
-0+{ +return readl (dev_p->mipi_mmio + reg); +} + +static inline void kmb_write_bits_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 offset, +u32 num_bits,u32 value) +{drivers/gpu/drm/kmb/kmb_drv.h
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+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); +#ifdef DEBUG +if (reg ==DPHY_FREQ_CTRL0_3 +4 ) { + DRM_INFO("%s : %d reg=0x%x offset=%d num_bits=%dval=0x%x\n",
Quoted 14 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +14
-0+ __func__, __LINE__, reg, offset, num_bits, + reg_val); + } +#endif +kmb_write_mipi (dev_p, reg, reg_val); +} + +static inline void kmb_set_bit_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 offset) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, reg_val | (1 << offset)); +}drivers/gpu/drm/kmb/kmb_drv.h
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+ +static inline void kmb_clr_bit_mipi (struct kmb_drm_private *dev_p, +unsigned int reg,u32 offset) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, reg_val & (~(1 << offset))); +} + +static inline void kmb_set_bitmask_mipi(struct kmb_drm_private
*dev_p,drivers/gpu/drm/kmb/kmb_drv.h
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +8
-0+ unsigned int reg, u32 mask) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, (reg_val | mask)); +} + +static inline void kmb_clr_bitmask_mipi(struct kmb_drm_private
*dev_p,Review
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_drv.h new file +10
-0+ unsigned int reg, u32 mask) +{ +u32 reg_val =kmb_read_mipi (dev_p, reg); + +kmb_write_mipi (dev_p, reg, (reg_val & (~mask))); +} + +int kmb_setup_crtc (struct drm_device *dev); +void kmb_set_scanout (struct kmb_drm_private *lcd); +#endif /* __KMB_DRV_H__ */ (quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_dsi.cQuoted 225 lines
new file mode 100644
index 0000000..21745aedrivers/gpu/drm/kmb/kmb_dsi.c new file +212
-0@@ -0,0 +1,1828 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright © 2019-2020 Intel Corporation +*/ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/slab.h> +#include <linux/spinlock.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "kmb_drv.h" +#include "kmb_dsi.h" +#include "kmb_regs.h" + +static int hw_initialized; +/* #define MIPI_TX_TEST_PATTERN_GENERATION */ +/* #define DPHY_GET_FSM */ +/* #define DPHY_READ_TESTCODE */ + +static struct mipi_dsi_host *dsi_host; +static struct mipi_dsi_device *dsi_device; + +/* Default setting is 1080p, 4 lanes */ +#define IMG_HEIGHT_LINES 1080 +#define IMG_WIDTH_PX 1920 +#define MIPI_TX_ACTIVE_LANES 4 + +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 , + .dma_packed =0 +}; + +struct mipi_tx_frame_cfg mipitx_frame0_cfg = { + .sections[0 ] = &mipi_tx_frame0_sect_cfg, + .sections[1 ] =NULL , + .sections[2 ] =NULL , + .sections[3 ] =NULL , + .vsync_width =5 , + .v_backporch =36 , + .v_frontporch =4 , + .hsync_width =44 , + .h_backporch =148 , + .h_frontporch =88 +}; + +struct mipi_tx_dsi_cfg mipitx_dsi_cfg = { + .hfp_blank_en =0 , + .eotp_en =0 , + .lpm_last_vfp_line =0 , + .lpm_first_vsa_line =0 , + .sync_pulse_eventn =DSI_VIDEO_MODE_NO_BURST_EVENT , + .hfp_blanking =SEND_BLANK_PACKET , + .hbp_blanking =SEND_BLANK_PACKET , + .hsa_blanking =SEND_BLANK_PACKET , + .v_blanking =SEND_BLANK_PACKET , +}; + +struct mipi_ctrl_cfg mipi_tx_init_cfg = { + .index =MIPI_CTRL6 , + .type =MIPI_DSI , + .dir =MIPI_TX , + .active_lanes =MIPI_TX_ACTIVE_LANES , + .lane_rate_mbps =MIPI_TX_LANE_DATA_RATE_MBPS , + .ref_clk_khz =MIPI_TX_REF_CLK_KHZ , + .cfg_clk_khz =MIPI_TX_CFG_CLK_KHZ , + .data_if =MIPI_IF_PARALLEL , + .tx_ctrl_cfg = { + .frames[0 ] = &mipitx_frame0_cfg, + .frames[1 ] =NULL , + .frames[2 ] =NULL , + .frames[3 ] =NULL , + .tx_dsi_cfg = &mipitx_dsi_cfg, + .line_sync_pkt_en =0 , + .line_counter_active =0 , + .frame_counter_active =0 , + .tx_always_use_hact =1 , + .tx_hact_wait_stop =1 , + } +}; + +struct mipi_hs_freq_range_cfg { +u16 default_bit_rate_mbps; +u8 hsfreqrange_code; +}; + +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 struct mipi_hs_freq_range_cfg +mipi_hs_freq_range[MIPI_DPHY_DEFAULT_BIT_RATES ] = { + {.default_bit_rate_mbps =80 , .hsfreqrange_code =0x00 }, + {.default_bit_rate_mbps =90 , .hsfreqrange_code =0x10 }, + {.default_bit_rate_mbps =100 , .hsfreqrange_code =0x20 }, + {.default_bit_rate_mbps =110 , .hsfreqrange_code =0x30 }, + {.default_bit_rate_mbps =120 , .hsfreqrange_code =0x01 }, + {.default_bit_rate_mbps =130 , .hsfreqrange_code =0x11 }, + {.default_bit_rate_mbps =140 , .hsfreqrange_code =0x21 }, + {.default_bit_rate_mbps =150 , .hsfreqrange_code =0x31 }, + {.default_bit_rate_mbps =160 , .hsfreqrange_code =0x02 }, + {.default_bit_rate_mbps =170 , .hsfreqrange_code =0x12 }, + {.default_bit_rate_mbps =180 , .hsfreqrange_code =0x22 }, + {.default_bit_rate_mbps =190 , .hsfreqrange_code =0x32 }, + {.default_bit_rate_mbps =205 , .hsfreqrange_code =0x03 }, + {.default_bit_rate_mbps =220 , .hsfreqrange_code =0x13 }, + {.default_bit_rate_mbps =235 , .hsfreqrange_code =0x23 }, + {.default_bit_rate_mbps =250 , .hsfreqrange_code =0x33 }, + {.default_bit_rate_mbps =275 , .hsfreqrange_code =0x04 }, + {.default_bit_rate_mbps =300 , .hsfreqrange_code =0x14 }, + {.default_bit_rate_mbps =325 , .hsfreqrange_code =0x25 }, + {.default_bit_rate_mbps =350 , .hsfreqrange_code =0x35 }, + {.default_bit_rate_mbps =400 , .hsfreqrange_code =0x05 }, + {.default_bit_rate_mbps =450 , .hsfreqrange_code =0x16 }, + {.default_bit_rate_mbps =500 , .hsfreqrange_code =0x26 }, + {.default_bit_rate_mbps =550 , .hsfreqrange_code =0x37 }, + {.default_bit_rate_mbps =600 , .hsfreqrange_code =0x07 }, + {.default_bit_rate_mbps =650 , .hsfreqrange_code =0x18 }, + {.default_bit_rate_mbps =700 , .hsfreqrange_code =0x28 }, + {.default_bit_rate_mbps =750 , .hsfreqrange_code =0x39 }, + {.default_bit_rate_mbps =800 , .hsfreqrange_code =0x09 }, + {.default_bit_rate_mbps =850 , .hsfreqrange_code =0x19 }, + {.default_bit_rate_mbps =900 , .hsfreqrange_code =0x29 }, + {.default_bit_rate_mbps =1000 , .hsfreqrange_code =0x0A }, + {.default_bit_rate_mbps =1050 , .hsfreqrange_code =0x1A }, + {.default_bit_rate_mbps =1100 , .hsfreqrange_code =0x2A }, + {.default_bit_rate_mbps =1150 , .hsfreqrange_code =0x3B }, + {.default_bit_rate_mbps =1200 , .hsfreqrange_code =0x0B }, + {.default_bit_rate_mbps =1250 , .hsfreqrange_code =0x1B }, + {.default_bit_rate_mbps =1300 , .hsfreqrange_code =0x2B }, + {.default_bit_rate_mbps =1350 , .hsfreqrange_code =0x3C }, + {.default_bit_rate_mbps =1400 , .hsfreqrange_code =0x0C }, + {.default_bit_rate_mbps =1450 , .hsfreqrange_code =0x1C }, + {.default_bit_rate_mbps =1500 , .hsfreqrange_code =0x2C }, + {.default_bit_rate_mbps =1550 , .hsfreqrange_code =0x3D }, + {.default_bit_rate_mbps =1600 , .hsfreqrange_code =0x0D }, + {.default_bit_rate_mbps =1650 , .hsfreqrange_code =0x1D }, + {.default_bit_rate_mbps =1700 , .hsfreqrange_code =0x2E }, + {.default_bit_rate_mbps =1750 , .hsfreqrange_code =0x3E }, + {.default_bit_rate_mbps =1800 , .hsfreqrange_code =0x0E }, + {.default_bit_rate_mbps =1850 , .hsfreqrange_code =0x1E }, + {.default_bit_rate_mbps =1900 , .hsfreqrange_code =0x2F }, + {.default_bit_rate_mbps =1950 , .hsfreqrange_code =0x3F }, + {.default_bit_rate_mbps =2000 , .hsfreqrange_code =0x0F }, + {.default_bit_rate_mbps =2050 , .hsfreqrange_code =0x40 }, + {.default_bit_rate_mbps =2100 , .hsfreqrange_code =0x41 }, + {.default_bit_rate_mbps =2150 , .hsfreqrange_code =0x42 }, + {.default_bit_rate_mbps =2200 , .hsfreqrange_code =0x43 }, + {.default_bit_rate_mbps =2250 , .hsfreqrange_code =0x44 }, + {.default_bit_rate_mbps =2300 , .hsfreqrange_code =0x45 }, + {.default_bit_rate_mbps =2350 , .hsfreqrange_code =0x46 }, + {.default_bit_rate_mbps =2400 , .hsfreqrange_code =0x47 }, + {.default_bit_rate_mbps =2450 , .hsfreqrange_code =0x48 }, + {.default_bit_rate_mbps =2500 , .hsfreqrange_code =0x49 } +}; + +union mipi_irq_cfg int_cfg = { + .irq_cfg.frame_done =1 , + .irq_cfg.ctrl_error =1 , +}; + +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 ; +} + +static int kmb_dsi_get_modes (struct drm_connector *connector) +{ +int num_modes =0 ; + + num_modes = drm_add_modes_noedid(connector, + connector->dev-mode_config.max_width,
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ connector->dev->mode_config.max_height); + +DRM_INFO ("width=%d height=%d\n" , + connector->dev->mode_config.max_width, + connector->dev->mode_config.max_height); +DRM_INFO ("num modes=%d\n" , num_modes); +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+return num_modes; +} + +void kmb_dsi_host_unregister (void ) +{ +mipi_dsi_host_unregister (dsi_host); +kfree (dsi_host); +} + +static void kmb_dsi_connector_destroy(struct drm_connector*connector)
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+{ + struct kmb_connector *kmb_connector =
to_kmb_connector(connector);Quoted 29 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +17
-0+ +drm_connector_cleanup (connector); +kfree (kmb_connector); +} + +static void kmb_dsi_encoder_destroy (struct drm_encoder *encoder) +{ +struct kmb_dsi *kmb_dsi =to_kmb_dsi (encoder); + +if (!kmb_dsi) +return ; + +kfree (kmb_dsi->dsi_host); + +drm_encoder_cleanup (encoder); + + kmb_dsi_connector_destroy(&kmb_dsi->attached_connector-base);
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ +kfree (kmb_dsi); +if (!dsi_device) +kfree (dsi_device); +} + +static const struct drm_encoder_funcs kmb_dsi_funcs = { + .destroy = kmb_dsi_encoder_destroy, +}; + +static const structdrivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+drm_connector_helper_funcs kmb_dsi_connector_helper_funcs = { + .get_modes = kmb_dsi_get_modes, + .mode_valid = kmb_dsi_mode_valid, +}; + +static const struct drm_connector_funcs kmb_dsi_connector_funcs = { + .destroy = kmb_dsi_connector_destroy, + .fill_modes = drm_helper_probe_single_connector_modes, + .reset = drm_atomic_helper_connector_reset, + .atomic_destroy_state =
drm_atomic_helper_connector_destroy_state,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ .atomic_duplicate_state =
drm_atomic_helper_connector_duplicate_state,Quoted 17 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +17
-0+}; + +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) +{drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+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 drm_device*drm,
Quoted 24 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +24
-0+ struct kmb_dsi *kmb_dsi) +{ +struct kmb_dsi_host *host; + + host =kzalloc (sizeof (*host),GFP_KERNEL ); +if (!host) +return NULL ; + + host->base = dsi_host; + host->base->ops = &kmb_dsi_host_ops; + host->kmb_dsi = kmb_dsi; + + host->base->dev = drm->dev; + + dsi_device->host = host->base; + host->device = dsi_device; +return host; +} + +struct drm_bridge *kmb_dsi_host_bridge_init (struct device *dev) +{ +struct drm_bridge *bridge =NULL ; +struct device_node *encoder_node; +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* Create and register MIPI DSI host */ +if (!dsi_host) { + dsi_host =kzalloc (sizeof (*dsi_host),GFP_KERNEL ); +if (!dsi_host) +return ERR_PTR (-ENOMEM ); + + dsi_host->ops = &kmb_dsi_host_ops; + +if (!dsi_device) { + dsi_device = kzalloc(sizeof(*dsi_device),
GFP_KERNEL);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+if (!dsi_device) { +kfree (dsi_host); +return ERR_PTR (-ENOMEM ); + } + } + + dsi_host->dev = dev; +mipi_dsi_host_register (dsi_host); + } +/* Find ADV7535 node and initialize it */ + encoder_node = of_parse_phandle(dev->of_node, "encoder-slave",0);
Quoted 25 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +25
-0+ +if (!encoder_node) { +DRM_ERROR ("Failed to get bridge info from DT\n" ); +return ERR_PTR (-EINVAL ); + } + +/* Locate drm bridge from the hdmi encoder DT node */ + bridge =of_drm_find_bridge (encoder_node); +of_node_put (encoder_node); +if (!bridge) { +DRM_INFO ("Wait for external bridge driver DT\n" ); +return ERR_PTR (-EPROBE_DEFER ); + } +return bridge; +} + +u32 mipi_get_datatype_params (u32 data_type,u32 data_mode, +struct mipi_data_type_params *params) +{ +struct mipi_data_type_params data_type_param; + +switch (data_type) { +case DSI_LP_DT_PPS_YCBCR420_12B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =3 ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_YCBCR422_16B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =4 ; +switch (data_mode) { +/* Case 0 and 1 not supported according +* to MDK +*/ drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+case 2 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_LPPS_YCBCR422_20B : +case DSI_LP_DT_PPS_YCBCR422_24B : + data_type_param.size_constraint_pixels =2 ; + data_type_param.size_constraint_bytes =6 ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+switch (data_mode) { +/* Case 0 not supported according to MDK */ +case 1 : +case 2 : +case 3 : + data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =24 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB565_16B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =2 ; +switch (data_mode) { +case 0 : +case 1 :drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ data_type_param.pixels_per_pclk =1 ; + data_type_param.bits_per_pclk =16 ; +break ; +case 2 : +case 3 : + data_type_param.pixels_per_pclk =2 ; + data_type_param.bits_per_pclk =32 ; +break ; +default : + DRM_ERROR("DSI: Invalid data_mode %d\n",
data_mode);Quoted 22 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +22
-0+return -EINVAL ; + }; +break ; +case DSI_LP_DT_PPS_RGB666_18B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =9 ; + data_type_param.bits_per_pclk =18 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_LPPS_RGB666_18B : +case DSI_LP_DT_PPS_RGB888_24B : + data_type_param.size_constraint_pixels =1 ; + data_type_param.size_constraint_bytes =3 ; + data_type_param.bits_per_pclk =24 ; + data_type_param.pixels_per_pclk =1 ; +break ; +case DSI_LP_DT_PPS_RGB101010_30B : + data_type_param.size_constraint_pixels =4 ; + data_type_param.size_constraint_bytes =15 ; + data_type_param.bits_per_pclk =30 ; + data_type_param.pixels_per_pclk =1 ; +break ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+default : +DRM_ERROR ("DSI: Invalid data_type %d\n" , data_type); +return -EINVAL ; + }; + + *params = data_type_param; +return 0 ; +} + +static u32 compute_wc(u32 width_px, u8 size_constr_p, u8
size_constr_b)Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+{ +/* Calculate the word count for each long packet */ +return (((width_px / size_constr_p) * size_constr_b) &0xffff ); +} + +static u32 compute_unpacked_bytes (u32 wc,u8 bits_per_pclk) +{drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* Number of PCLK cycles needed to transfer a line +* with each PCLK cycle, 4 Bytes are sent through the PPL module +*/ +return ((wc *8 ) / bits_per_pclk) *4 ; +} + +static u32 mipi_tx_fg_section_cfg_regs (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, +u32 height_lines,u32 unpacked_bytes, + struct mipi_tx_frame_sect_phcfg
*ph_cfg)Quoted 18 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +18
-0+{ +u32 cfg =0 ; +u32 ctrl_no =MIPI_CTRL6 ; +u32 reg_adr; + +/* Frame section packet header */ +/* Word count bits [15:0] */ + cfg = (ph_cfg->wc &MIPI_TX_SECT_WC_MASK ) <<0 ; + +/* Data type (bits [21:16]) */ + cfg |= ((ph_cfg->data_type &MIPI_TX_SECT_DT_MASK ) + <<MIPI_TX_SECT_DT_SHIFT ); + +/* Virtual channel (bits [23:22]) */ + cfg |= ((ph_cfg->vchannel &MIPI_TX_SECT_VC_MASK ) + <<MIPI_TX_SECT_VC_SHIFT ); + +/* Data mode (bits [24:25]) */ drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ cfg |= ((ph_cfg->data_mode &MIPI_TX_SECT_DM_MASK ) + <<MIPI_TX_SECT_DM_SHIFT ); +if (ph_cfg->dma_packed) + cfg |=MIPI_TX_SECT_DMA_PACKED ; + +drm_dbg (&kmb->drm, +"ctrl=%d frame_id=%d section=%d cfg=%x packed=%d\n" , + ctrl_no, frame_id, section, cfg, ph_cfg->dma_packed); + kmb_write_mipi(kmb, + (MIPI_TXm_HS_FGn_SECTo_PH(ctrl_no, frame_id,section)),
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ cfg); + +/* Unpacked bytes */ + +/* There are 4 frame generators and each fg has 4 sections +* There are 2 registers for unpacked bytes (# bytes each +* section occupies in memory) drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+* REG_UNPACKED_BYTES0: [15:0]-BYTES0, [31:16]-BYTES1 +* REG_UNPACKED_BYTES1: [15:0]-BYTES2, [31:16]-BYTES3 +*/ + reg_adr = +MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0 (ctrl_no, + frame_id) + (section /2 ) *4 ; +kmb_write_bits_mipi (kmb, reg_adr, (section %2 ) *16 ,16 , + unpacked_bytes); + drm_dbg(&kmb->drm, + "unpacked_bytes = %d, wordcount = %d\n",
unpacked_bytes,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ ph_cfg->wc); + +/* Line config */ + reg_adr = MIPI_TXm_HS_FGn_SECTo_LINE_CFG(ctrl_no, frame_id,section);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+kmb_write_mipi (kmb, reg_adr, height_lines); +return 0 ; +} + +static u32 mipi_tx_fg_section_cfg (struct kmb_drm_private *kmb, +u8 frame_id,u8 section, + struct mipi_tx_frame_section_cfg
*frame_scfg,Quoted 15 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +15
-0+ u32 *bits_per_pclk, u32 *wc) +{ +u32 ret =0 ; +u32 unpacked_bytes; +struct mipi_data_type_params data_type_parameters; +struct mipi_tx_frame_sect_phcfg ph_cfg; + + ret =mipi_get_datatype_params (frame_scfg->data_type, + frame_scfg->data_mode, + &data_type_parameters); +if (ret) +return ret; + +/* Packet width has to be a multiple of the minimum packet width +* (in pixels) set for each data type drivers/gpu/drm/kmb/kmb_dsi.c line 569
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+*/ +if (frame_scfg->width_pixels % + data_type_parameters.size_constraint_pixels !=0 ) +return -EINVAL ; + + *wc =compute_wc (frame_scfg->width_pixels, + data_type_parameters.size_constraint_pixels, + data_type_parameters.size_constraint_bytes); + unpacked_bytes = compute_unpacked_bytes(*wc, +data_type_parameters.bits_per_pclk);Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ 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(kmb, frame_id, section,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ frame_scfg->height_lines, + unpacked_bytes, &ph_cfg); + +/* Caller needs bits_per_clk for additional caluclations */ + *bits_per_pclk = data_type_parameters.bits_per_pclk; + +return 0 ; +} + +static void mipi_tx_fg_cfg_regs(struct kmb_drm_private *kmb, u8
frame_gen,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +13
-0+ struct mipi_tx_frame_timing_cfg *fg_cfg) +{ +u32 sysclk; +u32 ppl_llp_ratio; +u32 ctrl_no =MIPI_CTRL6 , reg_adr, val, offset; + +/* 500 Mhz system clock minus 50 to account for the difference in +* MIPI clock speed in RTL tests +*/ + sysclk = kmb->sys_clk_mhz -50 ; + +/* PPL-Pixel Packing Layer, LLP-Low Level Protocol +* Frame genartor timing parameters are clocked on the system clock,
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+* whereas as the equivalent parameters in the LLP blocks are clocked
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+* on LLP Tx clock from the D-PHY - BYTE clock +*/ + +/* Multiply by 1000 to maintain precision */ + ppl_llp_ratio = ((fg_cfg->bpp /8 ) * sysclk *1000 ) / + ((fg_cfg->lane_rate_mbps /8 ) * fg_cfg->active_lanes); + +drm_dbg (&kmb->drm,"ppl_llp_ratio=%d\n" , ppl_llp_ratio); + drm_dbg(&kmb->drm, "bpp=%d sysclk=%d lane-rate=%d active-lanes=%d\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 11 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +11
-0+ fg_cfg->bpp, sysclk, fg_cfg->lane_rate_mbps, + fg_cfg->active_lanes); + +/* Frame generator number of lines */ + reg_adr =MIPI_TXm_HS_FGn_NUM_LINES (ctrl_no, frame_gen); +kmb_write_mipi (kmb, 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
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+* REG_VSYNC_WIDTH1: [15:0]-VSA for channel2, [31:16]-VSA for channel3
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+*/ + offset = (frame_gen %2 ) *16 ; + reg_adr =MIPI_TXm_HS_VSYNC_WIDTHn (ctrl_no, frame_gen /2 ); + kmb_write_bits_mipi(kmb, reg_adr, offset, 16, fg_cfg-
vsync_width);drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* vertical backporch (vbp) */ + reg_adr = MIPI_TXm_HS_V_BACKPORCHESn(ctrl_no, frame_gen /2);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_write_bits_mipi(kmb, reg_adr, offset, 16, fg_cfg-
v_backporch);drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* vertical frontporch (vfp) */ + reg_adr = MIPI_TXm_HS_V_FRONTPORCHESn(ctrl_no, frame_gen /2);
Quoted 24 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_write_bits_mipi(kmb, reg_adr, offset, 16, fg_cfg-
v_frontporch);drivers/gpu/drm/kmb/kmb_dsi.c new file +22
-0+ +/* vertical active (vactive) */ + reg_adr =MIPI_TXm_HS_V_ACTIVEn (ctrl_no, frame_gen /2 ); +kmb_write_bits_mipi (kmb, reg_adr, offset,16 , fg_cfg->v_active); + +/* hsync width */ + reg_adr =MIPI_TXm_HS_HSYNC_WIDTHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->hsync_width * ppl_llp_ratio) /1000 ); + +/* horizontal backporch (hbp) */ + reg_adr =MIPI_TXm_HS_H_BACKPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_backporch * ppl_llp_ratio) /1000 ); + +/* horizontal frontporch (hfp) */ + reg_adr =MIPI_TXm_HS_H_FRONTPORCHn (ctrl_no, frame_gen); +kmb_write_mipi (kmb, reg_adr, + (fg_cfg->h_frontporch * ppl_llp_ratio) /1000 ); + +/* horizontal active (ha) */ + reg_adr =MIPI_TXm_HS_H_ACTIVEn (ctrl_no, frame_gen);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +/* 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_mipi (kmb, reg_adr, val); + +/* llp hsync width */ + reg_adr =MIPI_TXm_HS_LLP_HSYNC_WIDTHn (ctrl_no, frame_gen); + kmb_write_mipi(kmb, reg_adr, fg_cfg->hsync_width * (fg_cfg->bpp/ 8));
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ +/* llp h backporch */ + reg_adr =MIPI_TXm_HS_LLP_H_BACKPORCHn (ctrl_no, frame_gen); + kmb_write_mipi(kmb, reg_adr, fg_cfg->h_backporch * (fg_cfg->bpp/ 8));
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* llp h frontporch */ + reg_adr = MIPI_TXm_HS_LLP_H_FRONTPORCHn(ctrl_no,
frame_gen);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+kmb_write_mipi (kmb, reg_adr, + fg_cfg->h_frontporch * (fg_cfg->bpp /8 )); +} + +static void mipi_tx_fg_cfg(struct kmb_drm_private *kmb, u8
frame_gen,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ u8 active_lanes, u32 bpp, u32 wc, + u32 lane_rate_mbps, struct mipi_tx_frame_cfg
*fg_cfg)Quoted 19 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +19
-0+{ +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]) + 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;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ 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 (kmb, frame_gen, &fg_t_cfg); +} + +static void mipi_tx_multichannel_fifo_cfg(struct kmb_drm_private*kmb,
Quoted 15 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +15
-0+ u8 active_lanes, u8 vchannel_id) +{ +u32 fifo_size, fifo_rthreshold; +u32 ctrl_no =MIPI_CTRL6 ; + +/* Clear all mc fifo channel sizes and thresholds */ +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CTRL_EN ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_CHAN_ALLOC1 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD0 ,0 ); +kmb_write_mipi (kmb,MIPI_TX_HS_MC_FIFO_RTHRESHOLD1 ,0 ); + + fifo_size = ((active_lanes >MIPI_D_LANES_PER_DPHY ) ? +MIPI_CTRL_4LANE_MAX_MC_FIFO_LOC : +MIPI_CTRL_2LANE_MAX_MC_FIFO_LOC ) -1 ;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +/* MC fifo size for virtual channels 0-3 +* REG_MC_FIFO_CHAN_ALLOC0: [8:0]-channel0, [24:16]-channel1 +* REG_MC_FIFO_CHAN_ALLOC1: [8:0]-2, [24:16]-channel3 +*/ +SET_MC_FIFO_CHAN_ALLOC (kmb, ctrl_no, vchannel_id, fifo_size); + +/* Set threshold to half the fifo size, actual size=size*16 */ + fifo_rthreshold = ((fifo_size) *8 ) &BIT_MASK_16 ; + SET_MC_FIFO_RTHRESHOLD(kmb, ctrl_no, vchannel_id,
fifo_rthreshold);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ +/* Enable the MC FIFO channel corresponding to the Virtual Channel */
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_set_bit_mipi(kmb,
MIPI_TXm_HS_MC_FIFO_CTRL_EN(ctrl_no),Quoted 31 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +31
-0+ vchannel_id); +} + +static void mipi_tx_ctrl_cfg (struct kmb_drm_private *kmb,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 ; +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* 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); + + drm_dbg(&kmb->drm, "sync_cfg=%d fg_en=%d\n", sync_cfg,
fg_en);Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ +/* MIPI_TX_HS_CTRL */ + +/* type:DSI, source:LCD */ + ctrl =HS_CTRL_EN |TX_SOURCE ; + ctrl |=LCD_VC (fg_id);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ ctrl |=ACTIVE_LANES (ctrl_cfg->active_lanes -1 ); +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 ; + +/*67 ns stop time */ + ctrl |=HSEXIT_CNT (0x43 ); + + kmb_write_mipi(kmb, MIPI_TXm_HS_SYNC_CFG(ctrl_no),
sync_cfg);Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+kmb_write_mipi (kmb,MIPI_TXm_HS_CTRL (ctrl_no), ctrl); +} + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +static void mipi_tx_hs_tp_gen(struct kmb_drm_private *kmb, int vc,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ int tp_sel, u32 stripe_width, u32 color0, + u32 color1, u32 ctrl_no) +{ + int val = 0; + +/* Select test pattern mode on the virtual channel */ + val =TP_SEL_VCm (vc, tp_sel); + +/* Configure test pattern colors */ + kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_COLOR0(ctrl_no),color0);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_COLOR1(ctrl_no),color1);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ +/* Enable test pattern generation on the virtual channel */ + val |=TP_EN_VCm (vc); + kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_CTRL(ctrl_no),val);
Quoted 23 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +23
-0+} +#endif + +static u32 mipi_tx_init_cntrl (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *ctrl_cfg) +{ +u32 ret =0 ; +u8 active_vchannels =0 ; +u8 frame_id, sect; +u32 bits_per_pclk =0 ; +u32 word_count =0 ; +struct mipi_tx_frame_cfg *frame; + +/* This is the order to initialize MIPI TX: +* 1. set frame section parameters +* 2. set frame specific parameters +* 3. connect lcd to mipi +* 4. multi channel fifo cfg +* 5. set mipitxcctrlcfg +*/ + +for (frame_id =0 ; frame_id <4 ; frame_id++) { + frame = ctrl_cfg->tx_ctrl_cfg.frames[frame_id];drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +/* Find valid frame, assume only one valid frame */ +if (!frame) +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++) {
Quoted 18 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +18
-0+if (!frame->sections[sect]) +continue ; + + ret =mipi_tx_fg_section_cfg (kmb, frame_id, sect, + frame->sections[sect], + &bits_per_pclk, + &word_count); +if (ret) +return ret; + } + +/* Set frame specific parameters */ +mipi_tx_fg_cfg (kmb, frame_id, ctrl_cfg->active_lanes, + bits_per_pclk, word_count, + ctrl_cfg->lane_rate_mbps, frame); + + active_vchannels++; +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* Stop iterating as only one virtual channel +* shall be used for LCD connection +*/ +break ; + } + +if (active_vchannels ==0 ) +return -EINVAL ; +/* Multi-Channel FIFO Configuration */ + mipi_tx_multichannel_fifo_cfg(kmb, ctrl_cfg->active_lanes,
frame_id);Quoted 114 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +114
-0+ +/* Frame Generator Enable */ +mipi_tx_ctrl_cfg (kmb, frame_id, ctrl_cfg); + +#ifdef MIPI_TX_TEST_PATTERN_GENERATION +mipi_tx_hs_tp_gen (kmb,0 ,MIPI_TX_HS_TP_V_STRIPES , +0x8 ,0xff ,0xff00 ,MIPI_CTRL6 ); +#endif + +drm_dbg (&kmb->drm,"IRQ_STATUS = 0x%x\n" , +GET_MIPI_TX_HS_IRQ_STATUS (kmb,MIPI_CTRL6 )); + +return ret; +} + +#ifdef DPHY_READ_TESTCODE +int dphy_read_testcode (struct kmb_drm_private *kmb,int dphy_sel, +int test_code) +{ +u32 reg_wr_data; +u32 reg_rd_data; +int data; + + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data =0 ; + reg_wr_data =0 ; + reg_rd_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code >>8 &0xf ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = dphy_sel; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + data = test_code &0xff ; + reg_wr_data =0 ; + +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + reg_wr_data |= data <<0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + reg_wr_data |= data <<8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 )) + reg_wr_data |= data <<16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + reg_wr_data |= data <<24 ; + +if ((dphy_sel >>0 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN0_3 , reg_wr_data); +if ((dphy_sel >>4 &0xf ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN4_7 , reg_wr_data); +if ((dphy_sel >>8 &0x3 ) >0 ) +kmb_write_mipi (kmb,DPHY_TEST_DIN8_9 , reg_wr_data); + + reg_wr_data =0 ; + reg_wr_data = (dphy_sel | dphy_sel <<12 ); +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ + reg_wr_data =0 ; + reg_wr_data = dphy_sel <<12 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + + reg_wr_data =0 ; +kmb_write_mipi (kmb,DPHY_TEST_CTRL1 , reg_wr_data); + +if ((dphy_sel >>0 &0xf ) >0 ) + reg_rd_data = kmb_read_mipi(kmb,
DPHY_TEST_DOUBT0_3);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+if ((dphy_sel >>4 &0xf ) >0 ) + reg_rd_data = kmb_read_mipi(kmb,
DPHY_TEST_DOUBT4_7);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+if ((dphy_sel >>8 &0x3 ) >0 ) + reg_rd_data = kmb_read_mipi(kmb,
DPHY_TEST_DOUBT8_9);Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0+ +if (((dphy_sel >>0 &0x1 ) ==1 ) | ((dphy_sel >>4 &0x1 ) ==1 ) | + ((dphy_sel >>8 &0x1 ) ==1 )) + data = reg_rd_data >>0 ; +if (((dphy_sel >>1 &0x1 ) ==1 ) | ((dphy_sel >>5 &0x1 ) ==1 ) | + ((dphy_sel >>9 &0x1 ) ==1 )) + data = reg_rd_data >>8 ; +if (((dphy_sel >>2 &0x1 ) ==1 ) | ((dphy_sel >>6 &0x1 ) ==1 ) | + ((dphy_sel >>10 &0x1 ) ==1 ))drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ data = reg_rd_data >>16 ; +if (((dphy_sel >>3 &0x1 ) ==1 ) | ((dphy_sel >>7 &0x1 ) ==1 ) | + ((dphy_sel >>11 &0x1 ) ==1 )) + data = reg_rd_data >>24 ; + +return data; +} +#endif + +static void test_mode_send(struct kmb_drm_private *kmb, u32
dphy_no,Quoted 45 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +45
-0+ u32 test_code, u32 test_data) +{ +if (test_code !=TEST_CODE_FSM_CONTROL ) +drm_dbg (&kmb->drm, +"test_code = %02x, test_data = %08x\n" , test_code, + test_data); +/* Steps to send test code: +* - set testclk HIGH +* - set testdin with test code +* - set testen HIGH +* - set testclk LOW +* - set testen LOW +*/ + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testdin */ +SET_TEST_DIN0_3 (kmb, dphy_no, test_code); + +/* Set testen high */ +SET_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +if (test_code) { +/* Steps to send test data: +* - set testen LOW +* - set testclk LOW +* - set testdin with data +* - set testclk HIGH +*/ + +/* Set testen low */ +CLR_DPHY_TEST_CTRL1_EN (kmb, dphy_no); + +/* Set testclk low */ +CLR_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + +/* Set data in testdin */ + kmb_write_mipi(kmb,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+DPHY_TEST_DIN0_3 + ((dphy_no /0x4 ) *0x4 ), + test_data << ((dphy_no % 4) * 8)); + +/* Set testclk high */ +SET_DPHY_TEST_CTRL1_CLK (kmb, dphy_no); + } +} + +static inline void + set_test_mode_src_osc_freq_target_low_bits(struct
kmb_drm_private*kmb,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+ u32 dphy_no, + u32 freq) +{ + /* Typical rise/fall time=166, refer Table 1207 databook, + * sr_osc_freq_target[7:0] + */ + test_mode_send(kmb, dphy_no,
TEST_CODE_SLEW_RATE_DDL_CYCLES,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ (freq & 0x7f)); +} + +static inline void + set_test_mode_src_osc_freq_target_hi_bits(struct
kmb_drm_private*kmb,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +12
-0+ u32 dphy_no, + u32 freq) +{ +u32 data; + +/* Flag this as high nibble */ + data = ((freq >>6 ) &0x1f ) | (1 <<7 ); + +/* Typical rise/fall time=166, refer Table 1207 databook, +* sr_osc_freq_target[11:7] +*/ + test_mode_send(kmb, dphy_no,
TEST_CODE_SLEW_RATE_DDL_CYCLES, data);Quoted 7 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +7
-0+} + +static void mipi_tx_get_vco_params (struct vco_params *vco) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (vco_table); i++) {drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+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(struct kmb_drm_private *kmb, u32
dphy_no,Quoted 59 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +59
-0+ u32 ref_clk_mhz, u32 target_freq_mhz) +{ +u32 best_n =0 , best_m =0 ; +u32 n =0 , m =0 , div =0 , delta, freq =0 , t_freq; +u32 best_freq_delta =3000 ; + +/* 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 , + }; + + 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;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ 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(kmb, dphy_no, TEST_CODE_PLL_VCO_CTRL,(vco_p.range
drivers/gpu/drm/kmb/kmb_dsi.c line 1210
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +13
-0+ | (1 << 6))); + +/* Program m, n pll parameters */ +drm_dbg (&kmb->drm,"m = %d n = %d\n" , best_m, best_n); + +/* PLL_Input_Divider_Ratio[3:0] = pll_n_ovr */ +test_mode_send (kmb, 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(kmb, dphy_no,
TEST_CODE_PLL_FEEDBACK_DIVIDER,drivers/gpu/drm/kmb/kmb_dsi.c line 1210
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+ (best_m & 0x1f)); + +/* m - high nibble PLL_Loop_Divider_Ratio[4:0] +* pll_m_ovr[9:5] +*/ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_FEEDBACK_DIVIDER,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ ((best_m >> 5) & 0x1f) |
PLL_FEEDBACK_DIVIDER_HIGH);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ +/* Enable overwrite of n,m parameters :pll_n_ovr_en,
pll_m_ovr_en*/drivers/gpu/drm/kmb/kmb_dsi.c line 1210
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0+ test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_OUTPUT_CLK_SEL,drivers/gpu/drm/kmb/kmb_dsi.c line 1213
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0+ (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(kmb, dphy_no, +
TEST_CODE_PLL_PROPORTIONAL_CHARGE_PUMP_CTRL,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ ((t_freq > 1150) ? 0x0C : 0x0B)); + +/* pll_int_cntrl-fixed value for int_cntrl from DPHY doc */ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_INTEGRAL_CHARGE_PUMP_CTRL,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0+ 0x00); + +/* pll_gmp_cntrl-fixed value for gmp_cntrl from DPHY doci */ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_GMP_CTRL,
0x10);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* pll_cpbias_cntrl-fixed value for cpbias_cntrl from DPHY doc */ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_CHARGE_PUMP_BIAS,0x10);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +/* pll_th1 -Lock Detector Phase error threshold, +* document gives fixed value +*/ + test_mode_send(kmb, dphy_no,
TEST_CODE_PLL_PHASE_ERR_CTRL,0x02);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +/* PLL Lock Configuration */ + +/* pll_th2 - Lock Filter length, document gives fixed value */ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_LOCK_FILTER,
0x60);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +3
-0+ +/* pll_th3- PLL Unlocking filter, document gives fixed value */ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_UNLOCK_FILTER,
0x03);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0+ +/* pll_lock_sel-PLL Lock Detector Selection, +* document gives fixed value +*/ + test_mode_send(kmb, dphy_no, TEST_CODE_PLL_LOCK_DETECTOR,
0x02);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0+} + +#ifdef DPHY_GET_FSM +static void dphy_get_fsm (struct kmb_drm_private *kmb,u32 dphy_no) +{ + test_mode_send(kmb, dphy_no, TEST_CODE_FSM_CONTROL,
0x80);Quoted 53 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +53
-0+ +drm_dbg (&kmb->drm,"dphy %d fsm_state = 0%x\n" , dphy_no, +kmb_read_mipi (kmb,DPHY_TEST_DOUBT4_7 )); +} +#endif + +static void dphy_init_sequence (struct kmb_drm_private *kmb, +struct mipi_ctrl_cfg *cfg,u32 dphy_no, +int active_lanes,enum dphy_mode mode) +{ +u32 test_code =0 , test_data =0 , val; +int i =0 ; + +drm_info (&kmb->drm, +"dphy=%d mode=%d active_lanes=%d\n" , dphy_no, mode, + active_lanes); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Set D-PHY in shutdown mode */ +/* Assert RSTZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,RESETZ ); + +/* Assert SHUTDOWNZ signal */ +CLR_DPHY_INIT_CTRL0 (kmb, dphy_no,SHUTDOWNZ ); + val =kmb_read_mipi (kmb,DPHY_INIT_CTRL0 ); + +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL0 = 0x%x\n" , val); + +/* Init D-PHY_n +* Pulse testclear signal to make sure the d-phy configuration +* starts from a clean base +*/ +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +SET_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); +CLR_DPHY_TEST_CTRL0 (kmb, dphy_no); +ndelay (15 ); + +drm_dbg (&kmb->drm,"DPHY_TEST_CTRL0=0x%x\n" , +kmb_read_mipi (kmb,DPHY_TEST_CTRL0 )); + +/* Set mastermacro bit - Master or slave mode */ + test_code =TEST_CODE_MULTIPLE_PHY_CTRL ; + +/* DPHY has its own clock lane enabled (master) */ +if (mode ==MIPI_DPHY_MASTER ) + test_data =0x01 ; +else + test_data =0x00 ; + +/* Send the test code and data */ drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set the lane data rate */ +for (i =0 ; i <MIPI_DPHY_DEFAULT_BIT_RATES ; i++) { +if (mipi_hs_freq_range[i].default_bit_rate_mbps < + cfg->lane_rate_mbps) +continue ; + +/* Send the test code and data */ +/* bit[6:0] = hsfreqrange_ovr bit[7] = hsfreqrange_ovr_en */
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0+ test_code =TEST_CODE_HS_FREQ_RANGE_CFG ; + test_data = (mipi_hs_freq_range[i].hsfreqrange_code &
0x7f) |Quoted 100 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +100
-0+ (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); +break ; + } + +/* High-Speed Tx Slew Rate Calibration +* BitRate: > 1.5 Gbps && <= 2.5 Gbps: slew rate control OFF +*/ +if (cfg->lane_rate_mbps >1500 ) { +/* Bypass slew rate calibration algorithm +* bits[1:0} srcal_en_ovr_en, srcal_en_ovr +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data =0x02 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Disable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x00 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + }else if (cfg->lane_rate_mbps >1000 ) { +/* BitRate: > 1 Gbps && <= 1.5 Gbps: - slew rate control ON +* typical rise/fall times: 166 ps +*/ + +/* Do not bypass slew rate calibration algorithm +* bits[1:0}=srcal_en_ovr_en, srcal_en_ovr, bit[6]=sr_range +*/ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[6:0] low nibble +* typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x72f &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble +* Typical rise/fall time=166, refer Table 1207 databook +*/ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x72f >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + }else { +/* lane_rate_mbps <= 1000 Mbps +* BitRate: <= 1 Gbps: +* - slew rate control ON +* - typical rise/fall times: 225 ps +*/ + +/* Do not bypass slew rate calibration algorithm */ + test_code =TEST_CODE_SLEW_RATE_OVERRIDE_CTRL ; + test_data = (0x03 | (1 <<6 )); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Enable slew rate calibration */ + test_code =TEST_CODE_SLEW_RATE_DDL_LOOP_CTRL ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Typical rise/fall time=255, refer Table 1207 databook */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = (0x523 &0x7f ); +test_mode_send (kmb, dphy_no, test_code, test_data); + +/* Set sr_osc_freq_target[11:7] high nibble */ + test_code =TEST_CODE_SLEW_RATE_DDL_CYCLES ; + test_data = ((0x523 >>6 ) &0x1f ) | (1 <<7 ); +test_mode_send (kmb, dphy_no, test_code, test_data); + } + +/* Set cfgclkfreqrange */ + val = (((cfg->cfg_clk_khz /1000 ) -17 ) *4 ) &0x3f ; +SET_DPHY_FREQ_CTRL0_3 (kmb, dphy_no, val); + +drm_dbg (&kmb->drm,"DPHY_FREQ = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_FREQ_CTRL0_3 +4 )); +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 )); + +/* Enable config clk for the corresponding d-phy */ +kmb_set_bit_mipi (kmb,DPHY_CFG_CLK_EN , dphy_no); + +drm_dbg (&kmb->drm,"DPHY_CFG_CLK_EN = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_CFG_CLK_EN )); + +/* PLL setup */ +if (mode ==MIPI_DPHY_MASTER ) { +/* Set PLL regulator in bypass */ + test_code =TEST_CODE_PLL_ANALOG_PROG ; + test_data =0x01 ; +test_mode_send (kmb, dphy_no, test_code, test_data); +drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+/* PLL Parameters Setup */ +mipi_tx_pll_setup (kmb, dphy_no, cfg->ref_clk_khz /1000 , + cfg->lane_rate_mbps /2 ); + +/* Set clksel */ +kmb_write_bits_mipi (kmb,DPHY_INIT_CTRL1 , +PLL_CLKSEL_0 ,2 ,0x01 ); + +/* Set pll_shadow_control */ + kmb_set_bit_mipi(kmb, DPHY_INIT_CTRL1,
PLL_SHADOW_CTRL);Quoted 57 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +57
-0+ +drm_dbg (&kmb->drm,"DPHY_INIT_CTRL1 = 0x%x\n" , +kmb_read_mipi (kmb,DPHY_INIT_CTRL1 )); + } + +drm_dbg (&kmb->drm,"MIPI_DPHY_STAT0_4_7 = 0x%x)\n" , +kmb_read_mipi (kmb,MIPI_DPHY_STAT4_7 ));Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
drivers/gpu/drm/kmb/kmb_dsi.c line 1438
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0+ +//#define MIPI_TX_FORCE_VOD +#ifdef MIPI_TX_FORCE_VOD +#define MIPI_TX_VOD_LVL 450 +#define TEST_CODE_BANDGAP 0x24 +/* Set bandgap/VOD level */ +switch (MIPI_TX_VOD_LVL ) { +case 200 : + test_data =0x00 ; +break ;
DPHY_ENABLE));drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 16 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dphy_no,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
TEST_CODE_FSM_CONTROL,0x80);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dphy_no, val);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
**********\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dphy_no,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 8 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
data_lanes=%d\n",
dphy_no,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
data_lanes;drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +9
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
OUT!(err_stat=%d)",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
MIPI_DPHY_ERR_STAT6_7));drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 19 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +19
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
**********\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 29 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +29
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*****\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 37 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +37
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
MIPI_DPHY_D_LANES,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 33 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +33
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*mode)
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 34 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
crtc_hdisplay;drivers/gpu/drm/kmb/kmb_dsi.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
crtc_vdisplay;drivers/gpu/drm/kmb/kmb_dsi.c new file +23
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
refresh=%d\n",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 16 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
mipi_tx_init_cfg.lane_rate_mbps);
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
hsync_len=%d lane-rate=%d",
drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 42 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +42
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
hw_initialized);drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 43 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +43
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DRM_MODE_ENCODER_DSI,drivers/gpu/drm/kmb/kmb_dsi.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
&kmb_dsi_connector_helper_funcs);Review
Quoted 20 lines
drivers/gpu/drm/kmb/kmb_dsi.c new file +19
-0Lines of this file are not shown. View the raw message.
(quoted diff) +0
-0The rest of this diff is not shown. View the raw message.
b/drivers/gpu/drm/kmb/kmb_dsi.hdrivers/gpu/drm/kmb/kmb_dsi.h
Quoted 69 lines
new file mode 100644
index 0000000..c980823drivers/gpu/drm/kmb/kmb_dsi.h new file +64
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
base)
drivers/gpu/drm/kmb/kmb_dsi.h
Quoted 250 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +250
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*sections[MIPI_TX_FRAME_GEN_SECTIONS];
drivers/gpu/drm/kmb/kmb_dsi.h
Quoted 55 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +55
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*mode);
Review
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_dsi.h new file +1
-0Lines of this file are not shown. View the raw message.
(quoted diff) +0
-0The rest of this diff is not shown. View the raw message.
b/drivers/gpu/drm/kmb/kmb_plane.cdrivers/gpu/drm/kmb/kmb_plane.c
Quoted 40 lines
new file mode 100644
index 0000000..31bcba0drivers/gpu/drm/kmb/kmb_plane.c new file +35
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
format)
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 25 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +25
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
KMB_MAX_HEIGHT)drivers/gpu/drm/kmb/kmb_plane.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
KMB_MIN_HEIGHT)drivers/gpu/drm/kmb/kmb_plane.c
Quoted 36 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +36
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGE;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGEdrivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGE;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGEdrivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGE;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGEdrivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGE;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_PLANAR_STORAGEdrivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_BGR_ORDER;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 45 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +45
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[0]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[1]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[2]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[3]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[4]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[5]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[6]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[7]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[8]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[9]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[10]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
csc_coef_lcd[11]);
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 32 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +32
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
returning");
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 19 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
flags=0x%x\n",
drivers/gpu/drm/kmb/kmb_plane.c new file +8
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dma_len);drivers/gpu/drm/kmb/kmb_plane.c
Quoted 14 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +14
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 9 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
state,
drivers/gpu/drm/kmb/kmb_plane.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_START_CR_ADR(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_START_CB_ADR(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +10
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_START_CB_ADR(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYERn_DMA_START_CR_ADR(plane_id),drivers/gpu/drm/kmb/kmb_plane.c
Quoted 56 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +56
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_DMA_LAYER_VSTRIDE_EN|drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_DMA_LAYER_AXI_BURST_16;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
dma_cfg,drivers/gpu/drm/kmb/kmb_plane.c
Quoted 32 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +32
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
*plane)
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
GFP_KERNEL);drivers/gpu/drm/kmb/kmb_plane.c
Quoted 24 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +12
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
state);
drivers/gpu/drm/kmb/kmb_plane.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
DRM_MODE_ROTATE_0;drivers/gpu/drm/kmb/kmb_plane.c
Quoted 27 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +27
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
This is incorrect. You allocate with
drmm_kzalloc()but free withkfree()in the plane's destroy callback. Memory returned bydrmm_kzallocwil be freed by DRM automatically.
Quoted 4 lines
Instead of allocating each plane individually, it's better to allocate the whole plane array with
drmm_kzalloc()first and that's all you need. The plane init loop then doesn't have to bother about memory allocation/freeing.
Will use drmm_kfree instead
Quoted 221 lines
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 12 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +11
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
ARRAY_SIZE(kmb_formats_v);drivers/gpu/drm/kmb/kmb_plane.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
ARRAY_SIZE(kmb_formats_g);drivers/gpu/drm/kmb/kmb_plane.c
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
&kmb_plane_funcs,drivers/gpu/drm/kmb/kmb_plane.c
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.c new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
num_plane_formats,drivers/gpu/drm/kmb/kmb_plane.c
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(ret=%d)",
drivers/gpu/drm/kmb/kmb_plane.c
Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +13
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
__LINE__,Review
Quoted 10 lines
drivers/gpu/drm/kmb/kmb_plane.c new file +9
-0Lines of this file are not shown. View the raw message.
(quoted diff) +0
-0The rest of this diff is not shown. View the raw message.
b/drivers/gpu/drm/kmb/kmb_plane.hdrivers/gpu/drm/kmb/kmb_plane.h
Quoted 33 lines
new file mode 100644
index 0000000..48f237fdrivers/gpu/drm/kmb/kmb_plane.h new file +28
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LAYER2_DMA_FIFO_UNDERFLOW)drivers/gpu/drm/kmb/kmb_plane.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LAYER3_DMA_FIFO_UNDERFLOW)drivers/gpu/drm/kmb/kmb_plane.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_INT_VL0_ERR)drivers/gpu/drm/kmb/kmb_plane.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_INT_VL1_ERR)drivers/gpu/drm/kmb/kmb_plane.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_INT_GL0_ERR)drivers/gpu/drm/kmb/kmb_plane.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_plane.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_INT_GL1_ERR)drivers/gpu/drm/kmb/kmb_plane.h
Quoted 39 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +39
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
supported */
drivers/gpu/drm/kmb/kmb_plane.h
Quoted 16 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
supported */
Review
Quoted 37 lines
drivers/gpu/drm/kmb/kmb_plane.h new file +36
-0Lines of this file are not shown. View the raw message.
(quoted diff) +0
-0The rest of this diff is not shown. View the raw message.
b/drivers/gpu/drm/kmb/kmb_regs.hdrivers/gpu/drm/kmb/kmb_regs.h
Quoted 21 lines
new file mode 100644
index 0000000..f794ac3drivers/gpu/drm/kmb/kmb_regs.h new file +16
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
0x10000)drivers/gpu/drm/kmb/kmb_regs.h
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+/*********************************************************
******************
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
**********************************************************
*****************/drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Just to show the bit position - bit 0 is 0 for progressive and bit 0 is 1 for interlaced.
Quoted 835 lines
What's the point of shifting 0 by 0?
drivers/gpu/drm/kmb/kmb_regs.h
Quoted 91 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +90
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+/*********************************************************
*******************drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
**********************************************************
******************drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER_SCALE_H | \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 5 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +5
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER_ALPHA_STATIC | \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_regs.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_LAYER_ALPHA_EMBED)drivers/gpu/drm/kmb/kmb_regs.h
Quoted 57 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +57
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_COL_START + (0x400 * (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_ROW_START + (0x400 * (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_SCALE_CFG + (0x400 * (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_INV_COLOUR_LS + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_INV_COLOUR_MS + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_TRANS_COLOUR_LS + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_TRANS_COLOUR_MS + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
+ (
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_CFG + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 6 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +6
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
LCD_DMA_LAYER_AUTO_UPDATE\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 1 line
drivers/gpu/drm/kmb/kmb_regs.h new file +1
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
LCD_DMA_LAYER_CONT_UPDATE)drivers/gpu/drm/kmb/kmb_regs.h
Quoted 21 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +21
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_START_ADR \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_START_SHADOW \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_LEN + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_LEN_SHADOW + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_STATUS + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_LINE_WIDTH + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_LINE_VSTRIDE +\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_FIFO_STATUS + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(
0x400* (N)))drivers/gpu/drm/kmb/kmb_regs.h
Quoted 2 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +2
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_START_CB_ADR + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_START_CB_SHADOW\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_CB_LINE_WIDTH +\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_CB_LINE_VSTRIDE\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_START_CR_ADR + \drivers/gpu/drm/kmb/kmb_regs.h
Quoted 4 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +4
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_START_CR_SHADOW\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_CR_LINE_WIDTH +\drivers/gpu/drm/kmb/kmb_regs.h
Quoted 3 lines
drivers/gpu/drm/kmb/kmb_regs.h new file +3
-0Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
(LCD_LAYER0_DMA_CR_LINE_VSTRIDE\493 lines not shown · raw message
Quoted 7 lines
7 lines not shown · raw message
4 lines not shown · raw message
Parts of this message are not shown here. View the raw message.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/kmb: Add support for KeemBay Display (rev4)
In reply to Anitha Chrisanthus== Series Details ==
== Series Details ==
Series: drm/kmb: Add support for KeemBay Display (rev4)
URL : https://patchwork.freedesktop.org/series/79615/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 7aaa226cd61c drm/kmb: Add support for KeemBay Display -:58: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #58: new file mode 100644
-:699: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_CFG> #699: FILE: drivers/gpu/drm/kmb/kmb_drv.c:345:
+ LCD_LAYERn_DMA_CFG
-:1024: WARNING:UNDOCUMENTED_DT_STRING: DT compatible string "intel,kmb_display" appears un-documented -- check ./Documentation/devicetree/bindings/ #1024: FILE: drivers/gpu/drm/kmb/kmb_drv.c:670:
+ {.compatible = "intel,kmb_display"},
-:1120: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #1120: FILE: drivers/gpu/drm/kmb/kmb_drv.h:35:
+ spinlock_t irq_lock;
-:1773: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_FGn_SECTo_PH> #1773: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:510:
+ (MIPI_TXm_HS_FGn_SECTo_PH(ctrl_no, frame_id, section)),
-:1785: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0> #1785: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:522:
+ MIPI_TXm_HS_FGn_SECT_UNPACKED_BYTES0(ctrl_no,
-:1794: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_FGn_SECTo_LINE_CFG> #1794: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:531:
+ reg_adr = MIPI_TXm_HS_FGn_SECTo_LINE_CFG(ctrl_no, frame_id, section);
-:1871: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_FGn_NUM_LINES> #1871: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:608:
+ reg_adr = MIPI_TXm_HS_FGn_NUM_LINES(ctrl_no, frame_gen);
-:1881: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_VSYNC_WIDTHn> #1881: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:618:
+ reg_adr = MIPI_TXm_HS_VSYNC_WIDTHn(ctrl_no, frame_gen / 2);
-:1885: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_V_BACKPORCHESn> #1885: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:622:
+ reg_adr = MIPI_TXm_HS_V_BACKPORCHESn(ctrl_no, frame_gen / 2);
-:1889: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_V_FRONTPORCHESn> #1889: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:626:
+ reg_adr = MIPI_TXm_HS_V_FRONTPORCHESn(ctrl_no, frame_gen / 2);
-:1893: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_V_ACTIVEn> #1893: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:630:
+ reg_adr = MIPI_TXm_HS_V_ACTIVEn(ctrl_no, frame_gen / 2);
-:1897: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_HSYNC_WIDTHn> #1897: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:634:
+ reg_adr = MIPI_TXm_HS_HSYNC_WIDTHn(ctrl_no, frame_gen);
-:1902: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_H_BACKPORCHn> #1902: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:639:
+ reg_adr = MIPI_TXm_HS_H_BACKPORCHn(ctrl_no, frame_gen);
-:1907: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_H_FRONTPORCHn> #1907: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:644:
+ reg_adr = MIPI_TXm_HS_H_FRONTPORCHn(ctrl_no, frame_gen);
-:1912: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_H_ACTIVEn> #1912: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:649:
+ reg_adr = MIPI_TXm_HS_H_ACTIVEn(ctrl_no, frame_gen);
-:1921: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_LLP_HSYNC_WIDTHn> #1921: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:658:
+ reg_adr = MIPI_TXm_HS_LLP_HSYNC_WIDTHn(ctrl_no, frame_gen);
-:1925: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_LLP_H_BACKPORCHn> #1925: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:662:
+ reg_adr = MIPI_TXm_HS_LLP_H_BACKPORCHn(ctrl_no, frame_gen);
-:1929: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_LLP_H_FRONTPORCHn> #1929: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:666:
+ reg_adr = MIPI_TXm_HS_LLP_H_FRONTPORCHn(ctrl_no, frame_gen);
-:1993: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_MC_FIFO_CTRL_EN> #1993: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:730:
+ kmb_set_bit_mipi(kmb, MIPI_TXm_HS_MC_FIFO_CTRL_EN(ctrl_no),
-:2050: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_SYNC_CFG> #2050: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:787:
+ kmb_write_mipi(kmb, MIPI_TXm_HS_SYNC_CFG(ctrl_no), sync_cfg);
-:2051: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_CTRL> #2051: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:788:
+ kmb_write_mipi(kmb, MIPI_TXm_HS_CTRL(ctrl_no), ctrl);
-:2062: CHECK:CAMELCASE: Avoid CamelCase: <TP_SEL_VCm> #2062: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:799:
+ val = TP_SEL_VCm(vc, tp_sel);
-:2065: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_TEST_PAT_COLOR0> #2065: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:802:
+ kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_COLOR0(ctrl_no), color0);
-:2066: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_TEST_PAT_COLOR1> #2066: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:803:
+ kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_COLOR1(ctrl_no), color1);
-:2069: CHECK:CAMELCASE: Avoid CamelCase: <TP_EN_VCm> #2069: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:806:
+ val |= TP_EN_VCm(vc);
-:2070: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_TEST_PAT_CTRL> #2070: FILE: drivers/gpu/drm/kmb/kmb_dsi.c:807:
+ kmb_write_mipi(kmb, MIPI_TXm_HS_TEST_PAT_CTRL(ctrl_no), val);
-:3688: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF11> #3688: FILE: drivers/gpu/drm/kmb/kmb_plane.c:215:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF11(plane_id), csc_coef_lcd[0]);
-:3689: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF12> #3689: FILE: drivers/gpu/drm/kmb/kmb_plane.c:216:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF12(plane_id), csc_coef_lcd[1]);
-:3690: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF13> #3690: FILE: drivers/gpu/drm/kmb/kmb_plane.c:217:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF13(plane_id), csc_coef_lcd[2]);
-:3691: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF21> #3691: FILE: drivers/gpu/drm/kmb/kmb_plane.c:218:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF21(plane_id), csc_coef_lcd[3]);
-:3692: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF22> #3692: FILE: drivers/gpu/drm/kmb/kmb_plane.c:219:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF22(plane_id), csc_coef_lcd[4]);
-:3693: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF23> #3693: FILE: drivers/gpu/drm/kmb/kmb_plane.c:220:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF23(plane_id), csc_coef_lcd[5]);
-:3694: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF31> #3694: FILE: drivers/gpu/drm/kmb/kmb_plane.c:221:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF31(plane_id), csc_coef_lcd[6]);
-:3695: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF32> #3695: FILE: drivers/gpu/drm/kmb/kmb_plane.c:222:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF32(plane_id), csc_coef_lcd[7]);
-:3696: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_COEFF33> #3696: FILE: drivers/gpu/drm/kmb/kmb_plane.c:223:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_COEFF33(plane_id), csc_coef_lcd[8]);
-:3697: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_OFF1> #3697: FILE: drivers/gpu/drm/kmb/kmb_plane.c:224:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF1(plane_id), csc_coef_lcd[9]);
-:3698: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_OFF2> #3698: FILE: drivers/gpu/drm/kmb/kmb_plane.c:225:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF2(plane_id), csc_coef_lcd[10]);
-:3699: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CSC_OFF3> #3699: FILE: drivers/gpu/drm/kmb/kmb_plane.c:226:
+ kmb_write_lcd(kmb, LCD_LAYERn_CSC_OFF3(plane_id), csc_coef_lcd[11]);
-:3748: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LEN> #3748: FILE: drivers/gpu/drm/kmb/kmb_plane.c:275:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN(plane_id), dma_len);
-:3749: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LEN_SHADOW> #3749: FILE: drivers/gpu/drm/kmb/kmb_plane.c:276:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_LEN_SHADOW(plane_id), dma_len);
-:3750: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LINE_VSTRIDE> #3750: FILE: drivers/gpu/drm/kmb/kmb_plane.c:277:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_VSTRIDE(plane_id),
-:3752: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_LINE_WIDTH> #3752: FILE: drivers/gpu/drm/kmb/kmb_plane.c:279:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_LINE_WIDTH(plane_id),
-:3757: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_ADDR> #3757: FILE: drivers/gpu/drm/kmb/kmb_plane.c:284:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_START_ADDR(plane_id),
-:3763: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_CB_LINE_VSTRIDE> #3763: FILE: drivers/gpu/drm/kmb/kmb_plane.c:290:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_CB_LINE_VSTRIDE(plane_id),
-:3765: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_CB_LINE_WIDTH> #3765: FILE: drivers/gpu/drm/kmb/kmb_plane.c:292:
+ kmb_write_lcd(kmb, LCD_LAYERn_DMA_CB_LINE_WIDTH(plane_id),
-:3773: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_CR_ADR> #3773: FILE: drivers/gpu/drm/kmb/kmb_plane.c:300:
+ LCD_LAYERn_DMA_START_CR_ADR(plane_id),
-:3777: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_CB_ADR> #3777: FILE: drivers/gpu/drm/kmb/kmb_plane.c:304:
+ LCD_LAYERn_DMA_START_CB_ADR(plane_id),
-:3782: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_CR_LINE_VSTRIDE> #3782: FILE: drivers/gpu/drm/kmb/kmb_plane.c:309:
+ LCD_LAYERn_DMA_CR_LINE_VSTRIDE(plane_id),
-:3786: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_CR_LINE_WIDTH> #3786: FILE: drivers/gpu/drm/kmb/kmb_plane.c:313:
+ LCD_LAYERn_DMA_CR_LINE_WIDTH(plane_id),
-:3805: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_WIDTH> #3805: FILE: drivers/gpu/drm/kmb/kmb_plane.c:332:
+ kmb_write_lcd(kmb, LCD_LAYERn_WIDTH(plane_id), src_w - 1);
-:3806: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_HEIGHT> #3806: FILE: drivers/gpu/drm/kmb/kmb_plane.c:333:
+ kmb_write_lcd(kmb, LCD_LAYERn_HEIGHT(plane_id), src_h - 1);
-:3807: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_COL_START> #3807: FILE: drivers/gpu/drm/kmb/kmb_plane.c:334:
+ kmb_write_lcd(kmb, LCD_LAYERn_COL_START(plane_id), crtc_x);
-:3808: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_ROW_START> #3808: FILE: drivers/gpu/drm/kmb/kmb_plane.c:335:
+ kmb_write_lcd(kmb, LCD_LAYERn_ROW_START(plane_id), crtc_y);
-:3819: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CFG> #3819: FILE: drivers/gpu/drm/kmb/kmb_plane.c:346:
+ kmb_write_lcd(kmb, LCD_LAYERn_CFG(plane_id), val);
-:4323: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_SCALE_CFG> #4323: FILE: drivers/gpu/drm/kmb/kmb_regs.h:195:
+#define LCD_LAYERn_SCALE_CFG(N) (LCD_LAYER0_SCALE_CFG + (0x400 * (N)))
-:4325: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_ALPHA> #4325: FILE: drivers/gpu/drm/kmb/kmb_regs.h:197:
+#define LCD_LAYERn_ALPHA(N) (LCD_LAYER0_ALPHA + (0x400 * (N)))
-:4327: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_INV_COLOUR_LS> #4327: FILE: drivers/gpu/drm/kmb/kmb_regs.h:199:
+#define LCD_LAYERn_INV_COLOUR_LS(N) (LCD_LAYER0_INV_COLOUR_LS + \
-:4330: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_INV_COLOUR_MS> #4330: FILE: drivers/gpu/drm/kmb/kmb_regs.h:202:
+#define LCD_LAYERn_INV_COLOUR_MS(N) (LCD_LAYER0_INV_COLOUR_MS + \
-:4333: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_TRANS_COLOUR_LS> #4333: FILE: drivers/gpu/drm/kmb/kmb_regs.h:205:
+#define LCD_LAYERn_TRANS_COLOUR_LS(N) (LCD_LAYER0_TRANS_COLOUR_LS + \
-:4336: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_TRANS_COLOUR_MS> #4336: FILE: drivers/gpu/drm/kmb/kmb_regs.h:208:
+#define LCD_LAYERn_TRANS_COLOUR_MS(N) (LCD_LAYER0_TRANS_COLOUR_MS + \
-:4396: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_SHADOW> #4396: FILE: drivers/gpu/drm/kmb/kmb_regs.h:268:
+#define LCD_LAYERn_DMA_START_SHADOW(N) (LCD_LAYER0_DMA_START_SHADOW \
-:4405: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_STATUS> #4405: FILE: drivers/gpu/drm/kmb/kmb_regs.h:277:
+#define LCD_LAYERn_DMA_STATUS(N) (LCD_LAYER0_DMA_STATUS + \
-:4414: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_FIFO_STATUS> #4414: FILE: drivers/gpu/drm/kmb/kmb_regs.h:286:
+#define LCD_LAYERn_DMA_FIFO_STATUS(N) (LCD_LAYER0_DMA_FIFO_STATUS + \
-:4417: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_CFG2> #4417: FILE: drivers/gpu/drm/kmb/kmb_regs.h:289:
+#define LCD_LAYERn_CFG2(N) (LCD_LAYER0_CFG2 + (0x400 * (N)))
-:4422: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_CB_SHADOW> #4422: FILE: drivers/gpu/drm/kmb/kmb_regs.h:294:
+#define LCD_LAYERn_DMA_START_CB_SHADOW(N) (LCD_LAYER0_DMA_START_CB_SHADOW\
-:4434: CHECK:CAMELCASE: Avoid CamelCase: <LCD_LAYERn_DMA_START_CR_SHADOW> #4434: FILE: drivers/gpu/drm/kmb/kmb_regs.h:306:
+#define LCD_LAYERn_DMA_START_CR_SHADOW(N) \
-:4649: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_MC_FIFO_CHAN_ALLOCn> #4649: FILE: drivers/gpu/drm/kmb/kmb_regs.h:521:
+#define MIPI_TXm_HS_MC_FIFO_CHAN_ALLOCn(M, N) \
-:4652: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'vc' - possible side-effects? #4652: FILE: drivers/gpu/drm/kmb/kmb_regs.h:524:
+#define SET_MC_FIFO_CHAN_ALLOC(dev, ctrl, vc, sz) \
+ kmb_write_bits_mipi(dev, \
+ MIPI_TXm_HS_MC_FIFO_CHAN_ALLOCn(ctrl, \
+ (vc) / 2), ((vc) % 2) * 16, 16, sz)
-:4658: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TXm_HS_MC_FIFO_RTHRESHOLDn> #4658: FILE: drivers/gpu/drm/kmb/kmb_regs.h:530:
+#define MIPI_TXm_HS_MC_FIFO_RTHRESHOLDn(M, N) \
-:4661: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'vc' - possible side-effects? #4661: FILE: drivers/gpu/drm/kmb/kmb_regs.h:533:
+#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)
-:4699: CHECK:CAMELCASE: Avoid CamelCase: <MIPI_TX_HS_IRQ_STATUSm> #4699: FILE: drivers/gpu/drm/kmb/kmb_regs.h:571:
+#define MIPI_TX_HS_IRQ_STATUSm(M) (MIPI_TX_HS_IRQ_STATUS + \
-:4807: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dphy' - possible side-effects? #4807: FILE: drivers/gpu/drm/kmb/kmb_regs.h:679:
+#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)
-:4815: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dphy' - possible side-effects? #4815: FILE: drivers/gpu/drm/kmb/kmb_regs.h:687:
+#define GET_STOPSTATE_DATA(dev, dphy) \
+ (((kmb_read_mipi(dev, MIPI_DPHY_STAT0_3 + \
+ ((dphy) / 4) * 4)) >> \
+ (((dphy % 4) * 8) + 4)) & 0x03)
total: 0 errors, 2 warnings, 72 checks, 4769 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/kmb: Add support for KeemBay Display (rev4)
In reply to Anitha Chrisanthus== Series Details ==
== Series Details ==
Series: drm/kmb: Add support for KeemBay Display (rev4)
URL : https://patchwork.freedesktop.org/series/79615/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8866 -> Patchwork_18336
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/index.html
Known issues
------------
Here are the changes found in Patchwork_18336 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic@flip:
- fi-kbl-x1275: [PASS][1] -> [DMESG-WARN][2] ([i915#62] / [i915#92] / [i915#95])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-kbl-x1275/igt@kms_busy@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-kbl-x1275/igt@kms_busy@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@c-hdmi-a2:
- fi-skl-guc: [PASS][3] -> [DMESG-WARN][4] ([i915#2203])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-skl-guc/igt@kms_flip@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-skl-guc/igt@kms_flip@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- fi-byt-j1900: [DMESG-WARN][5] ([i915#1982]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-byt-j1900/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-byt-j1900/igt@[email protected]
* igt@i915_selftest@live@execlists:
- fi-icl-y: [INCOMPLETE][7] ([i915#2276]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-icl-y/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-icl-y/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- {fi-kbl-7560u}: [DMESG-WARN][9] ([i915#1982]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-kbl-7560u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-kbl-7560u/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-icl-u2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-icl-u2/igt@[email protected]
#### Warnings ####
* igt@kms_cursor_legacy@basic-flip-before-cursor-varying-size:
- fi-kbl-x1275: [DMESG-WARN][13] ([i915#62] / [i915#92]) -> [DMESG-WARN][14] ([i915#62] / [i915#92] / [i915#95]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-kbl-x1275/igt@[email protected]
* igt@kms_force_connector_basic@prune-stale-modes:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][16] ([i915#62] / [i915#92]) +5 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/fi-kbl-x1275/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
[i915#2276]: https://gitlab.freedesktop.org/drm/intel/issues/2276
[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_8866 -> Patchwork_18336
CI-20190529: 20190529
CI_DRM_8866: 14e46145f8add798ffc8d63a53e803749ccd3286 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5766: fc9f95086fc23f7f2226f7603241fbad3a214ee1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18336: 7aaa226cd61cc1df04614bad7468774f50ff06d1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7aaa226cd61c drm/kmb: Add support for KeemBay Display
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/kmb: Add support for KeemBay Display (rev4)
In reply to Anitha Chrisanthus== Series Details ==
== Series Details ==
Series: drm/kmb: Add support for KeemBay Display (rev4)
URL : https://patchwork.freedesktop.org/series/79615/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_8866_full -> Patchwork_18336_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18336_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_18336_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_18336_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-onoff:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-tglb6/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-tglb8/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_18336_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_whisper@basic-queues-forked:
- shard-glk: [PASS][3] -> [DMESG-WARN][4] ([i915#118] / [i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-glk2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-glk1/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([i915#1436] / [i915#1635] / [i915#716])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-apl4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-apl8/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-hsw: [PASS][7] -> [WARN][8] ([i915#1519])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-hsw6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-hsw4/igt@[email protected]
* igt@kms_big_fb@yf-tiled-32bpp-rotate-270:
- shard-skl: [PASS][9] -> [DMESG-WARN][10] ([i915#1982]) +15 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl5/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl3/igt@[email protected]
* igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions:
- shard-kbl: [PASS][11] -> [DMESG-WARN][12] ([i915#1982])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-kbl1/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-kbl4/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
* igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][13] -> [FAIL][14] ([i915#2122])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-glk1/igt@kms_flip@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-glk1/igt@kms_flip@[email protected]
* igt@kms_flip@2x-plain-flip-ts-check-interruptible@ab-vga1-hdmi-a1:
- shard-hsw: [PASS][15] -> [DMESG-WARN][16] ([i915#1982])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-hsw7/igt@kms_flip@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-hsw6/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [PASS][17] -> [FAIL][18] ([i915#2122])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl9/igt@kms_flip@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl2/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1:
- shard-glk: [PASS][19] -> [FAIL][20] ([i915#79])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-glk7/igt@kms_flip@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-glk6/igt@kms_flip@[email protected]
* igt@kms_flip_tiling@flip-to-y-tiled:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#167])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl2/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb101010-draw-mmap-gtt:
- shard-tglb: [PASS][23] -> [DMESG-WARN][24] ([i915#1982]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-tglb8/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-tglb3/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-skl: [PASS][25] -> [FAIL][26] ([i915#49])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl1/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][27] -> [FAIL][28] ([fdo#108145] / [i915#265])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl1/igt@[email protected]
* igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping:
- shard-iclb: [PASS][29] -> [DMESG-WARN][30] ([i915#1982])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-iclb4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-iclb3/igt@[email protected]
* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][31] -> [FAIL][32] ([i915#173])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-iclb4/igt@kms_psr@no_drrs.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-iclb1/igt@kms_psr@no_drrs.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441]) +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-iclb1/igt@kms_psr@psr2_sprite_plane_move.html
#### Possible fixes ####
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][35] ([i915#2190]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-tglb6/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-tglb8/igt@[email protected]
* igt@kms_color@pipe-a-ctm-0-75:
- shard-glk: [DMESG-WARN][37] ([i915#118] / [i915#95]) -> [PASS][38] +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-glk1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-glk4/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-legacy:
- shard-glk: [DMESG-WARN][39] ([i915#1982]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-glk4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-glk3/igt@[email protected]
* igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions:
- shard-apl: [DMESG-WARN][41] ([i915#1635] / [i915#1982]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-apl1/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-apl8/igt@kms_cursor_legacy@short-flip-before-cursor-atomic-transitions.html
* igt@kms_flip@2x-nonexisting-fb@ab-vga1-hdmi-a1:
- shard-hsw: [DMESG-WARN][43] ([i915#1982]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-hsw6/igt@kms_flip@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-hsw1/igt@kms_flip@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank@a-dp1:
- shard-kbl: [DMESG-WARN][45] ([i915#1982]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-kbl4/igt@kms_flip@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-kbl7/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [DMESG-WARN][47] ([i915#180]) -> [PASS][48] +9 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-kbl7/igt@kms_flip@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-kbl2/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-ts-check@b-edp1:
- shard-skl: [FAIL][49] ([i915#2122]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl10/igt@kms_flip@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl4/igt@kms_flip@[email protected]
* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-blt:
- shard-tglb: [DMESG-WARN][51] ([i915#1982]) -> [PASS][52] +2 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-tglb3/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-tglb5/igt@[email protected]
* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][53] ([i915#1188]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl8/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl7/igt@[email protected]
* igt@kms_plane_scaling@pipe-b-scaler-with-pixel-format:
- shard-skl: [DMESG-WARN][55] ([i915#1982]) -> [PASS][56] +5 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl8/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl7/igt@[email protected]
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][57] ([fdo#109642] / [fdo#111068]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-iclb8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_primary_blt:
- shard-iclb: [SKIP][59] ([fdo#109441]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-iclb5/igt@kms_psr@psr2_primary_blt.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-iclb2/igt@kms_psr@psr2_primary_blt.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][61] ([i915#31]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-kbl3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-kbl1/igt@[email protected]
* {igt@syncobj_timeline@wait-any-snapshot}:
- shard-glk: [FAIL][63] ([i915#2329]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-glk7/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-glk6/igt@[email protected]
#### Warnings ####
* igt@gem_exec_reloc@basic-concurrent16:
- shard-apl: [TIMEOUT][65] ([i915#1635] / [i915#1958]) -> [INCOMPLETE][66] ([i915#1635] / [i915#1958])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-apl7/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-apl7/igt@[email protected]
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][67] ([i915#588]) -> [SKIP][68] ([i915#658])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-iclb2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-iclb1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][69] ([fdo#108145] / [i915#265]) -> [DMESG-WARN][70] ([i915#1982])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8866/shard-skl4/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18336/shard-skl9/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[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
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#167]: https://gitlab.freedesktop.org/drm/intel/issues/167
[i915#173]: https://gitlab.freedesktop.org/drm/intel/issues/173
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2329]: https://gitlab.freedesktop.org/drm/intel/issues/2329
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[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#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_8866 -> Patchwork_18336
CI-20190529: 20190529
CI_DRM_8866: 14e46145f8add798ffc8d63a53e803749ccd3286 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5766: fc9f95086fc23f7f2226f7603241fbad3a214ee1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18336: 7aaa226cd61cc1df04614bad7468774f50ff06d1 @ 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_18336/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx