From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Cc: Marek Vasut <marex@denx.de>,
linux-imx@nxp.com, kernel@pengutronix.de, robert.chiras@nxp.com,
leonard.crestez@nxp.com
Subject: [PATCH v2 19/22] drm: mxsfb: Turn mxsfb_set_pixel_fmt() into a void function
Date: Sat, 30 May 2020 06:10:12 +0300 [thread overview]
Message-ID: <20200530031015.15492-20-laurent.pinchart@ideasonboard.com> (raw)
In-Reply-To: <20200530031015.15492-1-laurent.pinchart@ideasonboard.com>
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>
Reviewed-by: Stefan Agner <stefan@agner.ch>
---
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);
--
Regards,
Laurent Pinchart
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-30 3:11 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-30 3:09 [PATCH v2 00/22] drm: mxsfb: Add i.MX7 support Laurent Pinchart
2020-05-30 3:09 ` [PATCH v2 01/22] drm: mxsfb: Remove fbdev leftovers Laurent Pinchart
2020-05-30 3:09 ` [PATCH v2 02/22] drm: mxsfb: Use drm_panel_bridge Laurent Pinchart
2020-06-17 15:25 ` Stefan Agner
2020-05-30 3:09 ` [PATCH v2 03/22] drm: mxsfb: Use BIT() macro to define register bitfields Laurent Pinchart
2020-05-30 3:09 ` [PATCH v2 04/22] drm: mxsfb: Remove unused macros from mxsfb_regs.h Laurent Pinchart
2020-05-30 3:09 ` [PATCH v2 05/22] drm: mxsfb: Clarify format and bus width configuration Laurent Pinchart
2020-05-30 3:09 ` [PATCH v2 06/22] drm: mxsfb: Pass mxsfb_drm_private pointer to mxsfb_reset_block() Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 07/22] drm: mxsfb: Use LCDC_CTRL register name explicitly Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 08/22] drm: mxsfb: Remove register definitions from mxsfb_crtc.c Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 09/22] drm: mxsfb: Remove unneeded includes Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 10/22] drm: mxsfb: Rename mxsfb_crtc.c to mxsfb_kms.c Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 11/22] drm: mxsfb: Stop using DRM simple display pipeline helper Laurent Pinchart
2020-06-11 19:33 ` Stefan Agner
2020-06-16 1:50 ` Laurent Pinchart
2020-07-09 10:25 ` Stefan Agner
2020-07-17 2:06 ` Laurent Pinchart
2020-07-26 18:28 ` Laurent Pinchart
2020-07-27 7:57 ` Stefan Agner
2020-05-30 3:10 ` [PATCH v2 12/22] drm: mxsfb: Move vblank event arm to CRTC .atomic_flush() Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 13/22] drm: mxsfb: Don't touch AXI clock in IRQ context Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 14/22] drm: mxsfb: Enable vblank handling Laurent Pinchart
2020-06-11 18:35 ` Stefan Agner
2020-05-30 3:10 ` [PATCH v2 15/22] drm: mxsfb: Remove mxsfb_devdata unused fields Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 16/22] drm: mxsfb: Add i.MX7 and i.MX8M to the list of supported SoCs in Kconfig Laurent Pinchart
2020-06-11 18:37 ` Stefan Agner
2020-05-30 3:10 ` [PATCH v2 17/22] drm: mxsfb: Update internal IP version number for i.MX6SX Laurent Pinchart
2020-05-30 3:10 ` [PATCH v2 18/22] drm: mxsfb: Drop non-OF support Laurent Pinchart
2020-05-30 3:10 ` Laurent Pinchart [this message]
2020-05-30 3:10 ` [PATCH v2 20/22] drm: mxsfb: Merge mxsfb_set_pixel_fmt() and mxsfb_set_bus_fmt() Laurent Pinchart
2020-06-05 14:58 ` Emil Velikov
2020-06-06 23:01 ` Laurent Pinchart
2020-06-15 19:31 ` Emil Velikov
2020-05-30 3:10 ` [PATCH v2 21/22] drm: mxsfb: Remove unnecessary spaces after tab Laurent Pinchart
2020-06-11 19:11 ` Stefan Agner
2020-05-30 3:10 ` [PATCH v2 22/22] drm: mxsfb: Support the alpha plane Laurent Pinchart
2020-05-31 16:54 ` Emil Velikov
2020-06-02 22:42 ` Laurent Pinchart
2020-06-05 14:07 ` Emil Velikov
2020-06-17 16:08 ` Stefan Agner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200530031015.15492-20-laurent.pinchart@ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@pengutronix.de \
--cc=leonard.crestez@nxp.com \
--cc=linux-imx@nxp.com \
--cc=marex@denx.de \
--cc=robert.chiras@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).