Thanks for the fix, this is now merged. Bruce
In message: [linux-yocto][v5.10/standard/bcm-2xxx-rpi][PATCH] kernel compile error: drivers/gpu/drm/vc4/vc4_dpi.c on 19/03/2023 Li Wang wrote: > drivers/gpu/drm/vc4/vc4_dpi.c: In function 'vc4_dpi_encoder_enable': > drivers/gpu/drm/vc4/vc4_dpi.c:223:29: error: invalid storage class for > function 'vc4_dpi_encoder_mode_valid' > | 223 | static enum drm_mode_status vc4_dpi_encoder_mode_valid(struct > drm_encoder *encoder, > | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/vc4/vc4_dpi.c:223:1: warning: ISO C90 forbids mixed > declarations and code [-Wdeclaration-after-statement] > | 223 | static enum drm_mode_status vc4_dpi_encoder_mode_valid(struct > drm_encoder *encoder, > | | ^~~~~~ > drivers/gpu/drm/vc4/vc4_dpi.c:235:23: error: initializer element is not > constant > | 235 | .mode_valid = vc4_dpi_encoder_mode_valid, > | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/vc4/vc4_dpi.c:235:23: note: (near initialization for > 'vc4_dpi_encoder_helper_funcs.mode_valid') > > Signed-off-by: Li Wang <[email protected]> > --- > drivers/gpu/drm/vc4/vc4_dpi.c | 71 ++++++++++++++++++----------------- > 1 file changed, 36 insertions(+), 35 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c > index a66fc4e4c17c..3a4918b3d0d2 100644 > --- a/drivers/gpu/drm/vc4/vc4_dpi.c > +++ b/drivers/gpu/drm/vc4/vc4_dpi.c > @@ -152,41 +152,42 @@ static void vc4_dpi_encoder_enable(struct drm_encoder > *encoder) > if (connector->display_info.num_bus_formats) { > u32 bus_format = connector->display_info.bus_formats[0]; > > - switch (bus_format) { > - case MEDIA_BUS_FMT_RGB888_1X24: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, > - DPI_FORMAT); > - break; > - case MEDIA_BUS_FMT_BGR888_1X24: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, > - DPI_FORMAT); > - dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER); > - break; > - case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, > - DPI_FORMAT); > - break; > - case MEDIA_BUS_FMT_BGR666_1X24_CPADHI: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, > - DPI_FORMAT); > - dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER); > - break; > - case MEDIA_BUS_FMT_RGB666_1X18: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, > - DPI_FORMAT); > - break; > - case MEDIA_BUS_FMT_BGR666_1X18: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, > - DPI_FORMAT); > - dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER); > - break; > - case MEDIA_BUS_FMT_RGB565_1X16: > - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3, > - DPI_FORMAT); > - break; > - default: > - DRM_ERROR("Unknown media bus format %d\n", bus_format); > - break; > + switch (bus_format) { > + case MEDIA_BUS_FMT_RGB888_1X24: > + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, > + DPI_FORMAT); > + break; > + case MEDIA_BUS_FMT_BGR888_1X24: > + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, > + DPI_FORMAT); > + dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, > DPI_ORDER); > + break; > + case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: > + dpi_c |= > VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, > + DPI_FORMAT); > + break; > + case MEDIA_BUS_FMT_BGR666_1X24_CPADHI: > + dpi_c |= > VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, > + DPI_FORMAT); > + dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, > DPI_ORDER); > + break; > + case MEDIA_BUS_FMT_RGB666_1X18: > + dpi_c |= > VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, > + DPI_FORMAT); > + break; > + case MEDIA_BUS_FMT_BGR666_1X18: > + dpi_c |= > VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, > + DPI_FORMAT); > + dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, > DPI_ORDER); > + break; > + case MEDIA_BUS_FMT_RGB565_1X16: > + dpi_c |= > VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3, > + DPI_FORMAT); > + break; > + default: > + DRM_ERROR("Unknown media bus format %d\n", > bus_format); > + break; > + } > } > > if (connector->display_info.bus_flags & > DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) > -- > 2.25.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12269): https://lists.yoctoproject.org/g/linux-yocto/message/12269 Mute This Topic: https://lists.yoctoproject.org/mt/97706709/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
