| Message ID | 20190902125359.18001-4-tomi.valkeinen@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/omap: misc improvements | expand |
Hi Tomi, Thank you for the patch. On Mon, Sep 02, 2019 at 03:53:55PM +0300, Tomi Valkeinen wrote: > OMAP2 and OMAP3/AM4 have limitations with the scaler: > - OMAP2 can only scale XRGB8888 > - OMAP3/AM4 can only scale XRGB8888, RGB565, YUYV and UYVY > > The driver doesn't check these limitations, which leads to sync-lost > floods. > > This patch adds a check for the pixel formats when scaling. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > --- > drivers/gpu/drm/omapdrm/dss/dispc.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c > index c6da33e7014f..7d87d60edb80 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dispc.c > +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c > @@ -114,6 +114,7 @@ struct dispc_features { > const unsigned int num_reg_fields; > const enum omap_overlay_caps *overlay_caps; > const u32 **supported_color_modes; > + const u32 *supported_scaler_color_modes; > unsigned int num_mgrs; > unsigned int num_ovls; > unsigned int buffer_size_unit; > @@ -2498,6 +2499,19 @@ static int dispc_ovl_calc_scaling(struct dispc_device *dispc, > if (width == out_width && height == out_height) > return 0; > > + if (dispc->feat->supported_scaler_color_modes) { > + const u32 *modes = dispc->feat->supported_scaler_color_modes; > + int i; i is never negative and can thus be an unsigned int. Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + > + for (i = 0; modes[i]; ++i) { > + if (modes[i] == fourcc) > + break; > + } > + > + if (modes[i] == 0) > + return -EINVAL; > + } > + > if (plane == OMAP_DSS_WB) { > switch (fourcc) { > case DRM_FORMAT_NV12: > @@ -4213,6 +4227,12 @@ static const u32 *omap4_dispc_supported_color_modes[] = { > DRM_FORMAT_RGBX8888), > }; > > +static const u32 omap3_dispc_supported_scaler_color_modes[] = { > + DRM_FORMAT_XRGB8888, DRM_FORMAT_RGB565, DRM_FORMAT_YUYV, > + DRM_FORMAT_UYVY, > + 0, > +}; > + > static const struct dispc_features omap24xx_dispc_feats = { > .sw_start = 5, > .fp_start = 15, > @@ -4241,6 +4261,7 @@ static const struct dispc_features omap24xx_dispc_feats = { > .num_reg_fields = ARRAY_SIZE(omap2_dispc_reg_fields), > .overlay_caps = omap2_dispc_overlay_caps, > .supported_color_modes = omap2_dispc_supported_color_modes, > + .supported_scaler_color_modes = COLOR_ARRAY(DRM_FORMAT_XRGB8888), > .num_mgrs = 2, > .num_ovls = 3, > .buffer_size_unit = 1, > @@ -4275,6 +4296,7 @@ static const struct dispc_features omap34xx_rev1_0_dispc_feats = { > .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), > .overlay_caps = omap3430_dispc_overlay_caps, > .supported_color_modes = omap3_dispc_supported_color_modes, > + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, > .num_mgrs = 2, > .num_ovls = 3, > .buffer_size_unit = 1, > @@ -4309,6 +4331,7 @@ static const struct dispc_features omap34xx_rev3_0_dispc_feats = { > .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), > .overlay_caps = omap3430_dispc_overlay_caps, > .supported_color_modes = omap3_dispc_supported_color_modes, > + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, > .num_mgrs = 2, > .num_ovls = 3, > .buffer_size_unit = 1, > @@ -4343,6 +4366,7 @@ static const struct dispc_features omap36xx_dispc_feats = { > .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), > .overlay_caps = omap3630_dispc_overlay_caps, > .supported_color_modes = omap3_dispc_supported_color_modes, > + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, > .num_mgrs = 2, > .num_ovls = 3, > .buffer_size_unit = 1, > @@ -4377,6 +4401,7 @@ static const struct dispc_features am43xx_dispc_feats = { > .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), > .overlay_caps = omap3430_dispc_overlay_caps, > .supported_color_modes = omap3_dispc_supported_color_modes, > + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, > .num_mgrs = 1, > .num_ovls = 3, > .buffer_size_unit = 1,
On 03/09/2019 18:12, Laurent Pinchart wrote: >> @@ -2498,6 +2499,19 @@ static int dispc_ovl_calc_scaling(struct dispc_device *dispc, >> if (width == out_width && height == out_height) >> return 0; >> >> + if (dispc->feat->supported_scaler_color_modes) { >> + const u32 *modes = dispc->feat->supported_scaler_color_modes; >> + int i; > > i is never negative and can thus be an unsigned int. Apart from that, Thanks, fixed that. Tomi
diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index c6da33e7014f..7d87d60edb80 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c @@ -114,6 +114,7 @@ struct dispc_features { const unsigned int num_reg_fields; const enum omap_overlay_caps *overlay_caps; const u32 **supported_color_modes; + const u32 *supported_scaler_color_modes; unsigned int num_mgrs; unsigned int num_ovls; unsigned int buffer_size_unit; @@ -2498,6 +2499,19 @@ static int dispc_ovl_calc_scaling(struct dispc_device *dispc, if (width == out_width && height == out_height) return 0; + if (dispc->feat->supported_scaler_color_modes) { + const u32 *modes = dispc->feat->supported_scaler_color_modes; + int i; + + for (i = 0; modes[i]; ++i) { + if (modes[i] == fourcc) + break; + } + + if (modes[i] == 0) + return -EINVAL; + } + if (plane == OMAP_DSS_WB) { switch (fourcc) { case DRM_FORMAT_NV12: @@ -4213,6 +4227,12 @@ static const u32 *omap4_dispc_supported_color_modes[] = { DRM_FORMAT_RGBX8888), }; +static const u32 omap3_dispc_supported_scaler_color_modes[] = { + DRM_FORMAT_XRGB8888, DRM_FORMAT_RGB565, DRM_FORMAT_YUYV, + DRM_FORMAT_UYVY, + 0, +}; + static const struct dispc_features omap24xx_dispc_feats = { .sw_start = 5, .fp_start = 15, @@ -4241,6 +4261,7 @@ static const struct dispc_features omap24xx_dispc_feats = { .num_reg_fields = ARRAY_SIZE(omap2_dispc_reg_fields), .overlay_caps = omap2_dispc_overlay_caps, .supported_color_modes = omap2_dispc_supported_color_modes, + .supported_scaler_color_modes = COLOR_ARRAY(DRM_FORMAT_XRGB8888), .num_mgrs = 2, .num_ovls = 3, .buffer_size_unit = 1, @@ -4275,6 +4296,7 @@ static const struct dispc_features omap34xx_rev1_0_dispc_feats = { .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), .overlay_caps = omap3430_dispc_overlay_caps, .supported_color_modes = omap3_dispc_supported_color_modes, + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, .num_mgrs = 2, .num_ovls = 3, .buffer_size_unit = 1, @@ -4309,6 +4331,7 @@ static const struct dispc_features omap34xx_rev3_0_dispc_feats = { .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), .overlay_caps = omap3430_dispc_overlay_caps, .supported_color_modes = omap3_dispc_supported_color_modes, + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, .num_mgrs = 2, .num_ovls = 3, .buffer_size_unit = 1, @@ -4343,6 +4366,7 @@ static const struct dispc_features omap36xx_dispc_feats = { .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), .overlay_caps = omap3630_dispc_overlay_caps, .supported_color_modes = omap3_dispc_supported_color_modes, + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, .num_mgrs = 2, .num_ovls = 3, .buffer_size_unit = 1, @@ -4377,6 +4401,7 @@ static const struct dispc_features am43xx_dispc_feats = { .num_reg_fields = ARRAY_SIZE(omap3_dispc_reg_fields), .overlay_caps = omap3430_dispc_overlay_caps, .supported_color_modes = omap3_dispc_supported_color_modes, + .supported_scaler_color_modes = omap3_dispc_supported_scaler_color_modes, .num_mgrs = 1, .num_ovls = 3, .buffer_size_unit = 1,
OMAP2 and OMAP3/AM4 have limitations with the scaler: - OMAP2 can only scale XRGB8888 - OMAP3/AM4 can only scale XRGB8888, RGB565, YUYV and UYVY The driver doesn't check these limitations, which leads to sync-lost floods. This patch adds a check for the pixel formats when scaling. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- drivers/gpu/drm/omapdrm/dss/dispc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)