Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f2186d5 authored by Adrian Salido-Moreno's avatar Adrian Salido-Moreno
Browse files

msm: mdss: fix wb memory registration optimization 



In order to avoid multiple mappings of same buffer handle, we check for
any existing handles that are already mapped within writeback. However
current checks are based on file descriptors, and these may be reused
for a new buffer handle, and in turn we end up having wrong assumptions
of the actual queued buffer while performing the writeback commit.

Fix this by getting the actual ion handle mapped to the file descriptor
and look for this handle instead.

Change-Id: Ib800dc4000ce8353ed16c7e779cda21644696ec8
Signed-off-by: default avatarAdrian Salido-Moreno <adrianm@codeaurora.org>
parent 169417fe

drivers/video/msm/mdss/mdss_mdp_wb.c

+18 −4
Original line number Diff line number Diff line
@@ -417,11 +417,23 @@ static struct mdss_mdp_wb_data *get_user_node(struct msm_fb_data_type *mfd, 
	int ret;



	if (!list_empty(&wb->register_queue)) {

		struct ion_client *iclient = mdss_get_ionclient();

		struct ion_handle *ihdl;



		ihdl = ion_import_dma_buf(iclient, data->memory_id);

		if (IS_ERR_OR_NULL(ihdl)) {

			pr_err("unable to import fd %d\n", data->memory_id);

			return NULL;

		}

		/* only interested in ptr address, so we can free handle */

		ion_free(iclient, ihdl);



		list_for_each_entry(node, &wb->register_queue, registered_entry)

			if ((node->buf_info.memory_id == data->memory_id) &&

			if ((node->buf_data.p[0].srcp_ihdl == ihdl) &&

				    (node->buf_info.offset == data->offset)) {

				pr_debug("found node fd=%x off=%x addr=%pa\n",

						data->memory_id, data->offset,

				pr_debug("found fd=%d hdl=%p off=%x addr=%pa\n",

						data->memory_id, ihdl,

						data->offset,

						&node->buf_data.p[0].addr);

				return node;

			}
@@ -484,8 +496,10 @@ static void mdss_mdp_wb_free_node(struct mdss_mdp_wb_data *node) 


	if (node->user_alloc) {

		buf = &node->buf_data.p[0];

		pr_debug("free user node mem_id=%d offset=%u addr=0x%pa\n",



		pr_debug("free user mem_id=%d ihdl=%p, offset=%u addr=0x%pa\n",

				node->buf_info.memory_id,

				buf->srcp_ihdl,

				node->buf_info.offset,

				&buf->addr);