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

Commit 764f7c2d authored by Abhijith Desai's avatar Abhijith Desai
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 



* quic/dev/msm-4.14-display:
  drm/msm/sde: disable write operation on eventlog dump node
  drm/msm/sde: add null check for current master
  drm/msm/sde: update mixercount check in writeback usecase

Change-Id: I6439598f35b32588094bc2a3783ea88f67f6e2f5
Signed-off-by: default avatarAbhijith Desai <desaia@codeaurora.org>
parents b53c6bb3 0f3df422

drivers/gpu/drm/msm/sde/sde_encoder.c

+6 −0
Original line number Diff line number Diff line
@@ -3042,6 +3042,12 @@ void sde_encoder_virt_restore(struct drm_encoder *drm_enc) 
		return;

	}

	sde_enc = to_sde_encoder_virt(drm_enc);



	if (!sde_enc->cur_master) {

		SDE_ERROR("virt encoder has no master\n");

		return;

	}



	memset(&sde_enc->cur_master->intf_cfg_v1, 0,

			sizeof(sde_enc->cur_master->intf_cfg_v1));

	sde_enc->idle_pc_restore = true;

drivers/gpu/drm/msm/sde/sde_wb.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -345,7 +345,7 @@ int sde_wb_get_mode_info(struct drm_connector *connector, 
		hdisplay = max(hdisplay, wb_dev->modes[i].hdisplay);



	topology = &mode_info->topology;

	topology->num_lm = (max_mixer_width <= hdisplay) ? dual_lm : single_lm;

	topology->num_lm = (max_mixer_width < hdisplay) ? dual_lm : single_lm;

	topology->num_enc = no_enc;

	topology->num_intf = single_intf;

drivers/gpu/drm/msm/sde_dbg.c

+0 −17
Original line number Diff line number Diff line
@@ -4211,26 +4211,9 @@ static ssize_t sde_evtlog_dump_read(struct file *file, char __user *buff, 
	return len;

}



/**

 * sde_evtlog_dump_write - debugfs write handler for evtlog dump

 * @file: file handler

 * @user_buf: user buffer content from debugfs

 * @count: size of user buffer

 * @ppos: position offset of user buffer

 */

static ssize_t sde_evtlog_dump_write(struct file *file,

	const char __user *user_buf, size_t count, loff_t *ppos)

{

	_sde_dump_array(NULL, 0, sde_dbg_base.panic_on_err, "dump_debugfs",

		true, true, true, false);



	return count;

}



static const struct file_operations sde_evtlog_fops = {

	.open = sde_dbg_debugfs_open,

	.read = sde_evtlog_dump_read,

	.write = sde_evtlog_dump_write,

};



/**