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

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

Merge "msm: ipa: Fix compiler warnings"

parents e6a209df c47bfd52

drivers/gpu/drm/msm/msm_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -718,10 +718,10 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 
	struct platform_device *pdev = to_platform_device(dev);

	struct drm_device *ddev;

	struct msm_drm_private *priv;

	struct msm_kms *kms;

	struct msm_kms *kms = NULL;

	struct sde_dbg_power_ctrl dbg_power_ctrl = { 0 };

	int ret;

	struct sched_param param;

	struct sched_param param = { 0 };



	ddev = drm_dev_alloc(drv, dev);

	if (!ddev) {

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

+2 −2
Original line number Diff line number Diff line
@@ -3060,7 +3060,7 @@ static int sde_cp_ltm_register_irq(struct sde_kms *kms, 
	} else if (irq == SDE_IRQ_TYPE_LTM_STATS_WB_PB) {

		ltm_irq->func = sde_cp_ltm_wb_pb_interrupt_cb;

	} else {

		DRM_ERROR("invalid irq type %s\n", irq);

		DRM_ERROR("invalid irq type %d\n", irq);

		return -EINVAL;

	}
@@ -3094,7 +3094,7 @@ static int sde_cp_ltm_unregister_irq(struct sde_kms *kms, 


	if (!(irq == SDE_IRQ_TYPE_LTM_STATS_DONE ||

		irq == SDE_IRQ_TYPE_LTM_STATS_WB_PB)) {

		DRM_ERROR("invalid irq type %s\n", irq);

		DRM_ERROR("invalid irq type %d\n", irq);

		return -EINVAL;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static void _sde_core_perf_crtc_update_llcc(struct sde_kms *kms, 
			total_llcc_active |=

			  sde_crtc->cur_perf.llcc_active;



			SDE_DEBUG("crtc=%d llcc:%llu active:0x%x\n",

			SDE_DEBUG("crtc=%d llcc:%u active:0x%x\n",

				tmp_crtc->base.id,

				sde_crtc->cur_perf.llcc_active,

				total_llcc_active);

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

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static ssize_t measured_fps_show(struct device *device, 
	fps_int = (unsigned int) sde_crtc->fps_info.measured_fps;

	fps_decimal = do_div(fps_int, 10);

	return scnprintf(buf, PAGE_SIZE,

		"fps: %d.%d duration:%d frame_count:%d", fps_int, fps_decimal,

		"fps: %d.%d duration:%d frame_count:%lld", fps_int, fps_decimal,

			sde_crtc->fps_info.fps_periodic_duration, frame_count);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -1949,7 +1949,7 @@ static int _sde_encoder_update_rsc_client( 
{

	struct sde_encoder_virt *sde_enc;

	struct drm_crtc *crtc;

	enum sde_rsc_state rsc_state;

	enum sde_rsc_state rsc_state = SDE_RSC_IDLE_STATE;

	struct sde_rsc_cmd_config *rsc_config;

	int ret, prefill_lines;

	struct msm_display_info *disp_info;
@@ -2710,7 +2710,7 @@ static int sde_encoder_resource_control(struct drm_encoder *drm_enc, 
{

	struct sde_encoder_virt *sde_enc;

	struct msm_drm_private *priv;

	int ret;

	int ret = 0;

	bool is_vid_mode = false;



	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {
@@ -3624,7 +3624,7 @@ static void sde_encoder_frame_done_callback( 
	enum sde_rm_topology_name topology = SDE_RM_TOPOLOGY_NONE;



	if (!drm_enc || !sde_enc->cur_master) {

		SDE_ERROR("invalid param: drm_enc %x, cur_master %x\n",

		SDE_ERROR("invalid param: drm_enc %pK, cur_master %pK\n",

				drm_enc, drm_enc ? sde_enc->cur_master : 0);

		return;

	}