Commit 43b36232 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/gem: Provide offset-adjusted framebuffer BO mappings 



Add an additional argument to drm_gem_fb_vmap() to return each BO's
mapping adjusted by the respective offset. Update all callers.

The newly returned values point to the first byite of the data stored
in the framebuffer BOs. Drivers that access the BO data should use it.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210803125928.27780-2-tzimmermann@suse.de
parent 0a6dab7d

drivers/gpu/drm/drm_gem_atomic_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ int drm_gem_prepare_shadow_fb(struct drm_plane *plane, struct drm_plane_state *p 
	if (ret)

		return ret;



	return drm_gem_fb_vmap(fb, shadow_plane_state->map);

	return drm_gem_fb_vmap(fb, shadow_plane_state->map, shadow_plane_state->data);

}

EXPORT_SYMBOL(drm_gem_prepare_shadow_fb);

drivers/gpu/drm/drm_gem_framebuffer_helper.c

+16 −1
Original line number Diff line number Diff line
@@ -315,19 +315,25 @@ EXPORT_SYMBOL_GPL(drm_gem_fb_create_with_dirty); 
 * drm_gem_fb_vmap - maps all framebuffer BOs into kernel address space

 * @fb: the framebuffer

 * @map: returns the mapping's address for each BO

 * @data: returns the data address for each BO, can be NULL

 *

 * This function maps all buffer objects of the given framebuffer into

 * kernel address space and stores them in struct dma_buf_map. If the

 * mapping operation fails for one of the BOs, the function unmaps the

 * already established mappings automatically.

 *

 * Callers that want to access a BO's stored data should pass @data.

 * The argument returns the addresses of the data stored in each BO. This

 * is different from @map if the framebuffer's offsets field is non-zero.

 *

 * See drm_gem_fb_vunmap() for unmapping.

 *

 * Returns:

 * 0 on success, or a negative errno code otherwise.

 */

int drm_gem_fb_vmap(struct drm_framebuffer *fb,

		    struct dma_buf_map map[static DRM_FORMAT_MAX_PLANES])

		    struct dma_buf_map map[static DRM_FORMAT_MAX_PLANES],

		    struct dma_buf_map data[DRM_FORMAT_MAX_PLANES])

{

	struct drm_gem_object *obj;

	unsigned int i;
@@ -344,6 +350,15 @@ int drm_gem_fb_vmap(struct drm_framebuffer *fb, 
			goto err_drm_gem_vunmap;

	}



	if (data) {

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

			memcpy(&data[i], &map[i], sizeof(data[i]));

			if (dma_buf_map_is_null(&data[i]))

				continue;

			dma_buf_map_incr(&data[i], fb->offsets[i]);

		}

	}



	return 0;



err_drm_gem_vunmap:

drivers/gpu/drm/gud/gud_pipe.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int gud_prep_flush(struct gud_device *gdrm, struct drm_framebuffer *fb, 
	if (len > gdrm->bulk_len)

		return -E2BIG;



	ret = drm_gem_fb_vmap(fb, map);

	ret = drm_gem_fb_vmap(fb, map, NULL);

	if (ret)

		return ret;

drivers/gpu/drm/vkms/vkms_writeback.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector, 
	if (!vkmsjob)

		return -ENOMEM;



	ret = drm_gem_fb_vmap(job->fb, vkmsjob->map);

	ret = drm_gem_fb_vmap(job->fb, vkmsjob->map, NULL);

	if (ret) {

		DRM_ERROR("vmap failed: %d\n", ret);

		goto err_kfree;

include/drm/drm_gem_atomic_helper.h

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,14 @@ struct drm_shadow_plane_state { 
	 * prepare_fb callback and removed in the cleanup_fb callback.

	 */

	struct dma_buf_map map[DRM_FORMAT_MAX_PLANES];



	/**

	 * @data: Address of each framebuffer BO's data

	 *

	 * The address of the data stored in each mapping. This is different

	 * for framebuffers with non-zero offset fields.

	 */

	struct dma_buf_map data[DRM_FORMAT_MAX_PLANES];

};



/**