| Message ID | 20200309195216.31042-20-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: mxsfb: Add i.MX7 support | expand |
On 2020-03-09 20:52, Laurent Pinchart wrote: > The mxsfb_set_pixel_fmt() function returns an error when the selected > pixel format is unsupported. This can never happen, as such errors are > caught by the DRM core. Remove the error check. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I see, we specify the supported plane formats when initializing the primary/overlay plane. Reviewed-by: Stefan Agner <stefan@agner.ch> -- Stefan > --- > drivers/gpu/drm/mxsfb/mxsfb_kms.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > index 640305fb1068..19b937b383cf 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c > @@ -43,7 +43,7 @@ static u32 set_hsync_pulse_width(struct > mxsfb_drm_private *mxsfb, u32 val) > } > > /* Setup the MXSFB registers for decoding the pixels out of the framebuffer */ > -static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private *mxsfb) > +static void mxsfb_set_pixel_fmt(struct mxsfb_drm_private *mxsfb) > { > struct drm_device *drm = mxsfb->drm; > const u32 format = mxsfb->crtc.primary->state->fb->format->format; > @@ -67,15 +67,10 @@ static int mxsfb_set_pixel_fmt(struct > mxsfb_drm_private *mxsfb) > /* Do not use packed pixels = one pixel per word instead. */ > ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0x7); > break; > - default: > - dev_err(drm->dev, "Unhandled pixel format %08x\n", format); > - return -EINVAL; > } > > writel(ctrl1, mxsfb->base + LCDC_CTRL1); > writel(ctrl, mxsfb->base + LCDC_CTRL); > - > - return 0; > } > > static void mxsfb_set_bus_fmt(struct mxsfb_drm_private *mxsfb) > @@ -218,9 +213,7 @@ static void mxsfb_crtc_mode_set_nofb(struct > mxsfb_drm_private *mxsfb) > /* Clear the FIFOs */ > writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET); > > - err = mxsfb_set_pixel_fmt(mxsfb); > - if (err) > - return; > + mxsfb_set_pixel_fmt(mxsfb); > > clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c index 640305fb1068..19b937b383cf 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c @@ -43,7 +43,7 @@ static u32 set_hsync_pulse_width(struct mxsfb_drm_private *mxsfb, u32 val) } /* Setup the MXSFB registers for decoding the pixels out of the framebuffer */ -static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private *mxsfb) +static void mxsfb_set_pixel_fmt(struct mxsfb_drm_private *mxsfb) { struct drm_device *drm = mxsfb->drm; const u32 format = mxsfb->crtc.primary->state->fb->format->format; @@ -67,15 +67,10 @@ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private *mxsfb) /* Do not use packed pixels = one pixel per word instead. */ ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0x7); break; - default: - dev_err(drm->dev, "Unhandled pixel format %08x\n", format); - return -EINVAL; } writel(ctrl1, mxsfb->base + LCDC_CTRL1); writel(ctrl, mxsfb->base + LCDC_CTRL); - - return 0; } static void mxsfb_set_bus_fmt(struct mxsfb_drm_private *mxsfb) @@ -218,9 +213,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb) /* Clear the FIFOs */ writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET); - err = mxsfb_set_pixel_fmt(mxsfb); - if (err) - return; + mxsfb_set_pixel_fmt(mxsfb); clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
The mxsfb_set_pixel_fmt() function returns an error when the selected pixel format is unsupported. This can never happen, as such errors are caught by the DRM core. Remove the error check. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)