From: Thomas Zimmermann Date: Fri, 20 Nov 2020 10:25:44 +0000 (+0100) Subject: drm/fb-helper: Copy dma-buf map before flushing shadow fb X-Git-Tag: v5.11-rc1~65^2~5^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d4d269c0973f7a8324d9cd2534b3b24e62c72ff;p=thirdparty%2Flinux.git drm/fb-helper: Copy dma-buf map before flushing shadow fb Copy the vmap()'ed instance of struct dma_buf_map before modifying it, in case the implementation of vunmap() depends on the exact address. Signed-off-by: Thomas Zimmermann Acked-by: Maxime Ripard Acked-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20201120102545.4047-10-tzimmermann@suse.de --- diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 3143526834477..0aac5450c8ad1 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -395,14 +395,15 @@ static int drm_fb_helper_damage_blit(struct drm_fb_helper *fb_helper, struct drm_clip_rect *clip) { struct drm_client_buffer *buffer = fb_helper->buffer; - struct dma_buf_map map; + struct dma_buf_map map, dst; int ret; ret = drm_client_buffer_vmap(buffer, &map); if (ret) return ret; - drm_fb_helper_damage_blit_real(fb_helper, clip, &map); + dst = map; + drm_fb_helper_damage_blit_real(fb_helper, clip, &dst); drm_client_buffer_vunmap(buffer);