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

Commit 08c67e2e authored by Samantha Tran's avatar Samantha Tran Committed by Gerrit - the friendly Code Review server
Browse files

Revert "drm/msm/disp/dpu: Mark a handful of functions as static" 



This reverts commit fba33cae.

This reversion is happening as a result of disabling the
disp/dpu directory as it will not be used in 4.19 downstream
display driver and these changes are made in the common layer
which affects the downstream driver functionalities. Separate
patches are submitted to revert the upstream driver and
introduce the downstream version of the display driver.

Change-Id: I9703b55efa7074ae746b6418e27ef8ff84d58335
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent 95337fe9

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+2 −5
Original line number Diff line number Diff line
@@ -264,9 +264,6 @@ void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc, 
				DPU_ENCODER_FRAME_EVENT_ERROR);

}



static int dpu_encoder_helper_wait_event_timeout(int32_t drm_id,

		int32_t hw_id, struct dpu_encoder_wait_info *info);



int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,

		enum dpu_intr_idx intr_idx,

		struct dpu_encoder_wait_info *wait_info)
@@ -470,7 +467,7 @@ void dpu_encoder_get_hw_resources(struct drm_encoder *drm_enc, 
	}

}



static void dpu_encoder_destroy(struct drm_encoder *drm_enc)

void dpu_encoder_destroy(struct drm_encoder *drm_enc)

{

	struct dpu_encoder_virt *dpu_enc = NULL;

	int i = 0;
@@ -1519,7 +1516,7 @@ void dpu_encoder_helper_trigger_start(struct dpu_encoder_phys *phys_enc) 
	}

}



static int dpu_encoder_helper_wait_event_timeout(

int dpu_encoder_helper_wait_event_timeout(

		int32_t drm_id,

		int32_t hw_id,

		struct dpu_encoder_wait_info *info)

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,12 @@ struct drm_encoder *dpu_encoder_init( 
int dpu_encoder_setup(struct drm_device *dev, struct drm_encoder *enc,

		struct msm_display_info *disp_info);



/**

 * dpu_encoder_destroy - destroy previously initialized virtual encoder

 * @drm_enc:    Pointer to previously created drm encoder structure

 */

void dpu_encoder_destroy(struct drm_encoder *drm_enc);



/**

 * dpu_encoder_prepare_commit - prepare encoder at the very beginning of an

 *	atomic commit, before any registers are written

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h

+14 −0
Original line number Diff line number Diff line
@@ -355,6 +355,20 @@ struct dpu_encoder_phys *dpu_encoder_phys_cmd_init( 
 */

void dpu_encoder_helper_trigger_start(struct dpu_encoder_phys *phys_enc);



/**

 * dpu_encoder_helper_wait_event_timeout - wait for event with timeout

 *	taking into account that jiffies may jump between reads leading to

 *	incorrectly detected timeouts. Prevent failure in this scenario by

 *	making sure that elapsed time during wait is valid.

 * @drm_id: drm object id for logging

 * @hw_id: hw instance id for logging

 * @info: wait info structure

 */

int dpu_encoder_helper_wait_event_timeout(

		int32_t drm_id,

		int32_t hw_id,

		struct dpu_encoder_wait_info *info);



/**

 * dpu_encoder_helper_hw_reset - issue ctl hw reset

 *	This helper function may be optionally specified by physical

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int dpu_encoder_phys_cmd_control_vblank_irq( 
	return ret;

}



static void dpu_encoder_phys_cmd_irq_control(struct dpu_encoder_phys *phys_enc,

void dpu_encoder_phys_cmd_irq_control(struct dpu_encoder_phys *phys_enc,

		bool enable)

{

	struct dpu_encoder_phys_cmd *cmd_enc;

drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ static int _dpu_format_get_plane_sizes_linear( 
	return 0;

}



static int dpu_format_get_plane_sizes(

int dpu_format_get_plane_sizes(

		const struct dpu_format *fmt,

		const uint32_t w,

		const uint32_t h,