My patches series is only for v5.15 kernel, and includes a fix building issue
patch and upgrading patches from sdk repo
I will debug and create a patch only to fix the building issue for v5.10 kernel
in later.
Thanks,
Limeng
> -----Original Message-----
> From: Panait, Ovidiu <ovidiu.pan...@windriver.com>
> Sent: Friday, August 26, 2022 4:48 PM
> To: bruce.ashfi...@gmail.com
> Cc: linux-yocto@lists.yoctoproject.org; Li, Meng <meng...@windriver.com>
> Subject: [PATCH v5.10/standard/bcm-2xxx-rpi] drivers: drm: vc4: fix build
> failure caused by merge conflicts
>
> In 0487f95471af ("Merge branch 'v5.10/standard/base' into
> v5.10/standard/bcm-2xxx-rpi") there was a conflict between linux-stable
> backports
> de63dbc29681 ("drm/vc4: hdmi: Disable audio if dmas property is present but
> empty")
> 717325e814d0 ("drm/vc4: hdmi: Limit the BCM2711 to the max without
> scrambling")
> 36f797a10f30 ("drm/vc4: hdmi: Fix timings for interlaced modes")
> ed2f42bd8021 ("drm/vc4: dsi: Correct pixel order for DSI0") and existing rpi
> SDK commits.
>
> This caused the following build failures:
> 1. drivers/gpu/drm/vc4/vc4_crtc.c: In function 'vc4_crtc_config_pv':
> drivers/gpu/drm/vc4/vc4_crtc.c:377:56:
> warning: value computed is not used [-Wunused-value]
> 377 | PV_VERTA_VBP) |
> drivers/gpu/drm/vc4/vc4_crtc.c:380:57:
> error: expected ';' before ')' token
> 380 | PV_VERTA_VSYNC));
> | ^
> drivers/gpu/drm/vc4/vc4_crtc.c:380:57:
> error: expected statement before ')' token
>
> 2. drivers/gpu/drm/vc4/vc4_hdmi.c:1540:13:
> error: redeclaration of 'len' with no linkage
> | 1540 | int len;
> | | ^~~
>
> Remove unneeded duplicated code to fix this.
>
> Signed-off-by: Ovidiu Panait <ovidiu.pan...@windriver.com>
> ---
> drivers/gpu/drm/vc4/vc4_crtc.c | 17 -----------------
> drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ---
> 2 files changed, 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index 26cf9cc105fe..c50a8286f3e6 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -338,17 +338,6 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc,
> struct drm_encoder *encode
> VC4_SET_FIELD(mode->hdisplay * pixel_rep / ppc,
> PV_HORZB_HACTIVE));
>
> - CRTC_WRITE(PV_VERTA,
> - VC4_SET_FIELD(mode->crtc_vtotal - mode-
> >crtc_vsync_end +
> - interlace,
> - PV_VERTA_VBP) |
> - VC4_SET_FIELD(mode->crtc_vsync_end - mode-
> >crtc_vsync_start,
> - PV_VERTA_VSYNC));
> - CRTC_WRITE(PV_VERTB,
> - VC4_SET_FIELD(mode->crtc_vsync_start - mode-
> >crtc_vdisplay,
> - PV_VERTB_VFP) |
> - VC4_SET_FIELD(mode->crtc_vdisplay,
> PV_VERTB_VACTIVE));
> -
> if (interlace) {
> bool odd_field_first = false;
> u32 field_delay = mode->htotal * pixel_rep / (2 * ppc); @@ -
> 372,12 +361,6 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct
> drm_encoder *encode
> CRTC_WRITE(PV_VERTA_EVEN,
> VC4_SET_FIELD(vert_bp_even, PV_VERTA_VBP) |
> VC4_SET_FIELD(vert_sync, PV_VERTA_VSYNC));
> - VC4_SET_FIELD(mode->crtc_vtotal -
> - mode->crtc_vsync_end,
> - PV_VERTA_VBP) |
> - VC4_SET_FIELD(mode->crtc_vsync_end -
> - mode->crtc_vsync_start,
> - PV_VERTA_VSYNC));
> CRTC_WRITE(PV_VERTB_EVEN,
> VC4_SET_FIELD(vert_fp_even, PV_VERTB_VFP) |
> VC4_SET_FIELD(mode->crtc_vdisplay,
> PV_VERTB_VACTIVE)); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c
> b/drivers/gpu/drm/vc4/vc4_hdmi.c index a147dad0f52c..00e9416edc3d
> 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -108,8 +108,6 @@ static bool vc4_hdmi_mode_needs_scrambling(const
> struct drm_display_mode *mode)
> return (mode->clock * 1000) > HDMI_14_MAX_TMDS_CLK; }
>
> -#define HDMI_14_MAX_TMDS_CLK (340 * 1000 * 1000)
> -
> static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused) {
> struct drm_info_node *node = (struct drm_info_node *)m->private;
> @@ -1537,7 +1535,6 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi
> *vc4_hdmi)
> const __be32 *addr;
> int index, len;
> int ret;
> - int len;
>
> if (!of_find_property(dev->of_node, "dmas", &len) ||
> len == 0) {
> --
> 2.37.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11597):
https://lists.yoctoproject.org/g/linux-yocto/message/11597
Mute This Topic: https://lists.yoctoproject.org/mt/93266154/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
