* [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters [not found] <CGME20180503082417epcas5p19ee919d68eb5ae18f183a41881869cc1@epcas5p1.samsung.com> @ 2018-05-03 8:23 ` Satendra Singh Thakur [not found] ` <CGME20180503090930epcas5p23ef09c1e72c344bf8d879a344d0998cf@epcas5p2.samsung.com> 2018-05-07 13:46 ` [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode " Daniel Vetter 0 siblings, 2 replies; 6+ messages in thread From: Satendra Singh Thakur @ 2018-05-03 8:23 UTC (permalink / raw) To: linus-amlogic 1.There is a function in drm-core to calculate display timing parameters: horizontal front porch, back porch, sync length, vertical front porch, back porch, sync length and clock in Hz. However, some drivers are still calculating these parameters themselves. Therefore, there is a duplication of the code. This patch series replaces this redundant code with the function drm_display_mode_to_videomode. This removes nearly 100 redundant lines from the related drivers. 2.For some drivers (sun4i) the reverse helper drm_display_mode_from_videomode is used. 3.For some drivers it replaces arithmatic operators (*, /) with shifting operators (>>, <<). 4.For some drivers DRM_MODE_FLAG_* are replaced with DISPLAY_FLAGS_* flags. 5.These changes apply to following crtc and encoder drivers: atmel-hlcdc bridge-tc358767 exynos-dsi fsl-dcu gma500-mdfld_dsi_dpi hisilicon-kirin_dsi, ade meson-encoder pl111-display sun4i-tv ti lcdc tegra dc mediatek dpi dsi bridge-adv7533 Satendra Singh Thakur (13): drm/kms/mode/atmel-hlcdc: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/bridge-tc358767: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/exynos-dsi: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/fsl-dcu: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/gma500-mdfld_dsi_dpi: using helper function drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/hisilicon-kirin-dsi-ade: using helper function drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/meson-encoder: using helper function drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/pl111-display: using helper function drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/sun4i-tv: using helper func drm_display_mode_from_videomode for calculating timing parameters drm/kms/mode/ti-lcdc: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/tegra: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/mtk_dpi_dsi: using helper func drm_display_mode_to_videomode for calculating timing parameters drm/kms/mode/bridge-adv7533: using helper func drm_display_mode_to_videomode for calculating timing parameters drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 28 +++-- drivers/gpu/drm/bridge/adv7511/adv7533.c | 35 +++--- drivers/gpu/drm/bridge/tc358767.c | 42 +++---- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 29 ++--- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 28 ++--- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 42 ++++--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 52 +++------ drivers/gpu/drm/mediatek/mtk_dpi.c | 60 +++++----- drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +-- drivers/gpu/drm/meson/meson_venc.c | 149 +++++++++++------------- drivers/gpu/drm/pl111/pl111_display.c | 40 +++---- drivers/gpu/drm/sun4i/sun4i_tv.c | 67 ++++------- drivers/gpu/drm/tegra/dc.c | 15 ++- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 60 +++++----- 15 files changed, 280 insertions(+), 390 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <CGME20180503090930epcas5p23ef09c1e72c344bf8d879a344d0998cf@epcas5p2.samsung.com>]
* [PATCH 07/13] drm/kms/mode/meson-encoder: using helper function drm_display_mode_to_videomode for calculating timing parameters [not found] ` <CGME20180503090930epcas5p23ef09c1e72c344bf8d879a344d0998cf@epcas5p2.samsung.com> @ 2018-05-03 9:09 ` Satendra Singh Thakur 0 siblings, 0 replies; 6+ messages in thread From: Satendra Singh Thakur @ 2018-05-03 9:09 UTC (permalink / raw) To: linus-amlogic -Duplicate logic for the timing params is avoided -Arithmatic operator *,/ are replaced by logical >>, << operators -The flags DRM_MODE_FLAG_* are replaced with DISPLAY_FLAGS_* flags -Combined similar if statements Signed-off-by: Satendra Singh Thakur <satendra.t@samsung.com> Cc: Madhur Verma <madhur.verma@samsung.com> Cc: Hemanshu Srivastava <hemanshu.s@samsung.com> --- drivers/gpu/drm/meson/meson_venc.c | 149 ++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 84 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c index 6e27013..dddf914 100644 --- a/drivers/gpu/drm/meson/meson_venc.c +++ b/drivers/gpu/drm/meson/meson_venc.c @@ -25,7 +25,7 @@ #include "meson_vpp.h" #include "meson_vclk.h" #include "meson_registers.h" - +#include <video/videomode.h> /** * DOC: Video Encoder * @@ -1125,9 +1125,6 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, bool hdmi_repeat = false; unsigned int venc_hdmi_latency = 2; unsigned long total_pixels_venc = 0; - unsigned long active_pixels_venc = 0; - unsigned long front_porch_venc = 0; - unsigned long hsync_pixels_venc = 0; unsigned long de_h_begin = 0; unsigned long de_h_end = 0; unsigned long de_v_begin_even = 0; @@ -1143,9 +1140,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, unsigned long vs_eline_odd = 0; unsigned long vso_begin_evn = 0; unsigned long vso_begin_odd = 0; - unsigned int eof_lines; - unsigned int sof_lines; - unsigned int vsync_lines; + struct videomode vm = {}; if (meson_venc_hdmi_supported_vic(vic)) vmode = meson_venc_hdmi_get_vic_vmode(vic); @@ -1156,9 +1151,9 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, DRM_MODE_FMT "\n", __func__, DRM_MODE_ARG(mode)); return; } - + drm_display_mode_to_videomode(mode, &vm); /* Use VENCI for 480i and 576i and double HDMI pixels */ - if (mode->flags & DRM_MODE_FLAG_DBLCLK) { + if (vm.flags & DISPLAY_FLAGS_DOUBLECLK) { hdmi_repeat = true; use_enci = true; venc_hdmi_latency = 1; @@ -1167,40 +1162,25 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, /* Repeat VENC pixels for 480/576i/p, 720p50/60 and 1080p50/60 */ if (meson_venc_hdmi_venc_repeat(vic)) venc_repeat = true; - - eof_lines = mode->vsync_start - mode->vdisplay; - if (mode->flags & DRM_MODE_FLAG_INTERLACE) - eof_lines /= 2; - sof_lines = mode->vtotal - mode->vsync_end; - if (mode->flags & DRM_MODE_FLAG_INTERLACE) - sof_lines /= 2; - vsync_lines = mode->vsync_end - mode->vsync_start; - if (mode->flags & DRM_MODE_FLAG_INTERLACE) - vsync_lines /= 2; + if (vm.flags & DISPLAY_FLAGS_INTERLACED) { + vm.vfront_porch >>= 1; + vm.vback_porch >>= 1; + vm.vsync_len >>= 1; + } total_pixels_venc = mode->htotal; - if (hdmi_repeat) - total_pixels_venc /= 2; - if (venc_repeat) - total_pixels_venc *= 2; - - active_pixels_venc = mode->hdisplay; - if (hdmi_repeat) - active_pixels_venc /= 2; - if (venc_repeat) - active_pixels_venc *= 2; - - front_porch_venc = (mode->hsync_start - mode->hdisplay); - if (hdmi_repeat) - front_porch_venc /= 2; - if (venc_repeat) - front_porch_venc *= 2; - - hsync_pixels_venc = (mode->hsync_end - mode->hsync_start); - if (hdmi_repeat) - hsync_pixels_venc /= 2; - if (venc_repeat) - hsync_pixels_venc *= 2; + if (hdmi_repeat) { + total_pixels_venc >>= 1; + vm.hactive >>= 1; + vm.hfront_porch >>= 1; + vm.hsync_len >>= 1; + } + if (venc_repeat) { + total_pixels_venc <<= 1; + vm.hactive <<= 1; + vm.hfront_porch <<= 1; + vm.hsync_len <<= 1; + } /* Disable VDACs */ writel_bits_relaxed(0xff, 0xff, @@ -1302,7 +1282,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, _REG(ENCI_VFIFO2VD_PIXEL_START)) + venc_hdmi_latency, total_pixels_venc); - de_h_end = modulo(de_h_begin + active_pixels_venc, + de_h_end = modulo(de_h_begin + vm.hactive, total_pixels_venc); writel_relaxed(de_h_begin, @@ -1312,10 +1292,10 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, de_v_begin_even = readl_relaxed(priv->io_base + _REG(ENCI_VFIFO2VD_LINE_TOP_START)); - de_v_end_even = de_v_begin_even + mode->vdisplay; + de_v_end_even = de_v_begin_even + vm.vactive; de_v_begin_odd = readl_relaxed(priv->io_base + _REG(ENCI_VFIFO2VD_LINE_BOT_START)); - de_v_end_odd = de_v_begin_odd + mode->vdisplay; + de_v_end_odd = de_v_begin_odd + vm.vactive; writel_relaxed(de_v_begin_even, priv->io_base + _REG(ENCI_DE_V_BEGIN_EVEN)); @@ -1327,16 +1307,16 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, priv->io_base + _REG(ENCI_DE_V_END_ODD)); /* Program Hsync timing */ - hs_begin = de_h_end + front_porch_venc; - if (de_h_end + front_porch_venc >= total_pixels_venc) { + hs_begin = de_h_end + vm.hfront_porch; + if (de_h_end + vm.hfront_porch >= total_pixels_venc) { hs_begin -= total_pixels_venc; vs_adjust = 1; } else { - hs_begin = de_h_end + front_porch_venc; + hs_begin = de_h_end + vm.hfront_porch; vs_adjust = 0; } - hs_end = modulo(hs_begin + hsync_pixels_venc, + hs_end = modulo(hs_begin + vm.hsync_len, total_pixels_venc); writel_relaxed(hs_begin, priv->io_base + _REG(ENCI_DVI_HSO_BEGIN)); @@ -1344,12 +1324,13 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, priv->io_base + _REG(ENCI_DVI_HSO_END)); /* Program Vsync timing for even field */ - if (((de_v_end_odd - 1) + eof_lines + vs_adjust) >= lines_f1) { + if (((de_v_end_odd - 1) + vm.vfront_porch + vs_adjust) + >= lines_f1) { vs_bline_evn = (de_v_end_odd - 1) - + eof_lines + + vm.vfront_porch + vs_adjust - lines_f1; - vs_eline_evn = vs_bline_evn + vsync_lines; + vs_eline_evn = vs_bline_evn + vm.vsync_len; writel_relaxed(vs_bline_evn, priv->io_base + _REG(ENCI_DVI_VSO_BLINE_EVN)); @@ -1363,7 +1344,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, priv->io_base + _REG(ENCI_DVI_VSO_END_EVN)); } else { vs_bline_odd = (de_v_end_odd - 1) - + eof_lines + + vm.vfront_porch + vs_adjust; writel_relaxed(vs_bline_odd, @@ -1372,9 +1353,9 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, writel_relaxed(hs_begin, priv->io_base + _REG(ENCI_DVI_VSO_BEGIN_ODD)); - if ((vs_bline_odd + vsync_lines) >= lines_f1) { + if ((vs_bline_odd + vm.vsync_len) >= lines_f1) { vs_eline_evn = vs_bline_odd - + vsync_lines + + vm.vsync_len - lines_f1; writel_relaxed(vs_eline_evn, priv->io_base @@ -1384,7 +1365,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, + _REG(ENCI_DVI_VSO_END_EVN)); } else { vs_eline_odd = vs_bline_odd - + vsync_lines; + + vm.vsync_len; writel_relaxed(vs_eline_odd, priv->io_base + _REG(ENCI_DVI_VSO_ELINE_ODD)); @@ -1395,11 +1376,11 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, } /* Program Vsync timing for odd field */ - if (((de_v_end_even - 1) + (eof_lines + 1)) >= lines_f0) { + if (((de_v_end_even - 1) + (vm.vfront_porch + 1)) >= lines_f0) { vs_bline_odd = (de_v_end_even - 1) - + (eof_lines + 1) + + (vm.vfront_porch + 1) - lines_f0; - vs_eline_odd = vs_bline_odd + vsync_lines; + vs_eline_odd = vs_bline_odd + vm.vsync_len; writel_relaxed(vs_bline_odd, priv->io_base + _REG(ENCI_DVI_VSO_BLINE_ODD)); @@ -1417,7 +1398,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, priv->io_base + _REG(ENCI_DVI_VSO_END_ODD)); } else { vs_bline_evn = (de_v_end_even - 1) - + (eof_lines + 1); + + (vm.vfront_porch + 1); writel_relaxed(vs_bline_evn, priv->io_base + _REG(ENCI_DVI_VSO_BLINE_EVN)); @@ -1429,9 +1410,9 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, writel_relaxed(vso_begin_evn, priv->io_base + _REG(ENCI_DVI_VSO_BEGIN_EVN)); - if (vs_bline_evn + vsync_lines >= lines_f0) { + if (vs_bline_evn + vm.vsync_len >= lines_f0) { vs_eline_odd = vs_bline_evn - + vsync_lines + + vm.vsync_len - lines_f0; writel_relaxed(vs_eline_odd, priv->io_base @@ -1440,7 +1421,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, writel_relaxed(vso_begin_evn, priv->io_base + _REG(ENCI_DVI_VSO_END_ODD)); } else { - vs_eline_evn = vs_bline_evn + vsync_lines; + vs_eline_evn = vs_bline_evn + vm.vsync_len; writel_relaxed(vs_eline_evn, priv->io_base + _REG(ENCI_DVI_VSO_ELINE_EVN)); @@ -1548,7 +1529,7 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, _REG(ENCP_VIDEO_HAVON_BEGIN)) + venc_hdmi_latency, total_pixels_venc); - de_h_end = modulo(de_h_begin + active_pixels_venc, + de_h_end = modulo(de_h_begin + vm.hactive, total_pixels_venc); writel_relaxed(de_h_begin, @@ -1559,11 +1540,11 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, /* Program DE timing for even field */ de_v_begin_even = readl_relaxed(priv->io_base + _REG(ENCP_VIDEO_VAVON_BLINE)); - if (mode->flags & DRM_MODE_FLAG_INTERLACE) + if (vm.flags & DISPLAY_FLAGS_INTERLACED) de_v_end_even = de_v_begin_even + - (mode->vdisplay / 2); + (vm.vactive >> 1); else - de_v_end_even = de_v_begin_even + mode->vdisplay; + de_v_end_even = de_v_begin_even + vm.vactive; writel_relaxed(de_v_begin_even, priv->io_base + _REG(ENCP_DE_V_BEGIN_EVEN)); @@ -1571,14 +1552,14 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, priv->io_base + _REG(ENCP_DE_V_END_EVEN)); /* Program DE timing for odd field if needed */ - if (mode->flags & DRM_MODE_FLAG_INTERLACE) { + if (vm.flags & DISPLAY_FLAGS_INTERLACED) { unsigned int ofld_voav_ofst = readl_relaxed(priv->io_base + _REG(ENCP_VIDEO_OFLD_VOAV_OFST)); de_v_begin_odd = to_signed((ofld_voav_ofst & 0xf0) >> 4) + de_v_begin_even + ((mode->vtotal - 1) / 2); - de_v_end_odd = de_v_begin_odd + (mode->vdisplay / 2); + de_v_end_odd = de_v_begin_odd + (vm.vactive >> 1); writel_relaxed(de_v_begin_odd, priv->io_base + _REG(ENCP_DE_V_BEGIN_ODD)); @@ -1587,18 +1568,18 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, } /* Program Hsync timing */ - if ((de_h_end + front_porch_venc) >= total_pixels_venc) { + if ((de_h_end + vm.hfront_porch) >= total_pixels_venc) { hs_begin = de_h_end - + front_porch_venc + + vm.hfront_porch - total_pixels_venc; vs_adjust = 1; } else { hs_begin = de_h_end - + front_porch_venc; + + vm.hfront_porch; vs_adjust = 0; } - hs_end = modulo(hs_begin + hsync_pixels_venc, + hs_end = modulo(hs_begin + vm.hsync_len, total_pixels_venc); writel_relaxed(hs_begin, @@ -1608,19 +1589,19 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, /* Program Vsync timing for even field */ if (de_v_begin_even >= - (sof_lines + vsync_lines + (1 - vs_adjust))) + (vm.vback_porch + vm.vsync_len + (1 - vs_adjust))) vs_bline_evn = de_v_begin_even - - sof_lines - - vsync_lines + - vm.vback_porch + - vm.vsync_len - (1 - vs_adjust); else vs_bline_evn = mode->vtotal + de_v_begin_even - - sof_lines - - vsync_lines + - vm.vback_porch + - vm.vsync_len - (1 - vs_adjust); - vs_eline_evn = modulo(vs_bline_evn + vsync_lines, + vs_eline_evn = modulo(vs_bline_evn + vm.vsync_len, mode->vtotal); writel_relaxed(vs_bline_evn, @@ -1635,12 +1616,12 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, priv->io_base + _REG(ENCP_DVI_VSO_END_EVN)); /* Program Vsync timing for odd field if needed */ - if (mode->flags & DRM_MODE_FLAG_INTERLACE) { + if (vm.flags & DISPLAY_FLAGS_INTERLACED) { vs_bline_odd = (de_v_begin_odd - 1) - - sof_lines - - vsync_lines; + - vm.vback_porch + - vm.vsync_len; vs_eline_odd = (de_v_begin_odd - 1) - - vsync_lines; + - vm.vsync_len; vso_begin_odd = modulo(hs_begin + (total_pixels_venc >> 1), total_pixels_venc); @@ -1660,8 +1641,8 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, } writel_relaxed((use_enci ? 1 : 2) | - (mode->flags & DRM_MODE_FLAG_PHSYNC ? 1 << 2 : 0) | - (mode->flags & DRM_MODE_FLAG_PVSYNC ? 1 << 3 : 0) | + (vm.flags & DISPLAY_FLAGS_HSYNC_HIGH ? 1 << 2 : 0) | + (vm.flags & DISPLAY_FLAGS_VSYNC_HIGH ? 1 << 3 : 0) | 4 << 5 | (venc_repeat ? 1 << 8 : 0) | (hdmi_repeat ? 1 << 12 : 0), -- 2.7.4 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters 2018-05-03 8:23 ` [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters Satendra Singh Thakur [not found] ` <CGME20180503090930epcas5p23ef09c1e72c344bf8d879a344d0998cf@epcas5p2.samsung.com> @ 2018-05-07 13:46 ` Daniel Vetter [not found] ` <CGME20180508105900epcas5p25ffe94a214e5ad0848d834d6c3562ad6@epcas5p2.samsung.com> 1 sibling, 1 reply; 6+ messages in thread From: Daniel Vetter @ 2018-05-07 13:46 UTC (permalink / raw) To: linus-amlogic On Thu, May 03, 2018 at 01:53:55PM +0530, Satendra Singh Thakur wrote: > 1.There is a function in drm-core to calculate display timing parameters: > horizontal front porch, back porch, sync length, > vertical front porch, back porch, sync length and > clock in Hz. > However, some drivers are still calculating these parameters themselves. > Therefore, there is a duplication of the code. > This patch series replaces this redundant code with the function > drm_display_mode_to_videomode. > This removes nearly 100 redundant lines from the related drivers. > 2.For some drivers (sun4i) the reverse helper > drm_display_mode_from_videomode is used. > 3.For some drivers it replaces arithmatic operators (*, /) with shifting > operators (>>, <<). > 4.For some drivers DRM_MODE_FLAG_* are replaced with DISPLAY_FLAGS_* flags. > 5.These changes apply to following crtc and encoder drivers: > atmel-hlcdc > bridge-tc358767 > exynos-dsi > fsl-dcu > gma500-mdfld_dsi_dpi > hisilicon-kirin_dsi, ade > meson-encoder > pl111-display > sun4i-tv > ti lcdc > tegra dc > mediatek dpi dsi > bridge-adv7533 The drm_mode_to_videomode helper is meant for interop between drm and v4l, which have different internal structures to represent modes. For drivers that only use drm I think the better option would be to add these fields to struct drm_display_mode as another set of crtc_* values (the computed values are stored in crtc_ prefixed members). And compute front/back porch in drm_mode_set_crtcinfo. Then we can use these new drm_display_mode->crtc_h|vfront|back_porch fields in all the drivers you're changing. This way you avoid having to change all the drm drivers to use v4l #defines. Thanks, Daniel > > Satendra Singh Thakur (13): > drm/kms/mode/atmel-hlcdc: using helper func > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/bridge-tc358767: using helper func > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/exynos-dsi: using helper func > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/fsl-dcu: using helper func drm_display_mode_to_videomode > for calculating timing parameters > drm/kms/mode/gma500-mdfld_dsi_dpi: using helper function > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/hisilicon-kirin-dsi-ade: using helper function > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/meson-encoder: using helper function > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/pl111-display: using helper function > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/sun4i-tv: using helper func > drm_display_mode_from_videomode for calculating timing > parameters > drm/kms/mode/ti-lcdc: using helper func drm_display_mode_to_videomode > for calculating timing parameters > drm/kms/mode/tegra: using helper func drm_display_mode_to_videomode > for calculating timing parameters > drm/kms/mode/mtk_dpi_dsi: using helper func > drm_display_mode_to_videomode for calculating timing parameters > drm/kms/mode/bridge-adv7533: using helper func > drm_display_mode_to_videomode for calculating timing parameters > > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 28 +++-- > drivers/gpu/drm/bridge/adv7511/adv7533.c | 35 +++--- > drivers/gpu/drm/bridge/tc358767.c | 42 +++---- > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 +- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 29 ++--- > drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 28 ++--- > drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 42 ++++--- > drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 52 +++------ > drivers/gpu/drm/mediatek/mtk_dpi.c | 60 +++++----- > drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +-- > drivers/gpu/drm/meson/meson_venc.c | 149 +++++++++++------------- > drivers/gpu/drm/pl111/pl111_display.c | 40 +++---- > drivers/gpu/drm/sun4i/sun4i_tv.c | 67 ++++------- > drivers/gpu/drm/tegra/dc.c | 15 ++- > drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 60 +++++----- > 15 files changed, 280 insertions(+), 390 deletions(-) > > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <CGME20180508105900epcas5p25ffe94a214e5ad0848d834d6c3562ad6@epcas5p2.samsung.com>]
* [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters [not found] ` <CGME20180508105900epcas5p25ffe94a214e5ad0848d834d6c3562ad6@epcas5p2.samsung.com> @ 2018-05-08 10:58 ` Satendra Singh Thakur [not found] ` <CGME20180509115224epcas5p1c958418bc36fd224e8d36b9511c5beea@epcas5p1.samsung.com> 0 siblings, 1 reply; 6+ messages in thread From: Satendra Singh Thakur @ 2018-05-08 10:58 UTC (permalink / raw) To: linus-amlogic On Thu, May 07, 2018 at 15:46:02 +0200, Daniel Vetter wrote: > On Thu, May 03, 2018 at 01:53:55PM +0530, Satendra Singh Thakur wrote: > > 1.There is a function in drm-core to calculate display timing parameters: > > horizontal front porch, back porch, sync length, > > vertical front porch, back porch, sync length and > > clock in Hz. > > However, some drivers are still calculating these parameters themselves. > > Therefore, there is a duplication of the code. > > This patch series replaces this redundant code with the function > > drm_display_mode_to_videomode. > > This removes nearly 100 redundant lines from the related drivers. > > 2.For some drivers (sun4i) the reverse helper > > drm_display_mode_from_videomode is used. > > 3.For some drivers it replaces arithmatic operators (*, /) with shifting > > operators (>>, <<). > > 4.For some drivers DRM_MODE_FLAG_* are replaced with DISPLAY_FLAGS_* flags. > > 5.These changes apply to following crtc and encoder drivers: > > atmel-hlcdc > > bridge-tc358767 > > exynos-dsi > > fsl-dcu > > gma500-mdfld_dsi_dpi > > hisilicon-kirin_dsi, ade > > meson-encoder > > pl111-display > > sun4i-tv > > ti lcdc > > tegra dc > > mediatek dpi dsi > > bridge-adv7533 > > The drm_mode_to_videomode helper is meant for interop between drm and v4l, > which have different internal structures to represent modes. > > For drivers that only use drm I think the better option would be to add > these fields to struct drm_display_mode as another set of crtc_* values > (the computed values are stored in crtc_ prefixed members). And compute > front/back porch in drm_mode_set_crtcinfo. > > Then we can use these new drm_display_mode->crtc_h|vfront|back_porch > fields in all the drivers you're changing. This way you avoid having to > change all the drm drivers to use v4l #defines. > > Thanks, > Daniel Hi Daniel, Thanks for the comments. I will look into it. Thanks -Satendra ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <CGME20180509115224epcas5p1c958418bc36fd224e8d36b9511c5beea@epcas5p1.samsung.com>]
* [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters [not found] ` <CGME20180509115224epcas5p1c958418bc36fd224e8d36b9511c5beea@epcas5p1.samsung.com> @ 2018-05-09 11:52 ` Satendra Singh Thakur 2018-05-13 14:12 ` Daniel Vetter 0 siblings, 1 reply; 6+ messages in thread From: Satendra Singh Thakur @ 2018-05-09 11:52 UTC (permalink / raw) To: linus-amlogic On Thu, May 08, 2018 at 16:28:30 +0530, Satendra Singh Thakur wrote: > On Thu, May 07, 2018 at 15:46:02 +0200, Daniel Vetter wrote: > > On Thu, May 03, 2018 at 01:53:55PM +0530, Satendra Singh Thakur wrote: > > > 1.There is a function in drm-core to calculate display timing parameters: > > > horizontal front porch, back porch, sync length, > > > vertical front porch, back porch, sync length and > > > clock in Hz. > > > However, some drivers are still calculating these parameters themselves. > > > Therefore, there is a duplication of the code. > > > This patch series replaces this redundant code with the function > > > drm_display_mode_to_videomode. > > > This removes nearly 100 redundant lines from the related drivers. > > > 2.For some drivers (sun4i) the reverse helper > > > drm_display_mode_from_videomode is used. > > > 3.For some drivers it replaces arithmatic operators (*, /) with shifting > > > operators (>>, <<). > > > 4.For some drivers DRM_MODE_FLAG_* are replaced with DISPLAY_FLAGS_* flags. > > > 5.These changes apply to following crtc and encoder drivers: > > > atmel-hlcdc > > > bridge-tc358767 > > > exynos-dsi > > > fsl-dcu > > > gma500-mdfld_dsi_dpi > > > hisilicon-kirin_dsi, ade > > > meson-encoder > > > pl111-display > > > sun4i-tv > > > ti lcdc > > > tegra dc > > > mediatek dpi dsi > > > bridge-adv7533 > > > > The drm_mode_to_videomode helper is meant for interop between drm and v4l, > > which have different internal structures to represent modes. > > > > For drivers that only use drm I think the better option would be to add > > these fields to struct drm_display_mode as another set of crtc_* values > > (the computed values are stored in crtc_ prefixed members). And compute > > front/back porch in drm_mode_set_crtcinfo. > > > > Then we can use these new drm_display_mode->crtc_h|vfront|back_porch > > fields in all the drivers you're changing. This way you avoid having to > > change all the drm drivers to use v4l #defines. > > > > Thanks, > > Daniel > > Hi Daniel, > Thanks for the comments. > I will look into it. > > Thanks > -Satendra Hi Daniel, Thanks for the comments. Please find below my understanding in this direction. 1. Currently struct videomode is being used in 50 drm drivers and 14 fbdev drivers. Since, it's already being used by so many drm drivers, that is the reason these fbdev objects (struct videmode and func drm_display_mode_to_videomode) were used in this patch series. 2. Anyway, if fbdev related objects (struct/func) are not encouraged in drm drivers, then we may add h/v front/back porches in struct drm_display_mode as adviced by you. 3. We can calculate these params in func drm_mode_set_crtcinfo at the end of it. int drm_mode_set_crtcinfo () { . . crtc_hfront_porch = crtc_hsync_start - crtc_hdisplay; crtc_vfront_porch = crtc_vsync_start - crtc_vdisplay; . . crtc_clock_hz = crtc_clock*1000; }; 4. Normally mode is programmed in HW in following callbacks of crtc and encoder drivers -mode_set -mode_set_nofb -atomic_enable Normally drm_mode_set_crtcinfo is used in -mode_fixup callbacks (CBs) of encoder and crtc drivers. if mode_fixup CBs are called before mode_set CBs then drm_mode_set_crtcinfo is right place to calculate sync/porch params. We can use crtc_hfront/back_porches directly and program them to HW in above mentioned callbacks. int my_mode_set () { REG_WRITE(crtc_hfront_porch); REG_WRITE(crtc_hback_porch); . . } 6. However, if these params are being modified after calling drm_set_crtcinfo as mentioned below: bool amdgpu_atombios_encoder_mode_fixup(struct drm_encoder *encoder, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); /* set the active encoder to connector routing */ amdgpu_encoder_set_active_device(encoder); ***drm_mode_set_crtcinfo(adjusted_mode, 0);**** /* hw bug */ if ((mode->flags & DRM_MODE_FLAG_INTERLACE) && (mode->crtc_vsync_start < (mode->crtc_vdisplay + 2))) adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2; Then we may need to define new func like void drm_calc_hv_porches_sync() { crtc_hfront_porch = crtc_hsync_start - crtc_hdisplay; crtc_vfront_porch = crtc_vsync_start - crtc_vdisplay; . . crtc_clock_hz = crtc_clock*1000; } and call this func in mode_set*, atomic_enable CBS before programming the HW with this mode. Should I create patches around this idea ? Please let me know your comments. Thanks -Satendra ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters 2018-05-09 11:52 ` Satendra Singh Thakur @ 2018-05-13 14:12 ` Daniel Vetter 0 siblings, 0 replies; 6+ messages in thread From: Daniel Vetter @ 2018-05-13 14:12 UTC (permalink / raw) To: linus-amlogic On Wed, May 9, 2018 at 1:52 PM, Satendra Singh Thakur <satendra.t@samsung.com> wrote: > On Thu, May 08, 2018 at 16:28:30 +0530, Satendra Singh Thakur wrote: >> On Thu, May 07, 2018 at 15:46:02 +0200, Daniel Vetter wrote: >> > On Thu, May 03, 2018 at 01:53:55PM +0530, Satendra Singh Thakur wrote: >> > > 1.There is a function in drm-core to calculate display timing parameters: >> > > horizontal front porch, back porch, sync length, >> > > vertical front porch, back porch, sync length and >> > > clock in Hz. >> > > However, some drivers are still calculating these parameters themselves. >> > > Therefore, there is a duplication of the code. >> > > This patch series replaces this redundant code with the function >> > > drm_display_mode_to_videomode. >> > > This removes nearly 100 redundant lines from the related drivers. >> > > 2.For some drivers (sun4i) the reverse helper >> > > drm_display_mode_from_videomode is used. >> > > 3.For some drivers it replaces arithmatic operators (*, /) with shifting >> > > operators (>>, <<). >> > > 4.For some drivers DRM_MODE_FLAG_* are replaced with DISPLAY_FLAGS_* flags. >> > > 5.These changes apply to following crtc and encoder drivers: >> > > atmel-hlcdc >> > > bridge-tc358767 >> > > exynos-dsi >> > > fsl-dcu >> > > gma500-mdfld_dsi_dpi >> > > hisilicon-kirin_dsi, ade >> > > meson-encoder >> > > pl111-display >> > > sun4i-tv >> > > ti lcdc >> > > tegra dc >> > > mediatek dpi dsi >> > > bridge-adv7533 >> > >> > The drm_mode_to_videomode helper is meant for interop between drm and v4l, >> > which have different internal structures to represent modes. >> > >> > For drivers that only use drm I think the better option would be to add >> > these fields to struct drm_display_mode as another set of crtc_* values >> > (the computed values are stored in crtc_ prefixed members). And compute >> > front/back porch in drm_mode_set_crtcinfo. >> > >> > Then we can use these new drm_display_mode->crtc_h|vfront|back_porch >> > fields in all the drivers you're changing. This way you avoid having to >> > change all the drm drivers to use v4l #defines. >> > >> > Thanks, >> > Daniel >> >> Hi Daniel, >> Thanks for the comments. >> I will look into it. >> >> Thanks >> -Satendra > > Hi Daniel, > Thanks for the comments. > Please find below my understanding in this direction. > > 1. Currently struct videomode is being used in 50 drm drivers and 14 fbdev drivers. > Since, it's already being used by so many drm drivers, that is the reason > these fbdev objects (struct videmode and func drm_display_mode_to_videomode) were used in this patch series. The biggest contributor for that seems to be of_get_videomode. We should probably have a of_drm_get_display_mode helper, which automatically converts the of/dt video description into the drm display mode structure. And I found way less than 50 drm drivers using videomode, much less if we ignore of. > 2. Anyway, if fbdev related objects (struct/func) are not encouraged in drm drivers, then we may add > h/v front/back porches in struct drm_display_mode as adviced by you. > > 3. We can calculate these params in func drm_mode_set_crtcinfo at the end of it. > int drm_mode_set_crtcinfo () > { > . > . > crtc_hfront_porch = crtc_hsync_start - crtc_hdisplay; > crtc_vfront_porch = crtc_vsync_start - crtc_vdisplay; > . > . > crtc_clock_hz = crtc_clock*1000; > }; > > 4. Normally mode is programmed in HW in following callbacks of crtc and encoder drivers > -mode_set > -mode_set_nofb > -atomic_enable > > > Normally drm_mode_set_crtcinfo is used in > -mode_fixup callbacks (CBs) > of encoder and crtc drivers. > > if mode_fixup CBs are called before mode_set CBs then > drm_mode_set_crtcinfo is right place to calculate sync/porch params. > We can use crtc_hfront/back_porches directly and program them to HW > in above mentioned callbacks. > > int my_mode_set () > { > REG_WRITE(crtc_hfront_porch); > REG_WRITE(crtc_hback_porch); > . > . > } Agreed with your plan up to point 5 here. > 6. However, if these params are being modified after calling drm_set_crtcinfo as mentioned below: > > bool amdgpu_atombios_encoder_mode_fixup(struct drm_encoder *encoder, > const struct drm_display_mode *mode, > struct drm_display_mode *adjusted_mode) > { > struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder); > > /* set the active encoder to connector routing */ > amdgpu_encoder_set_active_device(encoder); > ***drm_mode_set_crtcinfo(adjusted_mode, 0);**** > > /* hw bug */ > if ((mode->flags & DRM_MODE_FLAG_INTERLACE) > && (mode->crtc_vsync_start < (mode->crtc_vdisplay + 2))) > adjusted_mode->crtc_vsync_start = adjusted_mode->crtc_vdisplay + 2; > > Then we may need to define new func like > > void drm_calc_hv_porches_sync() > { > crtc_hfront_porch = crtc_hsync_start - crtc_hdisplay; > crtc_vfront_porch = crtc_vsync_start - crtc_vdisplay; > . > . > crtc_clock_hz = crtc_clock*1000; > } and call this func in mode_set*, atomic_enable CBS before programming the HW with this mode. > > > Should I create patches around this idea ? > Please let me know your comments. I'm not sure about point 6. I think we should wait with coming up with a solution to this problem once there's a clear need for it. Most likely I think drivers who both need to adjust computed timings and who need v/hfront/back porch just need to adjust everything on their own. And we won't provide any additional helpers. Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-13 14:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CGME20180503082417epcas5p19ee919d68eb5ae18f183a41881869cc1@epcas5p1.samsung.com>
2018-05-03 8:23 ` [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode for calculating timing parameters Satendra Singh Thakur
[not found] ` <CGME20180503090930epcas5p23ef09c1e72c344bf8d879a344d0998cf@epcas5p2.samsung.com>
2018-05-03 9:09 ` [PATCH 07/13] drm/kms/mode/meson-encoder: using helper function drm_display_mode_to_videomode " Satendra Singh Thakur
2018-05-07 13:46 ` [PATCH 00/13] drm/kms/mode: using helper func drm_display_mode_to/from_videomode " Daniel Vetter
[not found] ` <CGME20180508105900epcas5p25ffe94a214e5ad0848d834d6c3562ad6@epcas5p2.samsung.com>
2018-05-08 10:58 ` Satendra Singh Thakur
[not found] ` <CGME20180509115224epcas5p1c958418bc36fd224e8d36b9511c5beea@epcas5p1.samsung.com>
2018-05-09 11:52 ` Satendra Singh Thakur
2018-05-13 14:12 ` Daniel Vetter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®