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

Commit 3ebf72a4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: abort before going to suspend"

parents beabee68 02adef9d

drivers/gpu/drm/msm/dp/dp_aux.c

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

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

 * Copyright (c) 2012-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
@@ -320,7 +320,7 @@ static void dp_aux_reconfig(struct dp_aux *dp_aux) 
	aux->catalog->reset(aux->catalog);

}



static void dp_aux_abort_transaction(struct dp_aux *dp_aux)

static void dp_aux_abort_transaction(struct dp_aux *dp_aux, bool reset)

{

	struct dp_aux_private *aux;
@@ -331,7 +331,7 @@ static void dp_aux_abort_transaction(struct dp_aux *dp_aux) 


	aux = container_of(dp_aux, struct dp_aux_private, dp_aux);



	atomic_set(&aux->aborted, 1);

	atomic_set(&aux->aborted, !reset);

}



static void dp_aux_update_offset_and_segment(struct dp_aux_private *aux,

drivers/gpu/drm/msm/dp/dp_aux.h

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

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

 * Copyright (c) 2012-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
@@ -55,7 +55,7 @@ struct dp_aux { 
	void (*init)(struct dp_aux *aux, struct dp_aux_cfg *aux_cfg);

	void (*deinit)(struct dp_aux *aux);

	void (*reconfig)(struct dp_aux *aux);

	void (*abort)(struct dp_aux *aux);

	void (*abort)(struct dp_aux *aux, bool reset);

	void (*dpcd_updated)(struct dp_aux *aux);

	void (*set_sim_mode)(struct dp_aux *aux, bool en, u8 *edid, u8 *dpcd);

	int (*aux_switch)(struct dp_aux *aux, bool enable, int orientation);

drivers/gpu/drm/msm/dp/dp_ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void dp_ctrl_video_ready(struct dp_ctrl_private *ctrl) 
	complete(&ctrl->video_comp);

}



static void dp_ctrl_abort(struct dp_ctrl *dp_ctrl)

static void dp_ctrl_abort(struct dp_ctrl *dp_ctrl, bool reset)

{

	struct dp_ctrl_private *ctrl;
@@ -116,7 +116,7 @@ static void dp_ctrl_abort(struct dp_ctrl *dp_ctrl) 


	ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl);



	atomic_set(&ctrl->aborted, 1);

	atomic_set(&ctrl->aborted, !reset);

}



static void dp_ctrl_state_ctrl(struct dp_ctrl_private *ctrl, u32 state)

drivers/gpu/drm/msm/dp/dp_ctrl.h

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

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

 * Copyright (c) 2012-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
@@ -28,7 +28,7 @@ struct dp_ctrl { 
	int (*on)(struct dp_ctrl *dp_ctrl, bool mst_mode, bool fec_en,

			bool shallow);

	void (*off)(struct dp_ctrl *dp_ctrl);

	void (*abort)(struct dp_ctrl *dp_ctrl);

	void (*abort)(struct dp_ctrl *dp_ctrl, bool reset);

	void (*isr)(struct dp_ctrl *dp_ctrl);

	bool (*handle_sink_request)(struct dp_ctrl *dp_ctrl);

	void (*process_phy_test_request)(struct dp_ctrl *dp_ctrl);

drivers/gpu/drm/msm/dp/dp_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -1466,8 +1466,8 @@ static void dp_debug_set_sim_mode(struct dp_debug_private *debug, bool sim) 
		debug->aux->set_sim_mode(debug->aux, true,

			debug->edid, debug->dpcd);

	} else {

		debug->aux->abort(debug->aux);

		debug->ctrl->abort(debug->ctrl);

		debug->aux->abort(debug->aux, false);

		debug->ctrl->abort(debug->ctrl, false);



		debug->aux->set_sim_mode(debug->aux, false, NULL, NULL);

		debug->power->sim_mode = false;