From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f12.google.com (mail-pz2-f12.google.com [74.125.228.12]) (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 1C9A950C2BB for ; Tue, 8 Sep 2026 09:08:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858485; cv=none; b=nQ+sCS3qRZ2OS91bHNlv1WaD3J32R33alyVwkm+Siadj1b39ZBu9plIlxdWhERQ9AcM51bt/+r5sIqR0TlZ0A9VZuivz/lLCDDUCYFvLrPyIJYjmgLRv8dXRuL6P4GHaEd/tj5kxu7QwJJqx910dYHKPtw7eJ5qX7ElcEDwaB8A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788858485; c=relaxed/simple; bh=w0FP0wBCIa+/EHsZH1IzuHconhrkS9VP6UooovR5/Jo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u9eka15ixEFIFBN92mwHXkvhU8NoxGlqQ3z1my/NewkrPJMRzZ9sUiyS5eTXD6YWfPym70n5RMMz0paKjgFFUJLNWWYV97VffgBmhvubTMvYpMBxaBIELsjpsiqyKWUeJgKEmDgekDIfSKg4x07+fjSJDZ6Me5vUi8Fn+MJHgRc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=fSTLCwo9; arc=none smtp.client-ip=74.125.228.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fSTLCwo9" Received: by mail-pz2-f12.google.com with SMTP id 41be03b00d2f7-cc1ceb47d53so192089a12.0 for ; Tue, 08 Sep 2026 02:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1788858483; x=1789463283; 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:content-type; bh=2nbiAaHsEOkyMIOSUPLzzSXJU25j/HCglaTjq/uSdS0=; b=fSTLCwo9UlzWgwAlMqzzgV5X0WBJS+cYSP1bhB0f4FASEQmrPBaNzjqhfnsjfCPhXs Dq4QuTbyisJVdciUDAqPHAq+HA48WrgF3s99pQDcGzAgo+5cDwdEfwS3/izeG/I5zTx3 suMQ/jBrFH81/gHPGoiekUeYVFNZNtQB/kB14= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788858483; x=1789463283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=2nbiAaHsEOkyMIOSUPLzzSXJU25j/HCglaTjq/uSdS0=; b=S6iBfB8D+4pI/zkJWs/HC/KustPSZmvGgLPmj4JYafZmXyK0/KPYN+UKR3SGvlTm/0 qOR/LcZ44wQOfVhXzEx6aAdzwZgxf1IJDbTWk6nvbckV7DNUBvTPu23AlzFfmu6OGxLl rTL1dwbyWwise7gG9PTXTmSiNy4wWqzyqdIG3FwjqTQK0doGdqhoNlEKjsczYjBOhiP+ 5HFDAl6ggt6ujLD55Dt8SaCZ5n3vD/noG9tHKC02rGK7NgpXqOZYMl2lhcCDKf+tPbRv 8oUHirFGSk3GwrLh1NkVNywsr+b+OyMJP3dxxzOI8W7EmdVMRRGDk3PEAQmpx3EB9Bko /TMg== X-Forwarded-Encrypted: i=1; AKwUvBxG0M1iTp7ipoBhBudU45Udz8OrUUZaYFUFQvHjXFzUQc2AEddbWFd8d4XQQjOn0PcMBggn97TRJy9aLw4=@vger.kernel.org X-Gm-Message-State: AFuF++kWJkVg8s1BsuxdRj1F4pG+fElT8TbzrNlvTvsDFSfCCi34hTxJ JjCcdrkczvv/wgT38nDgz9eQfTLzHDLDDsshJl7Pf6etnbKeefzxWdts4qXPpJ5LzehgS+tYRCh Dxv8= X-Gm-Gg: AYBFou1LHqP7yNNimBlOdjne+drwMH6OVCpOlQi5MAzq8KnsMzAoF8NkZ3Bo+xsfClm K8bsNjaKr0nTTT9M+GnF1S/8tazpRoPsyqqBXCOCknXQzYEp+AuMHThVjvAEx+KqQVRlNU8qaYz rtrUMAIIJLrTZMQmdhZJ4q5YDOF3+DFZZbSdYXlgIauRrbg0FpeePJE/h+Iy7pi5WzFfKjc4/c4 3PearmCBNiAxC7WpUxf1EvPbKr7fkKZtyaZaNgDJi3JT5j88QCdBi8mgvR3WYP8XxMArmu2McVl mhsfynT9Vg75GuwDA17jnOrQgjgpsWTXCbpLgSW6SVrRNyN/R96KX9LKJNt/+B+3H4RWbn4XO6h oYExk4EYd7Jjlw5UNTzIcUCLedV5zBiX/ACWp4i5PF3TX6Tt/jioT6jpm3hg81YV/1pyWS02RLv 3fyfXjTGfPVdE1ct+aj2OlLVMTsufCABhRw4nxtBauhyKUFcgkswbOFL9APAvbohe3qc3VdcoYO OutxM0P0GUIe1Q1Zp4MlCB0GSEIkPgq2yLDIiYAZpmqBMk= X-Received: by 2002:a17:90a:d010:b0:38f:de94:bf34 with SMTP id 98e67ed59e1d1-39b8be7a13dmr4691886a91.10.1788858483369; Tue, 08 Sep 2026 02:08:03 -0700 (PDT) Received: from wenst-7875.tpe.corp.google.com ([2a00:79e0:201d:8:e541:8c2f:4ce9:823a]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39b4b72f62esm19718804a91.5.2026.09.08.02.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 02:08:02 -0700 (PDT) From: Chen-Yu Tsai To: Liu Ying , Laurentiu Palcu , Lucas Stach , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: Chen-Yu Tsai , David Airlie , Simona Vetter , linux-sunxi@lists.linux.dev, imx@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/4] drm/sun4i: layers: Fix VI buffer address for clipped offsets Date: Tue, 8 Sep 2026 17:07:41 +0800 Message-ID: <20260908090745.1089143-3-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.979.g7e5102b832-goog In-Reply-To: <20260908090745.1089143-1-wenst@chromium.org> References: <20260908090745.1089143-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 79ac1c945ab8 ("drm/sun4i: layers: Use drm_fb_dma_get_gem_addr() to get display memory") dropped the code to calculate the framebuffer's DMA address in favor of drm_fb_dma_get_gem_addr(). This turned out to be wrong in a couple ways. The hardware is programmed with clipped dimensions, so it needs the buffer address to start at the clipped boundary. Moving to the helper negated the clipping. Also, when clipping on the left, the buffer address needs to start at the first pixel in the sub-sampling group even for the luma plane. The hardware handles the interpolation internally. Switch to the new drm_fb_dma_get_gem_clipped_addr(), which provides the buffer address starting at the clipped boundary. Calculate the intra-group offset and adjust the luma plane buffer address so that it points to the start of the sub-sampling group. Fixes: 79ac1c945ab8 ("drm/sun4i: layers: Use drm_fb_dma_get_gem_addr() to get display memory") Cc: # v7.1+, needs drm_fb_dma_get_gem_clipped_addr() Signed-off-by: Chen-Yu Tsai --- This is an alternative to Jernej's original revert: https://lore.kernel.org/all/3980ea1aeb3f7fe8b4700e36560deeba3d050664.1785772659.git.jernej.skrabec@gmail.com/ --- drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c index bad102134726..530efae7e13c 100644 --- a/drivers/gpu/drm/sun4i/sun8i_ui_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_ui_layer.c @@ -130,7 +130,7 @@ static void sun8i_ui_layer_update_buffer(struct sun8i_layer *layer, ch_base = sun8i_channel_base(layer); /* Get the start of the displayed memory */ - dma_addr = drm_fb_dma_get_gem_addr(fb, state, 0); + dma_addr = drm_fb_dma_get_gem_clipped_addr(fb, state, 0); /* Set the line width */ DRM_DEBUG_DRIVER("Layer line width: %d bytes\n", fb->pitches[0]); diff --git a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c index 2e9cda45c04e..7a1d5f1db037 100644 --- a/drivers/gpu/drm/sun4i/sun8i_vi_layer.c +++ b/drivers/gpu/drm/sun4i/sun8i_vi_layer.c @@ -205,7 +205,21 @@ static void sun8i_vi_layer_update_buffer(struct sun8i_layer *layer, for (i = 0; i < format->num_planes; i++) { /* Get the start of the displayed memory */ - dma_addr = drm_fb_dma_get_gem_addr(fb, state, i); + dma_addr = drm_fb_dma_get_gem_clipped_addr(fb, state, i); + + /* + * The mixer can handle odd offsets into sub-sampled YUV + * planes, but needs the address of the first pixel in each + * sub-sampled block. Adjust the luma buffer address backwards. + */ + if (i == 0) { + u32 x_diff, y_diff; + + x_diff = (state->src.x1 >> 16) & (format->hsub - 1); + y_diff = (state->src.y1 >> 16) & (format->vsub - 1); + dma_addr -= y_diff * fb->pitches[i]; + dma_addr -= x_diff * format->cpp[i]; + } /* Set the line width */ DRM_DEBUG_DRIVER("Layer %d. line width: %d bytes\n", -- 2.55.0.979.g7e5102b832-goog