[PATCH 6.1 188/303] drm/tegra: fbdev: Remove offset into framebuffer memory

[PATCH 6.1 188/303] drm/tegra: fbdev: Remove offset into framebuffer memory

[Greg Kroah-Hartman]

6.1-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Thomas Zimmermann <tzimmermann@suse.de>

[ Upstream commit a18b6e30ecd69096beda4a0c96d2570900c3879a ]

The screen_buffer field in struct fb_info contains the kernel address
of the first byte of framebuffer memory. Do not add the display offset.
This offset only describes scrolling during scanout.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: de2ba664c30f ("gpu: host1x: drm: Add memory manager and fb")
Cc: dri-devel@lists.freedesktop.org
Cc: linux-tegra@vger.kernel.org
Cc: <stable@vger.kernel.org> # v3.10+
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patch.msgid.link/20260421073646.144712-3-tzimmermann@suse.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/gpu/drm/tegra/fb.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -222,7 +222,6 @@ static int tegra_fbdev_probe(struct drm_
 	struct drm_mode_fb_cmd2 cmd = { 0 };
 	unsigned int bytes_per_pixel;
 	struct drm_framebuffer *fb;
-	unsigned long offset;
 	struct fb_info *info;
 	struct tegra_bo *bo;
 	size_t size;
@@ -268,9 +267,6 @@ static int tegra_fbdev_probe(struct drm_
 
 	drm_fb_helper_fill_info(info, helper, sizes);
 
-	offset = info->var.xoffset * bytes_per_pixel +
-		 info->var.yoffset * fb->pitches[0];
-
 	if (bo->pages) {
 		bo->vaddr = vmap(bo->pages, bo->num_pages, VM_MAP,
 				 pgprot_writecombine(PAGE_KERNEL));
@@ -282,9 +278,9 @@ static int tegra_fbdev_probe(struct drm_
 	}
 
 	drm->mode_config.fb_base = (resource_size_t)bo->iova;
-	info->screen_base = (void __iomem *)bo->vaddr + offset;
+	info->screen_base = (void __iomem *)bo->vaddr;
 	info->screen_size = size;
-	info->fix.smem_start = (unsigned long)(bo->iova + offset);
+	info->fix.smem_start = (unsigned long)(bo->iova);
 	info->fix.smem_len = size;
 
 	return 0;

Re: [PATCH 6.1 000/303] 6.1.184-rc1 review

[Jon Hunter]

On 20/08/2026 19:29, Pavel Machek wrote:
> Hi!
> 
>> This is the start of the stable review cycle for the 6.1.184 release.
>> There are 303 patches in this series, all will be posted as a response
>> to this one.  If anyone has any issues with these being applied, please
>> let me know.
> 
> We see failure here, too:
> 
> drivers/mmc/host/atmel-mci.c: In function 'atmci_remove':
> 4522
> 15:52:00
> drivers/mmc/host/atmel-mci.c:2631:31: error: 'struct atmel_mci' has no member named 'bh_work'
> 4523
> 15:52:00
>   2631 |         cancel_work_sync(&host->bh_work);
> 4524
> 15:52:00
>        |                               ^~
> 4525
> 15:52:00
> make[4]: *** [scripts/Makefile.build:250: drivers/mmc/host/atmel-mci.o] Error 1
> 4526
> 15:52:00
> make[4]: *** Waiting for unfinished jobs....
> 
> ..looks same as 5.15 problem.
> 
> https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/2776654125

I am seeing the same failure as well for v5.10, v5.15 and v6.1 FWIW.

Jon

-- 
nvpublic

Re: [PATCH 6.1 000/303] 6.1.184-rc1 review

[Greg Kroah-Hartman]

On Fri, Aug 21, 2026 at 12:36:22AM +0100, Jon Hunter wrote:
> 
> 
> On 20/08/2026 19:29, Pavel Machek wrote:
> > Hi!
> > 
> > > This is the start of the stable review cycle for the 6.1.184 release.
> > > There are 303 patches in this series, all will be posted as a response
> > > to this one.  If anyone has any issues with these being applied, please
> > > let me know.
> > 
> > We see failure here, too:
> > 
> > drivers/mmc/host/atmel-mci.c: In function 'atmci_remove':
> > 4522
> > 15:52:00
> > drivers/mmc/host/atmel-mci.c:2631:31: error: 'struct atmel_mci' has no member named 'bh_work'
> > 4523
> > 15:52:00
> >   2631 |         cancel_work_sync(&host->bh_work);
> > 4524
> > 15:52:00
> >        |                               ^~
> > 4525
> > 15:52:00
> > make[4]: *** [scripts/Makefile.build:250: drivers/mmc/host/atmel-mci.o] Error 1
> > 4526
> > 15:52:00
> > make[4]: *** Waiting for unfinished jobs....
> > 
> > ..looks same as 5.15 problem.
> > 
> > https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/pipelines/2776654125
> 
> I am seeing the same failure as well for v5.10, v5.15 and v6.1 FWIW.

Now fixed for all of these, AND for 6.6, thanks.

greg k-h