diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-06-27 10:22:13 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-06-27 10:22:19 +0300 |
| commit | 5fed0854cfaba39691b13b171335aa66b60d9516 (patch) | |
| tree | cbbfe145249758f3c6aa1aa3c6d5dff686995381 /drivers/gpu/drm/drm_fbdev_dma.c | |
| parent | f2661062f16b2de5d7b6a5c42a9a5c96326b8454 (diff) | |
| parent | 66edf3fb331b6c55439b10f9862987b0916b3726 (diff) | |
| download | linux-5fed0854cfaba39691b13b171335aa66b60d9516.tar.xz | |
Merge tag 'drm-misc-fixes-2024-06-26' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
drm-misc-fixes for v6.10-rc6:
- nouveau tv mode fixes.
- Add KOE TX26D202VM0BWA timings.
- Fix fb_info when vmalloc is used, regression from
CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2e596c1e-9389-43c2-a029-06fe741c44c3@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/drm_fbdev_dma.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fbdev_dma.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c index 6c9427bb4053..13cd754af311 100644 --- a/drivers/gpu/drm/drm_fbdev_dma.c +++ b/drivers/gpu/drm/drm_fbdev_dma.c @@ -130,7 +130,10 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper, info->flags |= FBINFO_READS_FAST; /* signal caching */ info->screen_size = sizes->surface_height * fb->pitches[0]; info->screen_buffer = map.vaddr; - info->fix.smem_start = page_to_phys(virt_to_page(info->screen_buffer)); + if (!(info->flags & FBINFO_HIDE_SMEM_START)) { + if (!drm_WARN_ON(dev, is_vmalloc_addr(info->screen_buffer))) + info->fix.smem_start = page_to_phys(virt_to_page(info->screen_buffer)); + } info->fix.smem_len = info->screen_size; return 0; |