Skip to content

Commit f31a96c

Browse files
author
Herton R. Krzesinski
committed
Merge: drm/ast: Fix start address computation
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2033 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2166219 Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com> Approved-by: Mika Penttilä <mpenttil@redhat.com> Approved-by: Michel Dänzer <mdaenzer@redhat.com> Approved-by: Karol Herbst <kherbst@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents 953d554 + 180c511 commit f31a96c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/ast/ast_mode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ static int ast_primary_plane_init(struct ast_private *ast)
716716
struct ast_plane *ast_primary_plane = &ast->primary_plane;
717717
struct drm_plane *primary_plane = &ast_primary_plane->base;
718718
void __iomem *vaddr = ast->vram;
719-
u64 offset = ast->vram_base;
719+
u64 offset = 0; /* with shmem, the primary plane is always at offset 0 */
720720
unsigned long cursor_size = roundup(AST_HWC_SIZE + AST_HWC_SIGNATURE_SIZE, PAGE_SIZE);
721721
unsigned long size = ast->vram_fb_available - cursor_size;
722722
int ret;
@@ -974,7 +974,7 @@ static int ast_cursor_plane_init(struct ast_private *ast)
974974
return -ENOMEM;
975975

976976
vaddr = ast->vram + ast->vram_fb_available - size;
977-
offset = ast->vram_base + ast->vram_fb_available - size;
977+
offset = ast->vram_fb_available - size;
978978

979979
ret = ast_plane_init(dev, ast_cursor_plane, vaddr, offset, size,
980980
0x01, &ast_cursor_plane_funcs,

0 commit comments

Comments
 (0)