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

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

Merge "drm/msm/dsi-staging: update dsi secure mode flag properly"

parents ce29d94a 5553d06d

drivers/gpu/drm/msm/dsi-staging/dsi_ctrl.h

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

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

 * Copyright (c) 2015-2018, 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
@@ -247,7 +247,7 @@ struct dsi_ctrl { 
	u32 cmd_buffer_iova;

	u32 cmd_len;

	void *vaddr;

	u32 secure_mode;

	bool secure_mode;



	/* Debug Information */

	struct dentry *debugfs_root;

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

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

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2018, 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
@@ -262,6 +262,7 @@ static void dsi_display_aspace_cb_locked(void *cb_data, bool is_detach) 
		display_ctrl->ctrl->cmd_buffer_size = display->cmd_buffer_size;

		display_ctrl->ctrl->cmd_buffer_iova = display->cmd_buffer_iova;

		display_ctrl->ctrl->vaddr = display->vaddr;

		display_ctrl->ctrl->secure_mode = is_detach;

	}



end: