From: Ryan Walklin <ryan@testtoast.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Andre Przywara <andre.przywara@arm.com>,
Chris Morgan <macroalpha82@gmail.com>,
John Watts <contact@jookia.org>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, devicetree@vger.kernel.org,
linux-clk@vger.kernel.org, Ryan Walklin <ryan@testtoast.com>
Subject: [PATCH v4 17/26] drm: sun4i: de2/de3: use generic register reference function for layer configuration
Date: Sat, 21 Sep 2024 21:46:06 +1200 [thread overview]
Message-ID: <20240921095153.213568-18-ryan@testtoast.com> (raw)
In-Reply-To: <20240921095153.213568-1-ryan@testtoast.com>
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Use the new blender register lookup function where required in the layer
commit and update code.
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
--
Changelog v2..v3:
- Refactor for 6.11 layer init/modesetting changes
---
drivers/gpu/drm/sun4i/sun8i_mixer.c | 5 +++--
drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 7 +++++--
drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index 8871ca2858c80..23561f122a2b6 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -277,6 +277,7 @@ static void sun8i_mixer_commit(struct sunxi_engine *engine,
{
struct sun8i_mixer *mixer = engine_to_sun8i_mixer(engine);
u32 bld_base = sun8i_blender_base(mixer);
+ struct regmap *bld_regs = sun8i_blender_regmap(mixer);
struct drm_plane_state *plane_state;
struct drm_plane *plane;
u32 route = 0, pipe_en = 0;
@@ -316,8 +317,8 @@ static void sun8i_mixer_commit(struct sunxi_engine *engine,
pipe_en |= SUN8I_MIXER_BLEND_PIPE_CTL_EN(zpos);
}
- regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ROUTE(bld_base), route);
- regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_PIPE_CTL(bld_base),
+ regmap_write(bld_regs, SUN8I_MIXER_BLEND_ROUTE(bld_base), route);
+ regmap_write(bld_regs, SUN8I_MIXER_BLEND_PIPE_CTL(bld_base),
pipe_en | SUN8I_MIXER_BLEND_PIPE_CTL_FC_EN(0));
regmap_write(engine->regs, SUN8I_MIXER_GLOBAL_DBUFF,
diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
index cb9b694fef101..7f1231cf0f012 100644
--- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c
@@ -24,6 +24,7 @@
#include "sun8i_mixer.h"
#include "sun8i_ui_layer.h"
#include "sun8i_ui_scaler.h"
+#include "sun8i_vi_scaler.h"
static void sun8i_ui_layer_update_alpha(struct sun8i_mixer *mixer, int channel,
int overlay, struct drm_plane *plane)
@@ -52,6 +53,7 @@ static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
{
struct drm_plane_state *state = plane->state;
u32 src_w, src_h, dst_w, dst_h;
+ struct regmap *bld_regs;
u32 bld_base, ch_base;
u32 outsize, insize;
u32 hphase, vphase;
@@ -60,6 +62,7 @@ static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
channel, overlay);
bld_base = sun8i_blender_base(mixer);
+ bld_regs = sun8i_blender_regmap(mixer);
ch_base = sun8i_channel_base(mixer, channel);
src_w = drm_rect_width(&state->src) >> 16;
@@ -104,10 +107,10 @@ static int sun8i_ui_layer_update_coord(struct sun8i_mixer *mixer, int channel,
DRM_DEBUG_DRIVER("Layer destination coordinates X: %d Y: %d\n",
state->dst.x1, state->dst.y1);
DRM_DEBUG_DRIVER("Layer destination size W: %d H: %d\n", dst_w, dst_h);
- regmap_write(mixer->engine.regs,
+ regmap_write(bld_regs,
SUN8I_MIXER_BLEND_ATTR_COORD(bld_base, zpos),
SUN8I_MIXER_COORD(state->dst.x1, state->dst.y1));
- regmap_write(mixer->engine.regs,
+ regmap_write(bld_regs,
SUN8I_MIXER_BLEND_ATTR_INSIZE(bld_base, zpos),
outsize);
diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
index e348fd0a3d81c..d19349eecc9de 100644
--- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c
@@ -55,6 +55,7 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
struct drm_plane_state *state = plane->state;
const struct drm_format_info *format = state->fb->format;
u32 src_w, src_h, dst_w, dst_h;
+ struct regmap *bld_regs;
u32 bld_base, ch_base;
u32 outsize, insize;
u32 hphase, vphase;
@@ -66,6 +67,7 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
channel, overlay);
bld_base = sun8i_blender_base(mixer);
+ bld_regs = sun8i_blender_regmap(mixer);
ch_base = sun8i_channel_base(mixer, channel);
src_w = drm_rect_width(&state->src) >> 16;
@@ -182,10 +184,10 @@ static int sun8i_vi_layer_update_coord(struct sun8i_mixer *mixer, int channel,
DRM_DEBUG_DRIVER("Layer destination coordinates X: %d Y: %d\n",
state->dst.x1, state->dst.y1);
DRM_DEBUG_DRIVER("Layer destination size W: %d H: %d\n", dst_w, dst_h);
- regmap_write(mixer->engine.regs,
+ regmap_write(bld_regs,
SUN8I_MIXER_BLEND_ATTR_COORD(bld_base, zpos),
SUN8I_MIXER_COORD(state->dst.x1, state->dst.y1));
- regmap_write(mixer->engine.regs,
+ regmap_write(bld_regs,
SUN8I_MIXER_BLEND_ATTR_INSIZE(bld_base, zpos),
outsize);
--
2.46.1
next prev parent reply other threads:[~2024-09-21 9:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 9:45 [PATCH v4 00/26] drm: sun4i: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 01/26] drm: sun4i: de2/de3: Change CSC argument Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 02/26] drm: sun4i: de2/de3: Merge CSC functions into one Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 03/26] drm: sun4i: de2/de3: call csc setup also for UI layer Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 04/26] drm: sun4i: de2: Initialize layer fields earlier Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 05/26] drm: sun4i: de3: Add YUV formatter module Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 06/26] drm: sun4i: de3: add format enumeration function to engine Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 07/26] drm: sun4i: de3: add formatter flag to mixer config Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 08/26] drm: sun4i: de3: add YUV support to the DE3 mixer Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 09/26] drm: sun4i: de3: pass engine reference to ccsc setup function Ryan Walklin
2024-09-21 9:45 ` [PATCH v4 10/26] drm: sun4i: de3: add YUV support to the color space correction module Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 11/26] drm: sun4i: de3: add YUV support to the TCON Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 12/26] drm: sun4i: support YUV formats in VI scaler Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 13/26] drm: sun4i: de2/de3: add mixer version enum Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 14/26] drm: sun4i: de2/de3: refactor mixer initialisation Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 15/26] drm: sun4i: vi_scaler refactor vi_scaler enablement Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 16/26] drm: sun4i: de2/de3: add generic blender register reference function Ryan Walklin
2024-09-21 9:46 ` Ryan Walklin [this message]
2024-09-21 9:46 ` [PATCH v4 18/26] drm: sun4i: de3: Implement AFBC support Ryan Walklin
2024-09-25 8:23 ` Dan Carpenter
2024-09-21 9:46 ` [PATCH v4 19/26] dt-bindings: allwinner: add H616 DE33 bus binding Ryan Walklin
2024-09-22 20:52 ` Krzysztof Kozlowski
2024-09-21 9:46 ` [PATCH v4 20/26] dt-bindings: allwinner: add H616 DE33 clock binding Ryan Walklin
2024-09-22 20:52 ` Krzysztof Kozlowski
2024-09-21 9:46 ` [PATCH v4 21/26] dt-bindings: allwinner: add H616 DE33 mixer binding Ryan Walklin
2024-09-22 20:52 ` Krzysztof Kozlowski
2024-09-29 8:52 ` Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 22/26] clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 23/26] drm: sun4i: de33: mixer: " Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 24/26] drm: sun4i: de33: vi_scaler: " Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 25/26] drm: sun4i: de33: fmt: " Ryan Walklin
2024-09-21 9:46 ` [PATCH v4 26/26] drm: sun4i: de33: csc: " Ryan Walklin
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=20240921095153.213568-18-ryan@testtoast.com \
--to=ryan@testtoast.com \
--cc=airlied@gmail.com \
--cc=andre.przywara@arm.com \
--cc=conor+dt@kernel.org \
--cc=contact@jookia.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=macroalpha82@gmail.com \
--cc=mripard@kernel.org \
--cc=mturquette@baylibre.com \
--cc=robh@kernel.org \
--cc=samuel@sholland.org \
--cc=sboyd@kernel.org \
--cc=tzimmermann@suse.de \
--cc=wens@csie.org \
/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).