Commit 8b250cd3 authored by Ira Weiny's avatar Ira Weiny Committed by Daniel Vetter
Browse files

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: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220124015409.807587-4-ira.weiny@intel.com
parent ce99534e

drivers/gpu/drm/gma500/gma_display.c

+2 −4
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc, 
	struct psb_gem_object *pobj;

	struct psb_gem_object *cursor_pobj = gma_crtc->cursor_pobj;

	struct drm_gem_object *obj;

	void *tmp_dst, *tmp_src;

	void *tmp_dst;

	int ret = 0, i, cursor_pages;



	/* If we didn't get a handle then turn the cursor off */
@@ -400,9 +400,7 @@ int gma_crtc_cursor_set(struct drm_crtc *crtc, 
		/* Copy the cursor to cursor mem */

		tmp_dst = dev_priv->vram_addr + cursor_pobj->offset;

		for (i = 0; i < cursor_pages; i++) {

			tmp_src = kmap(pobj->pages[i]);

			memcpy(tmp_dst, tmp_src, PAGE_SIZE);

			kunmap(pobj->pages[i]);

			memcpy_from_page(tmp_dst, pobj->pages[i], 0, PAGE_SIZE);

			tmp_dst += PAGE_SIZE;

		}

drivers/gpu/drm/gma500/mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -184,17 +184,17 @@ struct psb_mmu_pd *psb_mmu_alloc_pd(struct psb_mmu_driver *driver, 
		pd->invalid_pte = 0;

	}



	v = kmap(pd->dummy_pt);

	v = kmap_local_page(pd->dummy_pt);

	for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)

		v[i] = pd->invalid_pte;



	kunmap(pd->dummy_pt);

	kunmap_local(v);



	v = kmap(pd->p);

	v = kmap_local_page(pd->p);

	for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)

		v[i] = pd->invalid_pde;



	kunmap(pd->p);

	kunmap_local(v);



	clear_page(kmap(pd->dummy_page));

	kunmap(pd->dummy_page);