imx-drm: ipuv3-crtc: Implement mode_fixup
Subsystems (5)
v2 cover imx-drm: ipuv3-crtc: Implement mode_fixup
This patchset implements ->mode_fixup() in the imx ipuv3-crtc driver, using a new support function ipu_di_adjust_videomode(). This new function needs to be subsystem independent, so it accepts a video mode as a 'struct videomode'. Hence ipu-crtc ->mode_fixup() needs another support function to convert a drm_display_mode to a videomode before passing the mode to ipu_di_adjust_videomode() for fixup.
Also some related code cleanup: 'struct ipu_di_signal_cfg' should use 'struct videomode' for mode timings.
Jiada Wang (1):
gpu: ipu-di: Add ipu_di_adjust_videomode()
Steve Longerbeam (6):
gpu: ipu-di: remove some non-functional code
drm_modes: add videomode_from_drm_display_mode
imx-drm: ipuv3-crtc: Implement mode_fixup
imx-drm: encoder prepare/mode_set must use adjusted mode
gpu: ipu-v3: Use videomode in struct ipu_di_signal_cfg
gpu: ipu-di: Switch to DIV_ROUND_CLOSEST for DI clock divider calc
drivers/gpu/drm/drm_modes.c | 40 +++++++++++ drivers/gpu/drm/imx/imx-hdmi.c | 4 +- drivers/gpu/drm/imx/imx-ldb.c | 6 +- drivers/gpu/drm/imx/imx-tve.c | 4 +- drivers/gpu/drm/imx/ipuv3-crtc.c | 38 +++++----- drivers/gpu/drm/imx/parallel-display.c | 4 +- drivers/gpu/ipu-v3/ipu-di.c | 121 +++++++++++++++++++------------- include/drm/drm_modes.h | 2 + include/video/imx-ipu-v3.h | 21 ++---- 9 files changed, 147 insertions(+), 93 deletions(-)
Signature · 1 line
1.7.9.5
PATCH v2 1/7 gpu: ipu-di: Add ipu_di_adjust_videomode()
From: Jiada Wang <[email protected]>
On some monitors, high resolution modes are not working, exhibiting pixel column truncation problems (for example, 1280x1024 displays as 1280x1022).
The function ipu_di_adjust_videomode() aims to fix these issues by adjusting a passed videomode to IPU restrictions. The function can be called from the drm_crtc_helper_funcs->mode_fixup() methods.
--- drivers/gpu/ipu-v3/ipu-di.c | 29 +++++++++++++++++++++++++++++ include/video/imx-ipu-v3.h | 2 ++ 2 files changed, 31 insertions(+)
drivers/gpu/ipu-v3/ipu-di.c +29 -0
@@ -511,6 +511,35 @@ static void ipu_di_config_clock(struct ipu_di *di, clk_get_rate(di->clk_di_pixel) / (clkgen0 >> 4)); } +/* +* This function is called to adjust a video mode to IPU restrictions. +* It is meant to be called from drm crtc mode_fixup() methods. +*/ +int ipu_di_adjust_videomode (struct ipu_di *di,struct videomode *mode) +{ +u32 diff; + +if (mode->vfront_porch >=2 ) +return 0 ; + + diff =2 - mode->vfront_porch; + +if (mode->vback_porch >= diff) { + mode->vfront_porch =2 ; + mode->vback_porch -= diff; + }else if (mode->vsync_len > diff) { + mode->vfront_porch =2 ; + mode->vsync_len = mode->vsync_len - diff; + }else { +dev_warn (di->ipu->dev,"failed to adjust videomode\n" ); +return -EINVAL ; + } + +dev_warn (di->ipu->dev,"videomode adapted for IPU restrictions\n" ); +return 0 ; +} +EXPORT_SYMBOL_GPL (ipu_di_adjust_videomode); +int ipu_di_init_sync_panel (struct ipu_di *di,struct ipu_di_signal_cfg *sig) {u32 reg;
include/video/imx-ipu-v3.h +2 -0
@@ -17,6 +17,7 @@#include <linux/bitmap.h> #include <linux/fb.h> #include <media/v4l2-mediabus.h> +#include <video/videomode.h> struct ipu_soc ;
@@ -236,6 +237,7 @@ void ipu_di_put(struct ipu_di *);int ipu_di_disable (struct ipu_di *);int ipu_di_enable (struct ipu_di *);int ipu_di_get_num (struct ipu_di *); +int ipu_di_adjust_videomode (struct ipu_di *di,struct videomode *mode);int ipu_di_init_sync_panel (struct ipu_di *,struct ipu_di_signal_cfg *sig);/*
Signature · 1 line
1.7.9.5
Philipp Zabel
maintainerRe: [PATCH v2 1/7] gpu: ipu-di: Add ipu_di_adjust_videomode()
Hi Steve,
Am Donnerstag, den 18.12.2014, 18:00 -0800 schrieb Steve Longerbeam:
Quoted 32 lines
From: Jiada Wang <[email protected]>
On some monitors, high resolution modes are not working, exhibiting pixel column truncation problems (for example, 1280x1024 displays as 1280x1022).
The function
ipu_di_adjust_videomode()aims to fix these issues by adjusting a passed videomode to IPU restrictions. The function can be called from thedrm_crtc_helper_funcs->mode_fixup()methods.Signed-off-by Jiada Wang <[email protected]>Signed-off-by Deepak Das <[email protected]>Signed-off-by Steve Longerbeam <[email protected]>--- drivers/gpu/ipu-v3/ipu-di.c | 29 +++++++++++++++++++++++++++++ include/video/imx-ipu-v3.h | 2 ++ 2 files changed, 31 insertions(+)drivers/gpu/ipu-v3/ipu-di.c +6
-0@@ -511,6 +511,35 @@ static void ipu_di_config_clock(struct ipu_di *di, clk_get_rate(di->clk_di_pixel) / (clkgen0 >> 4)); } +/* +* This function is called to adjust a video mode to IPU restrictions. +* It is meant to be called from drm crtc mode_fixup() methods. +*/ +int ipu_di_adjust_videomode (struct ipu_di *di,struct videomode *mode) +{
drivers/gpu/ipu-v3/ipu-di.c static void ipu_di_config_clock(struct ipu_di *di, · line 529
Quoted 10 lines
drivers/gpu/ipu-v3/ipu-di.c +10
-0+u32 diff; + +if (mode->vfront_porch >=2 ) +return 0 ; + + diff =2 - mode->vfront_porch; + +if (mode->vback_porch >= diff) { + mode->vfront_porch =2 ; + mode->vback_porch -= diff;
Should we also add
else if (mode->vback_porch >= 1 && mode->vsync_len > 1) {
mode->vback_porch--;
mode->vsync_len--;here and maybe move the two "mode->vback_porch = 2" to a single place below the conditional statement?
drivers/gpu/ipu-v3/ipu-di.c static void ipu_di_config_clock(struct ipu_di *di, · line 532
Quoted 3 lines
drivers/gpu/ipu-v3/ipu-di.c +3
-0+ }else if (mode->vsync_len > diff) { + mode->vfront_porch =2 ; + mode->vsync_len = mode->vsync_len - diff;
Why use "vback_porch -= diff" above, but not "vsync_len -= diff" here?
drivers/gpu/ipu-v3/ipu-di.c static void ipu_di_config_clock(struct ipu_di *di, · line 538
Quoted 6 lines
drivers/gpu/ipu-v3/ipu-di.c +6
-0+ }else { +dev_warn (di->ipu->dev,"failed to adjust videomode\n" ); +return -EINVAL ; + } + +dev_warn (di->ipu->dev,"videomode adapted for IPU restrictions\n" );
Since we can return the adjusted mode to userspace now, I think this should be dev_dbg.
regards
Philipp
PATCH v2 2/7 gpu: ipu-di: remove some non-functional code
In reply to Steve Longerbeamh_total and v_total were calculated in ipu_di_init_sync_panel() but never actually used. Remove.
--- drivers/gpu/ipu-v3/ipu-di.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/ipu-v3/ipu-di.c +0 -6
@@ -545,7 +545,6 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)u32 reg;u32 di_gen, vsync_cnt;u32 div; -u32 h_total, v_total;dev_dbg (di->ipu->dev,"disp %d: panel size = %d x %d\n" , di->id, sig->width, sig->height);
@@ -553,11 +552,6 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)if ((sig->v_sync_width ==0 ) || (sig->h_sync_width ==0 ))return -EINVAL ; - h_total = sig->width + sig->h_sync_width + sig->h_start_width + - sig->h_end_width; - v_total = sig->height + sig->v_sync_width + sig->v_start_width + - sig->v_end_width; - dev_dbg(di->ipu->dev, "Clocks: IPU %luHz DI %luHz Needed %luHz\n", clk_get_rate(di->clk_ipu), clk_get_rate(di->clk_di),
Signature · 1 line
1.7.9.5
PATCH v2 3/7 drm_modes: add videomode_from_drm_display_mode
In reply to Steve LongerbeamAdd conversion from drm_display_mode to videomode.
--- drivers/gpu/drm/drm_modes.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_modes.h | 2 ++ 2 files changed, 42 insertions(+)
drivers/gpu/drm/drm_modes.c +40 -0
@@ -615,6 +615,46 @@ void drm_display_mode_from_videomode(const struct videomode *vm, }EXPORT_SYMBOL_GPL (drm_display_mode_from_videomode); +/** +* videomode_from_drm_display_mode - fill in @vm using @dmode, +* @dmode: drm_display_mode structure to use as source +* @vm: videomode structure to use as destination +* +* Fills out @vm using the display mode specified in @dmode. +*/ +void videomode_from_drm_display_mode (const struct drm_display_mode *dmode, +struct videomode *vm) +{ + vm->hactive = dmode->hdisplay; + vm->hfront_porch = dmode->hsync_start - dmode->hdisplay; + vm->hsync_len = dmode->hsync_end - dmode->hsync_start; + vm->hback_porch = dmode->htotal - dmode->hsync_end; + + vm->vactive = dmode->vdisplay; + vm->vfront_porch = dmode->vsync_start - dmode->vdisplay; + vm->vsync_len = dmode->vsync_end - dmode->vsync_start; + vm->vback_porch = dmode->vtotal - dmode->vsync_end; + + vm->pixelclock = dmode->clock *1000 ; + + vm->flags =0 ; +if (dmode->flags &DRM_MODE_FLAG_PHSYNC ) + vm->flags |=DISPLAY_FLAGS_HSYNC_HIGH ; +else if (dmode->flags &DRM_MODE_FLAG_NHSYNC ) + vm->flags |=DISPLAY_FLAGS_HSYNC_LOW ; +if (dmode->flags &DRM_MODE_FLAG_PVSYNC ) + vm->flags |=DISPLAY_FLAGS_VSYNC_HIGH ; +else if (dmode->flags &DRM_MODE_FLAG_NVSYNC ) + vm->flags |=DISPLAY_FLAGS_VSYNC_LOW ; +if (dmode->flags &DRM_MODE_FLAG_INTERLACE ) + vm->flags |=DISPLAY_FLAGS_INTERLACED ; +if (dmode->flags &DRM_MODE_FLAG_DBLSCAN ) + vm->flags |=DISPLAY_FLAGS_DOUBLESCAN ; +if (dmode->flags &DRM_MODE_FLAG_DBLCLK ) + vm->flags |=DISPLAY_FLAGS_DOUBLECLK ; +} +EXPORT_SYMBOL_GPL (videomode_from_drm_display_mode); +#ifdef CONFIG_OF /** * of_get_drm_display_mode - get a drm_display_mode from devicetree
include/drm/drm_modes.h +2 -0
@@ -197,6 +197,8 @@ struct drm_display_mode *drm_gtf_mode_complex(struct drm_device *dev, int GTF_K, int GTF_2J);void drm_display_mode_from_videomode (const struct videomode *vm,struct drm_display_mode *dmode); +void videomode_from_drm_display_mode (const struct drm_display_mode *dmode, +struct videomode *vm);int of_get_drm_display_mode (struct device_node *np,struct drm_display_mode *dmode,int index);
Signature · 1 line
1.7.9.5
Philipp Zabel
maintainerRe: [PATCH v2 3/7] drm_modes: add videomode_from_drm_display_mode
Am Donnerstag, den 18.12.2014, 18:00 -0800 schrieb Steve Longerbeam:
Quoted 45 lines
Add conversion from
drm_display_modeto videomode.Signed-off-by Steve Longerbeam <[email protected]>--- drivers/gpu/drm/drm_modes.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_modes.h | 2 ++ 2 files changed, 42 insertions(+)drivers/gpu/drm/drm_modes.c +29
-0@@ -615,6 +615,46 @@ void drm_display_mode_from_videomode(const struct videomode *vm, }EXPORT_SYMBOL_GPL (drm_display_mode_from_videomode); +/** +* videomode_from_drm_display_mode - fill in @vm using @dmode, +* @dmode: drm_display_mode structure to use as source +* @vm: videomode structure to use as destination +* +* Fills out @vm using the display mode specified in @dmode. +*/ +void videomode_from_drm_display_mode (const struct drm_display_mode *dmode, +struct videomode *vm) +{ + vm->hactive = dmode->hdisplay; + vm->hfront_porch = dmode->hsync_start - dmode->hdisplay; + vm->hsync_len = dmode->hsync_end - dmode->hsync_start; + vm->hback_porch = dmode->htotal - dmode->hsync_end; + + vm->vactive = dmode->vdisplay; + vm->vfront_porch = dmode->vsync_start - dmode->vdisplay; + vm->vsync_len = dmode->vsync_end - dmode->vsync_start; + vm->vback_porch = dmode->vtotal - dmode->vsync_end; + + vm->pixelclock = dmode->clock *1000 ; + + vm->flags =0 ; +if (dmode->flags &DRM_MODE_FLAG_PHSYNC ) + vm->flags |=DISPLAY_FLAGS_HSYNC_HIGH ; +else if (dmode->flags &DRM_MODE_FLAG_NHSYNC ) + vm->flags |=DISPLAY_FLAGS_HSYNC_LOW ; +if (dmode->flags &DRM_MODE_FLAG_PVSYNC ) + vm->flags |=DISPLAY_FLAGS_VSYNC_HIGH ;
drivers/gpu/drm/drm_modes.c void drm_display_mode_from_videomode(const struct videomode *vm, · line 656
Quoted 10 lines
drivers/gpu/drm/drm_modes.c +10
-0+else if (dmode->flags &DRM_MODE_FLAG_NVSYNC ) + vm->flags |=DISPLAY_FLAGS_VSYNC_LOW ; +if (dmode->flags &DRM_MODE_FLAG_INTERLACE ) + vm->flags |=DISPLAY_FLAGS_INTERLACED ; +if (dmode->flags &DRM_MODE_FLAG_DBLSCAN ) + vm->flags |=DISPLAY_FLAGS_DOUBLESCAN ; +if (dmode->flags &DRM_MODE_FLAG_DBLCLK ) + vm->flags |=DISPLAY_FLAGS_DOUBLECLK ; +} +EXPORT_SYMBOL_GPL (videomode_from_drm_display_mode);
Is it ok for drm_modes to export a function that doesn't start with drm_ ? We could just rename this to drm_display_mode_to_videomode if necessary. I can fix it up as I apply it, but I'd like to know which is preferred.
regards
Philipp
Re: [PATCH v2 3/7] drm_modes: add videomode_from_drm_display_mode
Quoted 53 lines · Philipp Zabel
Am Donnerstag, den 18.12.2014, 18:00 -0800 schrieb Steve Longerbeam:
Quoted 52 lines
Add conversion from
drm_display_modeto videomode.Signed-off-by Steve Longerbeam <[email protected]>--- drivers/gpu/drm/drm_modes.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_modes.h | 2 ++ 2 files changed, 42 insertions(+)drivers/gpu/drm/drm_modes.c +36
-0@@ -615,6 +615,46 @@ void drm_display_mode_from_videomode(const struct videomode *vm, }EXPORT_SYMBOL_GPL (drm_display_mode_from_videomode); +/** +* videomode_from_drm_display_mode - fill in @vm using @dmode, +* @dmode: drm_display_mode structure to use as source +* @vm: videomode structure to use as destination +* +* Fills out @vm using the display mode specified in @dmode. +*/ +void videomode_from_drm_display_mode (const struct drm_display_mode *dmode, +struct videomode *vm) +{ + vm->hactive = dmode->hdisplay; + vm->hfront_porch = dmode->hsync_start - dmode->hdisplay; + vm->hsync_len = dmode->hsync_end - dmode->hsync_start; + vm->hback_porch = dmode->htotal - dmode->hsync_end; + + vm->vactive = dmode->vdisplay; + vm->vfront_porch = dmode->vsync_start - dmode->vdisplay; + vm->vsync_len = dmode->vsync_end - dmode->vsync_start; + vm->vback_porch = dmode->vtotal - dmode->vsync_end; + + vm->pixelclock = dmode->clock *1000 ; + + vm->flags =0 ; +if (dmode->flags &DRM_MODE_FLAG_PHSYNC ) + vm->flags |=DISPLAY_FLAGS_HSYNC_HIGH ; +else if (dmode->flags &DRM_MODE_FLAG_NHSYNC ) + vm->flags |=DISPLAY_FLAGS_HSYNC_LOW ; +if (dmode->flags &DRM_MODE_FLAG_PVSYNC ) + vm->flags |=DISPLAY_FLAGS_VSYNC_HIGH ; +else if (dmode->flags &DRM_MODE_FLAG_NVSYNC ) + vm->flags |=DISPLAY_FLAGS_VSYNC_LOW ; +if (dmode->flags &DRM_MODE_FLAG_INTERLACE ) + vm->flags |=DISPLAY_FLAGS_INTERLACED ; +if (dmode->flags &DRM_MODE_FLAG_DBLSCAN ) + vm->flags |=DISPLAY_FLAGS_DOUBLESCAN ; +if (dmode->flags &DRM_MODE_FLAG_DBLCLK )
Quoted 9 lines
drivers/gpu/drm/drm_modes.c void drm_display_mode_from_videomode(const struct videomode *vm, · line 656
Quoted 3 lines
drivers/gpu/drm/drm_modes.c +3
-0+ vm->flags |=DISPLAY_FLAGS_DOUBLECLK ; +} +EXPORT_SYMBOL_GPL (videomode_from_drm_display_mode);Is it ok for
drm_modesto export a function that doesn't start withdrm_? We could just rename this todrm_display_mode_to_videomodeif necessary. I can fix it up as I apply it, but I'd like to know which is preferred.
Non-native English speaker here, and drm_display_mode_to_videomode sounds better. Plus I think that *to* functions are more common than *from* ones.
I'm not a drm dev, so just my 2c :)
Cheers,
Emil
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 3/7] drm_modes: add videomode_from_drm_display_mode
In reply to Philipp ZabelQuoted 6 lines · Philipp Zabel
+EXPORT_SYMBOL_GPL(videomode_from_drm_display_mode);
Is it ok fordrm_modesto export a function that doesn't start withdrm_? We could just rename this todrm_display_mode_to_videomodeif necessary. I can fix it up as I apply it, but I'd like to know which is preferred.
Yeah, drm_display_mode_to_videomode() is probably better, makes it more clear it's part of the DRM kernel interfaces.
Steve
PATCH v2 4/7 imx-drm: ipuv3-crtc: Implement mode_fixup
In reply to Steve LongerbeamAsk the IPU display interface, via ipu_di_adjust_videomode(), to adjust a video mode to meet any DI restrictions. The function takes a subsystem independent videomode, so the drm_display_mode must be converted to videomode first, and then the adjusted mode converted back to a drm_display_mode.
--- drivers/gpu/drm/imx/ipuv3-crtc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/imx/ipuv3-crtc.c +12 -0
@@ -242,6 +242,18 @@ static bool ipu_crtc_mode_fixup(struct drm_crtc *crtc,const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { + struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc); +struct videomode vm; +int ret; + +videomode_from_drm_display_mode (adjusted_mode, &vm); + + ret =ipu_di_adjust_videomode (ipu_crtc->di, &vm); +if (ret) +return false; + +drm_display_mode_from_videomode (&vm, adjusted_mode); +return true; }
Signature · 1 line
1.7.9.5
Quoted 5 lines · Steve Longerbeam
Ask the IPU display interface, via
ipu_di_adjust_videomode(), to adjust a video mode to meet any DI restrictions. The function takes a subsystem independent videomode, so thedrm_display_modemust be converted to videomode first, and then the adjusted mode converted back to adrm_display_mode.
What is the reason to use videomode (apart from it being subsystem independent)? Do we forsee implementation of other output subsystems for the IPU?
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up according to speedtest.net.
Hi Russell,
Quoted 10 lines · Russell King - ARM Linux
Quoted 5 lines · Steve Longerbeam
Ask the IPU display interface, via
ipu_di_adjust_videomode(), to adjust a video mode to meet any DI restrictions. The function takes a subsystem independent videomode, so thedrm_display_modemust be converted to videomode first, and then the adjusted mode converted back to adrm_display_mode.What is the reason to use videomode (apart from it being subsystem independent)? Do we forsee implementation of other output subsystems for the IPU?
There might be the issue of possible CSI -> IC -> DC -> DI passthrough, where the DI timing must be synchronized to the CSI input signal. I haven't really thought about how that should be integrated with the DRM driver mostly because of the 1024 pixel output width maximum in the IC, which limits the usefulness somewhat.
I like the use of struct videomode here for the symmetry with patch 6. But currently, we could make ipu_di_adjust_videomode take a drm_display_mode just as well.
regards
Philipp
PATCH v2 5/7 imx-drm: encoder prepare/mode_set must use adjusted mode
In reply to Steve LongerbeamThe encoder ->prepare() and ->mode_set() methods need to use the hw adjusted mode, not the original mode.
--- drivers/gpu/drm/imx/imx-hdmi.c | 4 ++-- drivers/gpu/drm/imx/imx-ldb.c | 6 +++--- drivers/gpu/drm/imx/imx-tve.c | 4 ++-- drivers/gpu/drm/imx/parallel-display.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/imx/imx-hdmi.c +2 -2
@@ -1417,8 +1417,8 @@ static struct drm_encoder *imx_hdmi_connector_best_encoder(struct drm_connector }static void imx_hdmi_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +struct drm_display_mode *orig_mode, +struct drm_display_mode *mode) { struct imx_hdmi *hdmi = container_of(encoder, struct imx_hdmi, encoder);
drivers/gpu/drm/imx/imx-ldb.c +3 -3
@@ -168,7 +168,7 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder) {struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb; -struct drm_display_mode *mode = &encoder->crtc->mode; +struct drm_display_mode *mode = &encoder->crtc->hwmode;u32 pixel_fmt;unsigned long serial_clk;unsigned long di_clk = mode->clock *1000 ;
@@ -246,8 +246,8 @@ static void imx_ldb_encoder_commit(struct drm_encoder *encoder) }static void imx_ldb_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +struct drm_display_mode *orig_mode, +struct drm_display_mode *mode) {struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb;
drivers/gpu/drm/imx/imx-tve.c +2 -2
@@ -312,8 +312,8 @@ static void imx_tve_encoder_prepare(struct drm_encoder *encoder) }static void imx_tve_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +struct drm_display_mode *orig_mode, +struct drm_display_mode *mode) {struct imx_tve *tve =enc_to_tve (encoder);unsigned long rounded_rate;
drivers/gpu/drm/imx/parallel-display.c +2 -2
@@ -131,8 +131,8 @@ static void imx_pd_encoder_commit(struct drm_encoder *encoder) }static void imx_pd_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) +struct drm_display_mode *orig_mode, +struct drm_display_mode *mode) { }
Signature · 1 line
1.7.9.5
PATCH v2 6/7 gpu: ipu-v3: Use videomode in struct ipu_di_signal_cfg
In reply to Steve LongerbeamThis patch changes struct ipu_di_signal_cfg to use struct videomode to define video timings and flags.
--- drivers/gpu/drm/imx/ipuv3-crtc.c | 26 +++-------- drivers/gpu/ipu-v3/ipu-di.c | 89 ++++++++++++++++++++------------------ include/video/imx-ipu-v3.h | 19 ++------ 3 files changed, 56 insertions(+), 78 deletions(-)
drivers/gpu/drm/imx/ipuv3-crtc.c +5 -21
@@ -158,35 +158,19 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc, out_pixel_fmt = ipu_crtc->interface_pix_fmt; -if (mode->flags &DRM_MODE_FLAG_INTERLACE ) - sig_cfg.interlaced =1 ; -if (mode->flags &DRM_MODE_FLAG_PHSYNC ) - sig_cfg.Hsync_pol =1 ; -if (mode->flags &DRM_MODE_FLAG_PVSYNC ) - sig_cfg.Vsync_pol =1 ; - sig_cfg.enable_pol =1 ; sig_cfg.clk_pol =0 ; - sig_cfg.width = mode->hdisplay; - sig_cfg.height = mode->vdisplay; sig_cfg.pixel_fmt = out_pixel_fmt; - sig_cfg.h_start_width = mode->htotal - mode->hsync_end; - sig_cfg.h_sync_width = mode->hsync_end - mode->hsync_start; - sig_cfg.h_end_width = mode->hsync_start - mode->hdisplay; - - sig_cfg.v_start_width = mode->vtotal - mode->vsync_end; - sig_cfg.v_sync_width = mode->vsync_end - mode->vsync_start; - sig_cfg.v_end_width = mode->vsync_start - mode->vdisplay; - sig_cfg.pixelclock = mode->clock *1000 ; sig_cfg.clkflags = ipu_crtc->di_clkflags; - sig_cfg.v_to_h_sync =0 ; - sig_cfg.hsync_pin = ipu_crtc->di_hsync_pin; sig_cfg.vsync_pin = ipu_crtc->di_vsync_pin; - ret =ipu_dc_init_sync (ipu_crtc->dc, ipu_crtc->di, sig_cfg.interlaced, - out_pixel_fmt, mode->hdisplay); +videomode_from_drm_display_mode (mode, &sig_cfg.mode); + + ret =ipu_dc_init_sync (ipu_crtc->dc, ipu_crtc->di, + mode->flags &DRM_MODE_FLAG_INTERLACE , + out_pixel_fmt, mode->hdisplay);if (ret) { dev_err(ipu_crtc->dev, "initializing display controller failed with %d\n",
drivers/gpu/ipu-v3/ipu-di.c +48 -41
242 lines not on this page · raw message
include/video/imx-ipu-v3.h +3 -16
@@ -33,28 +33,15 @@ enum ipuv3_type {* Bitfield of Display Interface signal polarities. */ struct ipu_di_signal_cfg { -unsigned datamask_en:1 ; -unsigned interlaced:1 ; -unsigned odd_field_first:1 ; -unsigned clksel_en:1 ; -unsigned clkidle_en:1 ;unsigned data_pol:1 ;/* true = inverted */ unsigned clk_pol:1 ;/* true = rising edge */ unsigned enable_pol:1 ; -unsigned Hsync_pol:1 ;/* true = active high */ -unsigned Vsync_pol:1 ; -u16 width; -u16 height; +struct videomode mode; +u32 pixel_fmt; -u16 h_start_width; -u16 h_sync_width; -u16 h_end_width; -u16 v_start_width; -u16 v_sync_width; -u16 v_end_width;u32 v_to_h_sync; -unsigned long pixelclock; +#define IPU_DI_CLKMODE_SYNC (1 << 0)#define IPU_DI_CLKMODE_EXT (1 << 1)unsigned long clkflags;
Signature · 1 line
1.7.9.5
PATCH v2 7/7 gpu: ipu-di: Switch to DIV_ROUND_CLOSEST for DI clock divider calc
In reply to Steve LongerbeamWe can use the DIV_ROUND_CLOSEST() macro when calculating the DI clock divider, rounded to nearest int.
--- drivers/gpu/ipu-v3/ipu-di.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/ipu-v3/ipu-di.c +3 -6
@@ -440,8 +440,7 @@ static void ipu_di_config_clock(struct ipu_di *di,clk_set_rate (clk, sig->mode.pixelclock); in_rate =clk_get_rate (clk); - div = (in_rate + sig->mode.pixelclock /2 ) / - sig->mode.pixelclock; + div =DIV_ROUND_CLOSEST (in_rate, sig->mode.pixelclock);if (div ==0 ) div =1 ;
@@ -459,8 +458,7 @@ static void ipu_di_config_clock(struct ipu_di *di,unsigned div, error; clkrate =clk_get_rate (di->clk_ipu); - div = (clkrate + sig->mode.pixelclock /2 ) / - sig->mode.pixelclock; + div =DIV_ROUND_CLOSEST (clkrate, sig->mode.pixelclock); rate = clkrate / div; error = rate / (sig->mode.pixelclock /1000 );
@@ -482,8 +480,7 @@ static void ipu_di_config_clock(struct ipu_di *di,clk_set_rate (clk, sig->mode.pixelclock); in_rate =clk_get_rate (clk); - div = (in_rate + sig->mode.pixelclock /2 ) / - sig->mode.pixelclock; + div =DIV_ROUND_CLOSEST (in_rate, sig->mode.pixelclock);if (div ==0 ) div =1 ;
Signature · 1 line
1.7.9.5
Philipp Zabel
maintainerAm Donnerstag, den 18.12.2014, 18:00 -0800 schrieb Steve Longerbeam:
Quoted 9 lines
This patchset implements ->mode_fixup() in the imx ipuv3-crtc driver, using a new support function
ipu_di_adjust_videomode(). This new function needs to be subsystem independent, so it accepts a video mode as a 'struct videomode'. Hence ipu-crtc ->mode_fixup() needs another support function to convert adrm_display_modeto a videomode before passing the mode toipu_di_adjust_videomode()for fixup.Also some related code cleanup: 'struct
ipu_di_signal_cfg' should use 'struct videomode' for mode timings.
Alright, I have applied the series with s/videomode_from_drm_display_mode/drm_display_mode_to_videomode/
thanks
Philipp
Hi,
It looks that the below commit makes my Hannstar XGA LVDS panel stop working on the i.MX6DL SabreSD board. Any idea?
commit eb10d6355532def3a74aaabd115e2373cca70b9d
Author: Steve Longerbeam <[email protected]> Date: Thu Dec 18 18:00:24 2014 -0800
imx-drm: encoder prepare/mode_set must use adjusted mode
The encoder ->prepare() and ->mode_set() methods need to use the hw adjusted mode, not the original mode.
Regards,
Liu Ying
Quoted 14 lines · Philipp Zabel
Am Donnerstag, den 18.12.2014, 18:00 -0800 schrieb Steve Longerbeam:
Quoted 9 lines
This patchset implements ->mode_fixup() in the imx ipuv3-crtc driver, using a new support function
ipu_di_adjust_videomode(). This new function needs to be subsystem independent, so it accepts a video mode as a 'struct videomode'. Hence ipu-crtc ->mode_fixup() needs another support function to convert adrm_display_modeto a videomode before passing the mode toipu_di_adjust_videomode()for fixup.Also some related code cleanup: 'struct
ipu_di_signal_cfg' should use 'struct videomode' for mode timings.Alright, I have applied the series with s/videomode_from_drm_display_mode/drm_display_mode_to_videomode/
Quoted 7 lines
thanks
Philipp--
To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Philipp Zabel
maintainerHi Liu,
Am Freitag, den 23.01.2015, 10:56 +0800 schrieb Liu Ying:
Quoted 11 lines
Hi,
It looks that the below commit makes my Hannstar XGA LVDS panel stop working on the i.MX6DL SabreSD board. Any idea?
commit
eb10d6355532def3a74aaabd115e2373cca70b9dAuthor: Steve Longerbeam <[email protected]> Date: Thu Dec 18 18:00:24 2014 -0800imx-drm: encoder prepare/mode_set must use adjusted mode
Quoted 8 lines
The encoder ->prepare() and ->mode_set() methods need to use the hw adjusted mode, not the original mode.
Signed-off-by Steve Longerbeam <[email protected]>Signed-off-by Philipp Zabel <[email protected]>Regards,
Liu Ying
What are this panel timings? The adjustment should increase the vertical back porch by up to two lines (so it is at least two lines), reducing the front porch or vsync length by the same amount. Does this panel use the HSYNC/VSYNC signals embedded in the LVDS stream?
regards
Philipp
Fabio Estevam
reviewerHi Philipp,
Quoted 4 lines · Philipp Zabel
What are this panel timings? The adjustment should increase the vertical back porch by up to two lines (so it is at least two lines), reducing the front porch or vsync length by the same amount. Does this panel use the HSYNC/VSYNC signals embedded in the LVDS stream?
The panel on this board is a Hannstar HSD100PXN1. The timings we use are described in imx6qdl-sabresd.dtsi:
display-timings {
native-mode = <&timing0>;
timing0: hsd100pxn1 {
clock-frequency = <65000000>;
hactive = <1024>;
vactive = <768>;
hback-porch = <220>;
hfront-porch = <40>;
vback-porch = <21>;
vfront-porch = <7>;
hsync-len = <60>;
vsync-len = <10>;
};Fabio Estevam
reviewerQuoted 4 lines · Liu Ying
Hi,
It looks that the below commit makes my Hannstar XGA LVDS panel stop working on the i.MX6DL SabreSD board. Any idea?
Yes, with eb10d6355532def3a ("mx-drm: encoder prepare/mode_set must use adjusted mode") applied
the DI clock is 0:
drivers/gpu/drm/imx/imx-ldb.c +0 -0
@@ -169,6 +169,8 @@ static void imx_ldb_encoder_prepare(struct
drm_encoder *encoder)
unsigned long di_clk = mode->clock * 1000;
int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);+ pr_err("********* DI clock is %ld\n", di_clk);
+
if (ldb->ldb_ctrl & LDB_SPLIT_MODE_EN) {With eb10d6355532def3a applied:
[ 1.493745] ********* DI clock is 0
With eb10d6355532def3a reverted:
[ 1.493639] ********* DI clock is 65000000
Should we just go back to the previous usage?
drivers/gpu/drm/imx/imx-ldb.c +0 -0
@@ -163,12 +163,14 @@ static void imx_ldb_encoder_prepare(struct
drm_encoder *encoder)
{
struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder);
struct imx_ldb *ldb = imx_ldb_ch->ldb;
- struct drm_display_mode *mode = &encoder->crtc->hwmode;
+ struct drm_display_mode *mode = &encoder->crtc->mode;
u32 pixel_fmt;Philipp Zabel
maintainerAm Freitag, den 23.01.2015, 13:06 -0200 schrieb Fabio Estevam:
Quoted 9 lines · Liu Ying
Quoted 4 lines
Hi,
It looks that the below commit makes my Hannstar XGA LVDS panel stop working on the i.MX6DL SabreSD board. Any idea?
Yes, with
eb10d6355532def3a("mx-drm: encoder prepare/mode_set must use adjusted mode") applied
the DI clock is 0:
My bad, the problem is we are misusing encoder_prepare to enable the display interface clock needed for the following crtc mode set.
What we really want is to use is adjusted_mode given to encoder_funcs->mode_set, before the clock is enabled by crtc_funcs->commit.
How about this patch:
-----8<-----
drivers/gpu/drm/imx/imx-ldb.c +13 -14
@@ -193,22 +193,8 @@ static void imx_ldb_encoder_prepare(struct drm_encoder *encoder) {struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb; -struct drm_display_mode *mode = &encoder->crtc->hwmode;u32 pixel_fmt; -unsigned long serial_clk; -unsigned long di_clk = mode->clock *1000 ; -int mux =imx_ldb_get_mux_id (imx_ldb_ch); -if (ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ) { -/* dual channel LVDS mode */ - serial_clk =3500UL * mode->clock; -imx_ldb_set_clock (ldb, mux,0 , serial_clk, di_clk); -imx_ldb_set_clock (ldb, mux,1 , serial_clk, di_clk); - }else { - serial_clk =7000UL * mode->clock; -imx_ldb_set_clock (ldb, mux, imx_ldb_ch->chno, serial_clk, - di_clk); - }switch (imx_ldb_ch->chno) {case 0 :
@@ -281,6 +267,9 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb;int dual = ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ; +unsigned long serial_clk; +unsigned long di_clk = mode->clock *1000 ; +int mux =imx_ldb_get_mux_id (imx_ldb_ch);if (mode->clock >170000 ) { dev_warn(ldb->dev,
@@ -291,6 +280,16 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, "%s: mode exceeds 85 MHz pixel clock\n", __func__); } +if (dual) { + serial_clk =3500UL * mode->clock; +imx_ldb_set_clock (ldb, mux,0 , serial_clk, di_clk); +imx_ldb_set_clock (ldb, mux,1 , serial_clk, di_clk); + }else { + serial_clk =7000UL * mode->clock; +imx_ldb_set_clock (ldb, mux, imx_ldb_ch->chno, serial_clk, + di_clk); + } +/* FIXME - assumes straight connections DI0 --> CH0, DI1 --> CH1 */ if (imx_ldb_ch == &ldb->channel[0 ]) {if (mode->flags &DRM_MODE_FLAG_NVSYNC )
Signature · 5 lines
2.1.4 ----->8----- regards Philipp
Fabio Estevam
reviewerHi Philipp,
drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, · line 272
Quoted 7 lines · Philipp Zabel
drivers/gpu/drm/imx/imx-ldb.c +3
-0@@ -281,6 +267,9 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb;int dual = ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ; +unsigned long serial_clk; +unsigned long di_clk = mode->clock *1000 ; +int mux =imx_ldb_get_mux_id (imx_ldb_ch);
I can't find imx_ldb_get_mux_id() on linux-next.
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Philipp Zabel
maintainerAm Freitag, den 23.01.2015, 14:27 -0200 schrieb Fabio Estevam:
Quoted 12 lines
Hi Philipp,
drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, · line 272
Quoted 7 lines · Philipp Zabel
drivers/gpu/drm/imx/imx-ldb.c +3
-0@@ -281,6 +267,9 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb;int dual = ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ; +unsigned long serial_clk; +unsigned long di_clk = mode->clock *1000 ; +int mux =imx_ldb_get_mux_id (imx_ldb_ch);I can't find
imx_ldb_get_mux_id()on linux-next.
Sorry, that should be
int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);
regards
Philipp
Quoted 14 lines · Philipp Zabel
Am Freitag, den 23.01.2015, 14:27 -0200 schrieb Fabio Estevam:
Quoted 12 lines
Hi Philipp,
drivers/gpu/drm/imx/imx-ldb.c static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, · line 272
Quoted 7 lines · Philipp Zabel
drivers/gpu/drm/imx/imx-ldb.c +3
-0@@ -281,6 +267,9 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder,struct imx_ldb_channel *imx_ldb_ch =enc_to_imx_ldb_ch (encoder);struct imx_ldb *ldb = imx_ldb_ch->ldb;int dual = ldb->ldb_ctrl &LDB_SPLIT_MODE_EN ; +unsigned long serial_clk; +unsigned long di_clk = mode->clock *1000 ; +int mux =imx_ldb_get_mux_id (imx_ldb_ch);I can't find
imx_ldb_get_mux_id()on linux-next.
Quoted 3 lines
Sorry, that should be
int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder);
It works fine now, thanks: