From: Sean Anderson <sean.anderson@linux.dev> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org Cc: Daniel Vetter <daniel@ffwll.ch>, linux-arm-kernel@lists.infradead.org, Michal Simek <michal.simek@amd.com>, linux-kernel@vger.kernel.org, David Airlie <airlied@gmail.com>, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>, Sean Anderson <sean.anderson@linux.dev> Subject: [PATCH v4 01/13] drm: xlnx: Store base pointers in zynqmp_disp directly Date: Tue, 23 Apr 2024 13:18:47 -0400 [thread overview] Message-ID: <20240423171859.3953024-2-sean.anderson@linux.dev> (raw) In-Reply-To: <20240423171859.3953024-1-sean.anderson@linux.dev> The blend, avbuf, and audio members of zynqmp_disp are anonymous structs with only one member each. This is rather pointless, so move the members up a level. Signed-off-by: Sean Anderson <sean.anderson@linux.dev> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- (no changes since v3) Changes in v3: - New drivers/gpu/drm/xlnx/zynqmp_disp.c | 44 +++++++++++++----------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 8a39b3accce5..ca164a750ee9 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -128,24 +128,18 @@ struct zynqmp_disp_layer { * struct zynqmp_disp - Display controller * @dev: Device structure * @dpsub: Display subsystem - * @blend.base: Register I/O base address for the blender - * @avbuf.base: Register I/O base address for the audio/video buffer manager - * @audio.base: Registers I/O base address for the audio mixer + * @blend: Register I/O base address for the blender + * @avbuf: Register I/O base address for the audio/video buffer manager + * @audio: Registers I/O base address for the audio mixer * @layers: Layers (planes) */ struct zynqmp_disp { struct device *dev; struct zynqmp_dpsub *dpsub; - struct { - void __iomem *base; - } blend; - struct { - void __iomem *base; - } avbuf; - struct { - void __iomem *base; - } audio; + void __iomem *blend; + void __iomem *avbuf; + void __iomem *audio; struct zynqmp_disp_layer layers[ZYNQMP_DPSUB_NUM_LAYERS]; }; @@ -356,12 +350,12 @@ static const struct zynqmp_disp_format avbuf_gfx_fmts[] = { static u32 zynqmp_disp_avbuf_read(struct zynqmp_disp *disp, int reg) { - return readl(disp->avbuf.base + reg); + return readl(disp->avbuf + reg); } static void zynqmp_disp_avbuf_write(struct zynqmp_disp *disp, int reg, u32 val) { - writel(val, disp->avbuf.base + reg); + writel(val, disp->avbuf + reg); } static bool zynqmp_disp_layer_is_video(const struct zynqmp_disp_layer *layer) @@ -587,7 +581,7 @@ static void zynqmp_disp_avbuf_disable(struct zynqmp_disp *disp) static void zynqmp_disp_blend_write(struct zynqmp_disp *disp, int reg, u32 val) { - writel(val, disp->blend.base + reg); + writel(val, disp->blend + reg); } /* @@ -813,7 +807,7 @@ static void zynqmp_disp_blend_layer_disable(struct zynqmp_disp *disp, static void zynqmp_disp_audio_write(struct zynqmp_disp *disp, int reg, u32 val) { - writel(val, disp->audio.base + reg); + writel(val, disp->audio + reg); } /** @@ -1237,21 +1231,21 @@ int zynqmp_disp_probe(struct zynqmp_dpsub *dpsub) disp->dev = &pdev->dev; disp->dpsub = dpsub; - disp->blend.base = devm_platform_ioremap_resource_byname(pdev, "blend"); - if (IS_ERR(disp->blend.base)) { - ret = PTR_ERR(disp->blend.base); + disp->blend = devm_platform_ioremap_resource_byname(pdev, "blend"); + if (IS_ERR(disp->blend)) { + ret = PTR_ERR(disp->blend); goto error; } - disp->avbuf.base = devm_platform_ioremap_resource_byname(pdev, "av_buf"); - if (IS_ERR(disp->avbuf.base)) { - ret = PTR_ERR(disp->avbuf.base); + disp->avbuf = devm_platform_ioremap_resource_byname(pdev, "av_buf"); + if (IS_ERR(disp->avbuf)) { + ret = PTR_ERR(disp->avbuf); goto error; } - disp->audio.base = devm_platform_ioremap_resource_byname(pdev, "aud"); - if (IS_ERR(disp->audio.base)) { - ret = PTR_ERR(disp->audio.base); + disp->audio = devm_platform_ioremap_resource_byname(pdev, "aud"); + if (IS_ERR(disp->audio)) { + ret = PTR_ERR(disp->audio); goto error; } -- 2.35.1.1320.gc452695387.dirty
WARNING: multiple messages have this Message-ID (diff)
From: Sean Anderson <sean.anderson@linux.dev> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, dri-devel@lists.freedesktop.org Cc: Daniel Vetter <daniel@ffwll.ch>, linux-arm-kernel@lists.infradead.org, Michal Simek <michal.simek@amd.com>, linux-kernel@vger.kernel.org, David Airlie <airlied@gmail.com>, Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>, Sean Anderson <sean.anderson@linux.dev> Subject: [PATCH v4 01/13] drm: xlnx: Store base pointers in zynqmp_disp directly Date: Tue, 23 Apr 2024 13:18:47 -0400 [thread overview] Message-ID: <20240423171859.3953024-2-sean.anderson@linux.dev> (raw) In-Reply-To: <20240423171859.3953024-1-sean.anderson@linux.dev> The blend, avbuf, and audio members of zynqmp_disp are anonymous structs with only one member each. This is rather pointless, so move the members up a level. Signed-off-by: Sean Anderson <sean.anderson@linux.dev> Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- (no changes since v3) Changes in v3: - New drivers/gpu/drm/xlnx/zynqmp_disp.c | 44 +++++++++++++----------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 8a39b3accce5..ca164a750ee9 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -128,24 +128,18 @@ struct zynqmp_disp_layer { * struct zynqmp_disp - Display controller * @dev: Device structure * @dpsub: Display subsystem - * @blend.base: Register I/O base address for the blender - * @avbuf.base: Register I/O base address for the audio/video buffer manager - * @audio.base: Registers I/O base address for the audio mixer + * @blend: Register I/O base address for the blender + * @avbuf: Register I/O base address for the audio/video buffer manager + * @audio: Registers I/O base address for the audio mixer * @layers: Layers (planes) */ struct zynqmp_disp { struct device *dev; struct zynqmp_dpsub *dpsub; - struct { - void __iomem *base; - } blend; - struct { - void __iomem *base; - } avbuf; - struct { - void __iomem *base; - } audio; + void __iomem *blend; + void __iomem *avbuf; + void __iomem *audio; struct zynqmp_disp_layer layers[ZYNQMP_DPSUB_NUM_LAYERS]; }; @@ -356,12 +350,12 @@ static const struct zynqmp_disp_format avbuf_gfx_fmts[] = { static u32 zynqmp_disp_avbuf_read(struct zynqmp_disp *disp, int reg) { - return readl(disp->avbuf.base + reg); + return readl(disp->avbuf + reg); } static void zynqmp_disp_avbuf_write(struct zynqmp_disp *disp, int reg, u32 val) { - writel(val, disp->avbuf.base + reg); + writel(val, disp->avbuf + reg); } static bool zynqmp_disp_layer_is_video(const struct zynqmp_disp_layer *layer) @@ -587,7 +581,7 @@ static void zynqmp_disp_avbuf_disable(struct zynqmp_disp *disp) static void zynqmp_disp_blend_write(struct zynqmp_disp *disp, int reg, u32 val) { - writel(val, disp->blend.base + reg); + writel(val, disp->blend + reg); } /* @@ -813,7 +807,7 @@ static void zynqmp_disp_blend_layer_disable(struct zynqmp_disp *disp, static void zynqmp_disp_audio_write(struct zynqmp_disp *disp, int reg, u32 val) { - writel(val, disp->audio.base + reg); + writel(val, disp->audio + reg); } /** @@ -1237,21 +1231,21 @@ int zynqmp_disp_probe(struct zynqmp_dpsub *dpsub) disp->dev = &pdev->dev; disp->dpsub = dpsub; - disp->blend.base = devm_platform_ioremap_resource_byname(pdev, "blend"); - if (IS_ERR(disp->blend.base)) { - ret = PTR_ERR(disp->blend.base); + disp->blend = devm_platform_ioremap_resource_byname(pdev, "blend"); + if (IS_ERR(disp->blend)) { + ret = PTR_ERR(disp->blend); goto error; } - disp->avbuf.base = devm_platform_ioremap_resource_byname(pdev, "av_buf"); - if (IS_ERR(disp->avbuf.base)) { - ret = PTR_ERR(disp->avbuf.base); + disp->avbuf = devm_platform_ioremap_resource_byname(pdev, "av_buf"); + if (IS_ERR(disp->avbuf)) { + ret = PTR_ERR(disp->avbuf); goto error; } - disp->audio.base = devm_platform_ioremap_resource_byname(pdev, "aud"); - if (IS_ERR(disp->audio.base)) { - ret = PTR_ERR(disp->audio.base); + disp->audio = devm_platform_ioremap_resource_byname(pdev, "aud"); + if (IS_ERR(disp->audio)) { + ret = PTR_ERR(disp->audio); goto error; } -- 2.35.1.1320.gc452695387.dirty _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2024-04-23 17:19 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-23 17:18 [PATCH v4 00/13] drm: zynqmp_dp: IRQ cleanups and debugfs support Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` Sean Anderson [this message] 2024-04-23 17:18 ` [PATCH v4 01/13] drm: xlnx: Store base pointers in zynqmp_disp directly Sean Anderson 2024-04-23 17:18 ` [PATCH v4 02/13] drm: xlnx: Fix kerneldoc Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 03/13] drm: zynqmp_dp: Downgrade log level for aux retries message Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 04/13] drm: zynqmp_dp: Adjust training values per-lane Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 05/13] drm: zynqmp_dp: Rearrange zynqmp_dp for better padding Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 06/13] drm: zynqmp_dp: Don't delay work Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 07/13] drm: zynqmp_dp: Add locking Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 08/13] drm: zynqmp_dp: Don't retrain the link in our IRQ Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 09/13] drm: zynqmp_dp: Convert to a hard IRQ Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 10/13] drm: zynqmp_dp: Use AUX IRQs instead of polling Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-24 12:30 ` Tomi Valkeinen 2024-04-24 12:30 ` Tomi Valkeinen 2024-04-23 17:18 ` [PATCH v4 11/13] drm: zynqmp_dp: Split off several helper functions Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 12/13] drm: zynqmp_dp: Take dp->lock in zynqmp_dp_hpd_work_func Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-23 17:18 ` [PATCH v4 13/13] drm: zynqmp_dp: Add debugfs interface for compliance testing Sean Anderson 2024-04-23 17:18 ` Sean Anderson 2024-04-24 18:54 ` [PATCH v4 00/13] drm: zynqmp_dp: IRQ cleanups and debugfs support Tomi Valkeinen 2024-04-24 18:54 ` Tomi Valkeinen 2024-04-25 15:17 ` Sean Anderson 2024-04-25 15:17 ` Sean Anderson 2024-04-27 7:45 ` Tomi Valkeinen 2024-04-27 7:45 ` Tomi Valkeinen
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=20240423171859.3953024-2-sean.anderson@linux.dev \ --to=sean.anderson@linux.dev \ --cc=airlied@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=michal.simek@amd.com \ --cc=mripard@kernel.org \ --cc=tomi.valkeinen@ideasonboard.com \ --cc=tzimmermann@suse.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.