Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/gma: Remove calls to kmap()

kmap() is being deprecated and these instances are easy to convert to
kmap_local_page().

Furthermore, in gma_crtc_cursor_set() use the memcpy_from_page() helper
instead of an open coded use of kmap_local_page().

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220124015409.807587-4-ira.weiny@intel.com

authored by

Ira Weiny and committed by
Daniel Vetter
8b250cd3 ce99534e

+6 -8
+2 -4
drivers/gpu/drm/gma500/gma_display.c
··· 335 335 struct psb_gem_object *pobj; 336 336 struct psb_gem_object *cursor_pobj = gma_crtc->cursor_pobj; 337 337 struct drm_gem_object *obj; 338 - void *tmp_dst, *tmp_src; 338 + void *tmp_dst; 339 339 int ret = 0, i, cursor_pages; 340 340 341 341 /* If we didn't get a handle then turn the cursor off */ ··· 400 400 /* Copy the cursor to cursor mem */ 401 401 tmp_dst = dev_priv->vram_addr + cursor_pobj->offset; 402 402 for (i = 0; i < cursor_pages; i++) { 403 - tmp_src = kmap(pobj->pages[i]); 404 - memcpy(tmp_dst, tmp_src, PAGE_SIZE); 405 - kunmap(pobj->pages[i]); 403 + memcpy_from_page(tmp_dst, pobj->pages[i], 0, PAGE_SIZE); 406 404 tmp_dst += PAGE_SIZE; 407 405 } 408 406
+4 -4
drivers/gpu/drm/gma500/mmu.c
··· 184 184 pd->invalid_pte = 0; 185 185 } 186 186 187 - v = kmap(pd->dummy_pt); 187 + v = kmap_local_page(pd->dummy_pt); 188 188 for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i) 189 189 v[i] = pd->invalid_pte; 190 190 191 - kunmap(pd->dummy_pt); 191 + kunmap_local(v); 192 192 193 - v = kmap(pd->p); 193 + v = kmap_local_page(pd->p); 194 194 for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i) 195 195 v[i] = pd->invalid_pde; 196 196 197 - kunmap(pd->p); 197 + kunmap_local(v); 198 198 199 199 clear_page(kmap(pd->dummy_page)); 200 200 kunmap(pd->dummy_page);