From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36B9528EA65 for ; Wed, 7 May 2025 20:22:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746649354; cv=none; b=tWSNdrhoLrYdhB+TwqJMrP8i1ML0Is1nypMD4KyQlDgxvPAiZjA5vMTLCr93ICSf9uNXwk4TnOEagRYhq7a22RnUjJGHMKPFFAmUFa5+qHTCD9ai69gN5pNFA/7B+hb16MUnXebQ3GVz7Boikbb157bn1K3O4es6J0Yb7onp45E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746649354; c=relaxed/simple; bh=BlmSnoOY3tKTiO4SXZtvva25RFRLmIX7O7FRNzv3BXE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GQG/Oj0Dreb7COgDLjbx1070Ow0Q50sVbBiHoKPfdi87gbGi+saxwkPoxkVzJOnCEBsiDVecyqRhcAIweH90rh6POWaQNhSCMO+FUAYFZWXPyrak9G966j5XBBAZas8e6ZGWMGUiA2P2lJggFaajmDn5Y99sWm+tDqa6+vNNTKE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Onmv55qk; arc=none smtp.client-ip=209.85.210.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Onmv55qk" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-72c40235c34so74511a34.3 for ; Wed, 07 May 2025 13:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746649352; x=1747254152; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XsqJzhzjIRfRwRwW5KEnr0pgS3P/C94H76I0ToCRaW4=; b=Onmv55qk3Oj+EbMuNHodVOFpEtsYhbGU2b03CLE6GX6cSfaI7o1fH1jr79Y9p6O+aa 0g9uOWGEwd3dEiC3jrQ7URsnV/XDIGQ5k2kYIDsgmjLnyzD0fzZ9AyQkpTwkryV5Xq2l IP/4OIpn7FBUlUqG/eGwZyBWWfbSDT0+YnI474TC+J+o707qQlQHgXEhIr+wolmB9zA0 3NrqsJaMuW4UDGg0SMPd+8zmQ0FQecd7RmRqIlxMCxBBBwNt9/bc0TnY81+IMzOlE0Ho SALnUoYN5d/e0II4kctXU6EjDpNrjGBsSB70dzUx+J9LpaShDIzy+sJ22d70iXH9Vsgs ANdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746649352; x=1747254152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XsqJzhzjIRfRwRwW5KEnr0pgS3P/C94H76I0ToCRaW4=; b=cuSdh9Pwq0NdSzBpxk7WXcgDii4/JmCxA5xeG9Sk/ZD5QiiCCentNT+GEpTyOFct02 wylUpPKpzG8gfhCeRub9+xyLhD87aCd1+ng3hdrC9woQhpZGJRzeY4GNN0Quel0oAosT 4hyQE7n9MrbtDoORF3F11rIJwh//XUdnmzj4VvxkgMiZydbpgia7Uw3yygd2JHztVj8u txqn9MPSUgSQVEgA0TW0GW0wcX55y4QL9RgHKDJLbYAJTc8rT3TTj+8AZU1TM/Ltiv6b vkoDbZlB0AX/PAZ298UIotChcA/Y86pBbiLn7N1z4Lqsz/qB2av1PBmpb2vL3tWVsSAr Rofg== X-Gm-Message-State: AOJu0YzTZIyD+PJuVb2VoCtX7xhAP5vYMtYKFvzXRi/DdKSmzggzQIMj YJBGGTnsevUwGlPB2c0/83TnPpYlA36aZUnNQ7tNyoyCclfKnE5u X-Gm-Gg: ASbGncuNh3jStY0uC3LAGt9nvbYQkfIRfOpmtMwSW7TLmoqN1tEgMGtwXvL6DT4CDtq aRH1VtUNiYliHFcLIOgzzbiNjrf/Bl43Wccsq8f4ZAE2IYiWeNkmN7nwIdjfMWwk8CRHixbKF38 JGew8GwYoRCFu6NqrAByQl63sVkP6UgJgRtZIj2DUZ4BBSo81GFKofc1ZAWG8ocCmHMGmqMz6Xq Q1pvsuEBjIj6pj/4JMYy7+T+mNgErisvY0x4cTvn5pBBfPE5xF1iRxoQXg5KhhOcUvkoq6P7UsZ hVuLkzm37Z0EW20iA7vMArWqs+cHo/RRdJ955SHnt7/sDDqxc7ml7nyQhnZY X-Google-Smtp-Source: AGHT+IH0b4pWiXsfnl+3ontb+86FWlxJwlvMz27qu3StKobB4XT4I8UbfNQlyyevzUiCEMXzW1/HAw== X-Received: by 2002:a05:6830:d09:b0:72b:9d5e:941c with SMTP id 46e09a7af769-73210aab7f5mr3018363a34.13.1746649352147; Wed, 07 May 2025 13:22:32 -0700 (PDT) Received: from localhost.localdomain ([2600:1700:fb0:1bcf:e46c:46ba:cecd:a52c]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-732109df2dcsm725945a34.9.2025.05.07.13.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 13:22:31 -0700 (PDT) From: Chris Morgan To: linux-sunxi@lists.linux.dev Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, ryan@testtoast.com, macromorgan@hotmail.com, p.zabel@pengutronix.de, tzimmermann@suse.de, maarten.lankhorst@linux.intel.com, simona@ffwll.ch, airlied@gmail.com, mripard@kernel.org, samuel@sholland.org, jernej.skrabec@gmail.com, wens@csie.org, conor+dt@kernel.org, krzk+dt@kernel.org, robh@kernel.org Subject: [PATCH V9 06/24] drm: sun4i: de2/de3: use generic register reference function for layer configuration Date: Wed, 7 May 2025 15:19:25 -0500 Message-ID: <20250507201943.330111-7-macroalpha82@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250507201943.330111-1-macroalpha82@gmail.com> References: <20250507201943.330111-1-macroalpha82@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chris Morgan Use the new blender register lookup function where required in the layer commit and update code. Signed-off-by: Jernej Skrabec Signed-off-by: Ryan Walklin Signed-off-by: Chris Morgan --- 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 41815b42d6d2..cc4da11e2c10 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -274,6 +274,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; @@ -313,8 +314,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 b90e5edef4e8..7a21d32ff1e4 100644 --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c @@ -23,6 +23,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) @@ -51,6 +52,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; @@ -59,6 +61,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; @@ -103,10 +106,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 a7a3a75ffd63..3d81d23d0195 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; @@ -183,10 +185,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.43.0