diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-02-17 09:23:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-02-17 09:24:05 +1000 |
| commit | a2a04b515562bbb040e8ae3decae8c1e9ef05327 (patch) | |
| tree | 41bb9758c0cbb38ab830cb45c4dd9156db0599a1 /drivers/gpu/drm/ast/ast_mode.c | |
| parent | caa068c9bb2bc86e6da2caf8508f3fda24d4dea0 (diff) | |
| parent | a950b989ea29ab3b38ea7f6e3d2540700a3c54e8 (diff) | |
| download | linux-a2a04b515562bbb040e8ae3decae8c1e9ef05327.tar.gz linux-a2a04b515562bbb040e8ae3decae8c1e9ef05327.tar.bz2 linux-a2a04b515562bbb040e8ae3decae8c1e9ef05327.zip | |
Merge tag 'drm-misc-fixes-2023-02-16' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Multiple fixes in vc4 to address issues with YUV planes, HDMI and CRTC;
an invalid page access fix for fbdev, mark dynamic debug as broken, a
double free and refcounting fix for vmwgfx.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230216091905.i5wswy4dd74x4br5@houat
Diffstat (limited to 'drivers/gpu/drm/ast/ast_mode.c')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_mode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index c7443317c747..66a4a41c3fe9 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -714,7 +714,7 @@ static int ast_primary_plane_init(struct ast_private *ast) struct ast_plane *ast_primary_plane = &ast->primary_plane; struct drm_plane *primary_plane = &ast_primary_plane->base; void __iomem *vaddr = ast->vram; - u64 offset = ast->vram_base; + u64 offset = 0; /* with shmem, the primary plane is always at offset 0 */ unsigned long cursor_size = roundup(AST_HWC_SIZE + AST_HWC_SIGNATURE_SIZE, PAGE_SIZE); unsigned long size = ast->vram_fb_available - cursor_size; int ret; @@ -972,7 +972,7 @@ static int ast_cursor_plane_init(struct ast_private *ast) return -ENOMEM; vaddr = ast->vram + ast->vram_fb_available - size; - offset = ast->vram_base + ast->vram_fb_available - size; + offset = ast->vram_fb_available - size; ret = ast_plane_init(dev, ast_cursor_plane, vaddr, offset, size, 0x01, &ast_cursor_plane_funcs, |