mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-07-05 13:25:20 +02:00
1f8d03fb90
[ Upstream commit 1017560164b6bbcbc93579266926e6e96675262a ]
Christian reports that 4K output using YUV420 encoding fails with the
following error:
Fatal Error, invalid HDMI vclk freq 593406
Modetest shows the following:
3840x2160 59.94 3840 4016 4104 4400 2160 2168 2178 2250 593407 flags: xxxx, xxxx,
drm calculated value -------------------------------------^
This indicates that there's a (1kHz) mismatch between the clock
calculated by the drm framework and the meson driver.
Relevant function call stack:
(drm framework)
-> meson_encoder_hdmi_atomic_enable()
-> meson_encoder_hdmi_set_vclk()
-> meson_vclk_setup()
The video clock requested by the drm framework is 593407kHz. This is
passed by meson_encoder_hdmi_atomic_enable() to
meson_encoder_hdmi_set_vclk() and the following formula is applied:
- the frequency is halved (which would be 296703.5kHz) and rounded down
to the next full integer, which is 296703kHz
- TMDS clock is calculated (296703kHz * 10)
- video encoder clock is calculated - this needs to match a table from
meson_vclk.c and so it doubles the previously halved value again
(resulting in 593406kHz)
- meson_vclk_setup() can't find (either directly, or by deriving it from
594000kHz * 1000 / 1001 and rounding to the closest integer value -
which is 593407kHz as originally requested by the drm framework) a
matching clock in it's internal table and errors out with "invalid
HDMI vclk freq"
Fix the division precision by switching the whole meson driver to use
unsigned long long (64-bit) Hz values for clock frequencies instead of
unsigned int (32-bit) kHz to fix the rouding error.
Fixes: e5fab2ec9c ("drm/meson: vclk: add support for YUV420 setup")
Reported-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250421201300.778955-3-martin.blumenstingl@googlemail.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20250421201300.778955-3-martin.blumenstingl@googlemail.com
Stable-dep-of: d17e61ab63fb ("drm/meson: fix debug log statement when setting the HDMI clocks")
Signed-off-by: Sasha Levin <sashal@kernel.org>
186 lines
4.2 KiB
C
186 lines
4.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* Copyright (C) 2016 BayLibre, SAS
|
|
* Author: Neil Armstrong <narmstrong@baylibre.com>
|
|
*/
|
|
|
|
#ifndef __MESON_DRV_H
|
|
#define __MESON_DRV_H
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/of.h>
|
|
#include <linux/regmap.h>
|
|
|
|
struct drm_crtc;
|
|
struct drm_device;
|
|
struct drm_plane;
|
|
struct meson_drm;
|
|
struct meson_afbcd_ops;
|
|
|
|
enum vpu_compatible {
|
|
VPU_COMPATIBLE_GXBB = 0,
|
|
VPU_COMPATIBLE_GXL = 1,
|
|
VPU_COMPATIBLE_GXM = 2,
|
|
VPU_COMPATIBLE_G12A = 3,
|
|
};
|
|
|
|
enum {
|
|
MESON_ENC_CVBS = 0,
|
|
MESON_ENC_HDMI,
|
|
MESON_ENC_DSI,
|
|
MESON_ENC_LAST,
|
|
};
|
|
|
|
struct meson_drm_match_data {
|
|
enum vpu_compatible compat;
|
|
struct meson_afbcd_ops *afbcd_ops;
|
|
};
|
|
|
|
struct meson_drm_soc_limits {
|
|
unsigned long long max_hdmi_phy_freq;
|
|
};
|
|
|
|
struct meson_drm {
|
|
struct device *dev;
|
|
enum vpu_compatible compat;
|
|
void __iomem *io_base;
|
|
struct regmap *hhi;
|
|
int vsync_irq;
|
|
|
|
struct meson_canvas *canvas;
|
|
u8 canvas_id_osd1;
|
|
u8 canvas_id_vd1_0;
|
|
u8 canvas_id_vd1_1;
|
|
u8 canvas_id_vd1_2;
|
|
|
|
struct drm_device *drm;
|
|
struct drm_crtc *crtc;
|
|
struct drm_plane *primary_plane;
|
|
struct drm_plane *overlay_plane;
|
|
void *encoders[MESON_ENC_LAST];
|
|
|
|
const struct meson_drm_soc_limits *limits;
|
|
|
|
/* Components Data */
|
|
struct {
|
|
bool osd1_enabled;
|
|
bool osd1_interlace;
|
|
bool osd1_commit;
|
|
bool osd1_afbcd;
|
|
uint32_t osd1_ctrl_stat;
|
|
uint32_t osd1_ctrl_stat2;
|
|
uint32_t osd1_blk0_cfg[5];
|
|
uint32_t osd1_blk1_cfg4;
|
|
uint32_t osd1_blk2_cfg4;
|
|
uint32_t osd1_addr;
|
|
uint32_t osd1_stride;
|
|
uint32_t osd1_height;
|
|
uint32_t osd1_width;
|
|
uint32_t osd_sc_ctrl0;
|
|
uint32_t osd_sc_i_wh_m1;
|
|
uint32_t osd_sc_o_h_start_end;
|
|
uint32_t osd_sc_o_v_start_end;
|
|
uint32_t osd_sc_v_ini_phase;
|
|
uint32_t osd_sc_v_phase_step;
|
|
uint32_t osd_sc_h_ini_phase;
|
|
uint32_t osd_sc_h_phase_step;
|
|
uint32_t osd_sc_h_ctrl0;
|
|
uint32_t osd_sc_v_ctrl0;
|
|
uint32_t osd_blend_din0_scope_h;
|
|
uint32_t osd_blend_din0_scope_v;
|
|
uint32_t osb_blend0_size;
|
|
uint32_t osb_blend1_size;
|
|
|
|
bool vd1_enabled;
|
|
bool vd1_commit;
|
|
bool vd1_afbc;
|
|
unsigned int vd1_planes;
|
|
uint32_t vd1_if0_gen_reg;
|
|
uint32_t vd1_if0_luma_x0;
|
|
uint32_t vd1_if0_luma_y0;
|
|
uint32_t vd1_if0_chroma_x0;
|
|
uint32_t vd1_if0_chroma_y0;
|
|
uint32_t vd1_if0_repeat_loop;
|
|
uint32_t vd1_if0_luma0_rpt_pat;
|
|
uint32_t vd1_if0_chroma0_rpt_pat;
|
|
uint32_t vd1_range_map_y;
|
|
uint32_t vd1_range_map_cb;
|
|
uint32_t vd1_range_map_cr;
|
|
uint32_t viu_vd1_fmt_w;
|
|
uint32_t vd1_if0_canvas0;
|
|
uint32_t vd1_if0_gen_reg2;
|
|
uint32_t viu_vd1_fmt_ctrl;
|
|
uint32_t vd1_addr0;
|
|
uint32_t vd1_addr1;
|
|
uint32_t vd1_addr2;
|
|
uint32_t vd1_stride0;
|
|
uint32_t vd1_stride1;
|
|
uint32_t vd1_stride2;
|
|
uint32_t vd1_height0;
|
|
uint32_t vd1_height1;
|
|
uint32_t vd1_height2;
|
|
uint32_t vd1_afbc_mode;
|
|
uint32_t vd1_afbc_en;
|
|
uint32_t vd1_afbc_head_addr;
|
|
uint32_t vd1_afbc_body_addr;
|
|
uint32_t vd1_afbc_conv_ctrl;
|
|
uint32_t vd1_afbc_dec_def_color;
|
|
uint32_t vd1_afbc_vd_cfmt_ctrl;
|
|
uint32_t vd1_afbc_vd_cfmt_w;
|
|
uint32_t vd1_afbc_vd_cfmt_h;
|
|
uint32_t vd1_afbc_mif_hor_scope;
|
|
uint32_t vd1_afbc_mif_ver_scope;
|
|
uint32_t vd1_afbc_size_out;
|
|
uint32_t vd1_afbc_pixel_hor_scope;
|
|
uint32_t vd1_afbc_pixel_ver_scope;
|
|
uint32_t vd1_afbc_size_in;
|
|
uint32_t vpp_pic_in_height;
|
|
uint32_t vpp_postblend_vd1_h_start_end;
|
|
uint32_t vpp_postblend_vd1_v_start_end;
|
|
uint32_t vpp_hsc_region12_startp;
|
|
uint32_t vpp_hsc_region34_startp;
|
|
uint32_t vpp_hsc_region4_endp;
|
|
uint32_t vpp_hsc_start_phase_step;
|
|
uint32_t vpp_hsc_region1_phase_slope;
|
|
uint32_t vpp_hsc_region3_phase_slope;
|
|
uint32_t vpp_line_in_length;
|
|
uint32_t vpp_preblend_h_size;
|
|
uint32_t vpp_vsc_region12_startp;
|
|
uint32_t vpp_vsc_region34_startp;
|
|
uint32_t vpp_vsc_region4_endp;
|
|
uint32_t vpp_vsc_start_phase_step;
|
|
uint32_t vpp_vsc_ini_phase;
|
|
uint32_t vpp_vsc_phase_ctrl;
|
|
uint32_t vpp_hsc_phase_ctrl;
|
|
uint32_t vpp_blend_vd2_h_start_end;
|
|
uint32_t vpp_blend_vd2_v_start_end;
|
|
} viu;
|
|
|
|
struct {
|
|
unsigned int current_mode;
|
|
bool hdmi_repeat;
|
|
bool venc_repeat;
|
|
bool hdmi_use_enci;
|
|
} venc;
|
|
|
|
struct {
|
|
dma_addr_t addr_dma;
|
|
uint32_t *addr;
|
|
unsigned int offset;
|
|
} rdma;
|
|
|
|
struct {
|
|
struct meson_afbcd_ops *ops;
|
|
u64 modifier;
|
|
u32 format;
|
|
} afbcd;
|
|
};
|
|
|
|
static inline int meson_vpu_is_compatible(struct meson_drm *priv,
|
|
enum vpu_compatible family)
|
|
{
|
|
return priv->compat == family;
|
|
}
|
|
|
|
#endif /* __MESON_DRV_H */
|