From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f27.google.com (mail-pz2-f27.google.com [74.125.228.27]) (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 EA68A23A99F for ; Wed, 16 Sep 2026 03:33:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.27 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789529631; cv=none; b=I3fMbiTQFS6bgGt4mB/tNLOU97HcUbLNH1716y9d2zNrHIyMjIgi3vn8fbXPf3aaaYkWN/Q02iscu7BeepfKpuLcJDQefp4BQK6ubfK0bMDiXggkfXwYxcOfbM9xezXohvBbwwfMvSO48LyNjaNcjSSrxTCJEaL1afXWhwCN/gw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789529631; c=relaxed/simple; bh=TbBricvTVGAwifGX896eoMTqhERlhv8wQE0G/lmRl+8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Movlv/CWctsaAwsZtMraZtIm+D+BmvwbxOcFEGeeqZXrtFacoOlGUkvyJq6vQ2xyLFI5D0TBiqTNX+ZjNUrgQccbcE/DJ/r9KqG/MOv8+N4zO3kCVTRjbbgTlPdAKJZv8Peg2qrt78sWYgXflg9M0NXXzySpeaxCSr4Y46WxPzk= 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=MKcbk4LR; arc=none smtp.client-ip=74.125.228.27 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="MKcbk4LR" Received: by mail-pz2-f27.google.com with SMTP id 41be03b00d2f7-cc1cea50dc3so371850a12.3 for ; Tue, 15 Sep 2026 20:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1789529629; x=1790134429; 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=B3+7MkmB6aG1HjinH/gRhRGDcVk6ogklV5sjoZ/OmL4=; b=MKcbk4LRq1vLBbvN8HsdYuQBofInYAVcQxlAr9t+UoSM7BsFxmSQZRlDYZmOXEb/pU B0vpe8DQjXWaIF3cV4wnif9EnDuGKrIVKbbgMA8OnKGoWs8ezBbZdsjX+aU/YOjcgNqu Rhexf9E5qY3q+VSD7QkVmGfzG01ZbP06FeVGU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789529629; x=1790134429; 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=B3+7MkmB6aG1HjinH/gRhRGDcVk6ogklV5sjoZ/OmL4=; b=QlKV6Lkkw/Fd+s4d5na8mNP3q8BXJbKY8f2nkNNsLovkxHbAQaCHCrQ84YVmyAFal6 qmks4FxKbe1RUSaTl2yj5NK6/Rj43KgwOYbmQFFx6hGolHETeVWfd3dfKZarzvDeLjIn QiEVHWycjo3BsU7brtwzHA8ytxI+gVnsO3BNDQxPcBhkuxA2YqBdebipubFTnEftZXSe ywS0v6Agknfh3kYYZMBHBxC6JhaJUXPrFvP1vwlXBPK3u8fSUtMNyHf8p82ETKO0DwY7 IW/2DGNlQYY+SgElWvM8KV9jRGUO6q2ANCbk0ArLCJwtt/OQI6f38BAQnV2EqyFTY5Qo xGgw== X-Forwarded-Encrypted: i=1; AKwUvBxl+S0WR2y+QSifeb7390UiFHg+DmMGU5JHn6vQ2d05U+CWRTT8f52r05acOJhVnqO/pRc2mY78yRBO6Vc=@vger.kernel.org X-Gm-Message-State: AFuF++mvbb0F2nZqVHqJ/r1RZ4rqX1NB8QULM8qvGGFlJWcmBFOcrVzj ARNvZKp0kjyr1b34bbLtIo6S6eQkd8p2teKZC4Vo3RPllgMZap7+dtpyZ9cyS/G+IQ== X-Gm-Gg: AYBFou2ZwkGHvQ/9sdo3h1Abj6wiuXUYNP3TkFWyAR5DGKx58Mh4Pu60YKQPrPFlN/O ZyKsWKSL8F6N/c8UAshVP+wyEOFtO/maiDvcHYTX04cyHmPmiEdWehzJjVo6nscwi2wlwUMHThw zxUYs+gGEvAJYuv64qMWpFLO6zUYBANWgrWrmpwpwP/EHXp3It3camR7TOfwWF8THrT6LZ9PfCr OXFjHknVCKOjdL0yZkqRyTpBF2KNYVoidMCMzqLZTt8HQEGwBuH+yplm7nVGVq1CD2MjMN3zfUv pxgwARw2JnsMw31rYfYbECQ6MvdHPJeIPDCBPvpZ7Q6aJX3hPBW5WK3/ZIFs3EADglMkm7cNcua ZpB1CLUBp2DYulH+UtDh9z0rfXq2YhvpyJvKPxtJ1cJ5jSAdhmm/DQQEI7yrMqBvNf8U9EKVfW3 5EE9alv+Eiv5pegrwp6LTBFE8LLXbBzTZg/w6QtXVefV1ugwgXKpjvwWM1m0Fwhv6RGUvUUrx2S eVapJSZlhNWBEy2KkHMZnp0uwahnt/fKqDmPZQWdWlOrj0KwnJhiSgvjw== X-Received: by 2002:a17:90b:3b41:b0:38c:a59b:5189 with SMTP id 98e67ed59e1d1-39e1e48a416mr2215669a91.15.1789529629173; Tue, 15 Sep 2026 20:33:49 -0700 (PDT) Received: from wenst-7875.tpe.corp.google.com ([2a00:79e0:203d:7:1f62:7622:5d61:2578]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39e1bbe3e62sm1833477a91.10.2026.09.15.20.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 20:33:48 -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 RFT v2 3/5] drm/sun4i: layers: Fix VI buffer address for clipped offsets Date: Wed, 16 Sep 2026 11:33:24 +0800 Message-ID: <20260916033327.3054126-4-wenst@chromium.org> X-Mailer: git-send-email 2.55.0.1032.g73a4cd73de-goog In-Reply-To: <20260916033327.3054126-1-wenst@chromium.org> References: <20260916033327.3054126-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.1032.g73a4cd73de-goog