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

Commit c456c1fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: add extra evtlog in sde rotator"

parents e13b7564 fa082379

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+4 −0
Original line number Diff line number Diff line
@@ -2394,6 +2394,10 @@ static int sde_rotator_config_session(struct sde_rot_mgr *mgr, 
		config->input.format, config->output.width,

		config->output.height, config->output.format,

		config->frame_rate, perf->clk_rate, perf->bw);

	SDEROT_EVTLOG(config->session_id, config->input.width,

			config->input.height, config->input.format,

			config->output.width, config->output.height,

			config->output.format, config->frame_rate);

done:

	return ret;

}

drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c

+2 −0
Original line number Diff line number Diff line
@@ -2184,6 +2184,7 @@ static int sde_rotator_qbuf(struct file *file, void *fh, 
	if (ret < 0)

		SDEDEV_ERR(ctx->rot_dev->dev, "fail qbuf s:%d t:%d r:%d\n",

				ctx->session_id, buf->type, ret);

	SDEROT_EVTLOG(buf->type, buf->bytesused, buf->length, buf->m.fd, ret);



	return ret;

}
@@ -2366,6 +2367,7 @@ static int sde_rotator_cropcap(struct file *file, void *fh, 
	a->pixelaspect.numerator = 1;

	a->pixelaspect.denominator = 1;



	SDEROT_EVTLOG(format->fmt.pix.width, format->fmt.pix.height, a->type);

	return 0;

}

drivers/media/platform/msm/sde/rotator/sde_rotator_util.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


#include "sde_rotator_util.h"

#include "sde_rotator_smmu.h"

#include "sde_rotator_debug.h"



#define Y_TILEWIDTH     48

#define Y_TILEHEIGHT    4
@@ -1038,6 +1039,8 @@ int sde_mdp_data_map(struct sde_mdp_data *data, bool rotator, int dir) 
			break;

		}

	}

	SDEROT_EVTLOG(data->num_planes, dir, data->p[0].addr, data->p[0].len,

			data->p[0].mapped);



	return rc;

}