diff --git a/msm/Kbuild b/msm/Kbuild
index 2f952a942b..00980d4a23 100644
--- a/msm/Kbuild
+++ b/msm/Kbuild
@@ -82,6 +82,8 @@ ifeq ($(call cc-option-yn, -Wheader-guard),y)
 EXTRA_CFLAGS += -Wheader-guard
 endif
 
+EXTRA_CFLAGS += -Wformat-extra-args -Wstrict-prototypes
+
 ifneq ($(MODNAME), qdsp6v2)
 CHIP_NAME ?= $(MODNAME)
 CDEFINES += -DMULTI_IF_NAME=\"$(CHIP_NAME)\"
diff --git a/msm/sde/sde_core_perf.c b/msm/sde/sde_core_perf.c
index c50a8e1968..cf177f36e4 100644
--- a/msm/sde/sde_core_perf.c
+++ b/msm/sde/sde_core_perf.c
@@ -640,7 +640,7 @@ void sde_core_perf_crtc_update_uidle(struct drm_crtc *crtc,
 			if (!fps)
 				fps = sde_crtc_get_fps_mode(tmp_crtc);
 
-			SDE_DEBUG("crtc=%d fps:%d wb:%d cwb:%d dis:%d en:%d\n",
+			SDE_DEBUG("crtc=%d fps:%d wb:%d cwb:%d uidle:%d uidle_crtc:%d en:%d\n",
 				tmp_crtc->base.id, fps,
 				_sde_core_perf_is_wb(tmp_crtc),
 				_sde_core_perf_is_cwb(tmp_crtc),
diff --git a/msm/sde/sde_encoder.c b/msm/sde/sde_encoder.c
index 17dbf60dc7..20d6b2f613 100644
--- a/msm/sde/sde_encoder.c
+++ b/msm/sde/sde_encoder.c
@@ -6138,7 +6138,7 @@ void sde_encoder_misr_sign_event_notify(struct drm_encoder *drm_enc)
 		phys = sde_enc->phys_encs[i];
 
 		if (!phys || !phys->ops.collect_misr) {
-			SDE_DEBUG("invalid misr ops\n", i);
+			SDE_DEBUG("invalid misr ops idx:%d\n", i);
 			continue;
 		}
 
diff --git a/msm/sde/sde_encoder_phys_wb.c b/msm/sde/sde_encoder_phys_wb.c
index 6f28523541..69d3a79fd4 100644
--- a/msm/sde/sde_encoder_phys_wb.c
+++ b/msm/sde/sde_encoder_phys_wb.c
@@ -1211,14 +1211,14 @@ static int sde_encoder_phys_wb_atomic_check(struct sde_encoder_phys *phys_enc,
 		return -EINVAL;
 	}
 
-	SDE_DEBUG("[enc:%d wb:%d] fb_id:%u, wxh:%ux%u, fb_fmt:%x,%llx, roi:{%d,%d,%d,%d}, rot:%d\n",
+	SDE_DEBUG("[enc:%d wb:%d] fb_id:%u, wxh:%ux%u, fb_fmt:%x,%llx, roi:{%d,%d,%d,%d}, rot:%u\n",
 		DRMID(phys_enc->parent), WBID(wb_enc), fb->base.id, fb->width, fb->height,
 		fb->format->format, fb->modifier, wb_roi.x, wb_roi.y, wb_roi.w, wb_roi.h,
 		rotation_type);
 
         rc = _sde_encoder_phys_wb_validate_output_fmt(phys_enc, fb, rotation_type);
 	if (rc) {
-		SDE_ERROR("[enc:%d wb:%d] output fmt validation failed fb:%u fmt:0x%x mod:0x%x\n",
+		SDE_ERROR("[enc:%d wb:%d] output fmt failed fb:%u fmt:0x%x mod:0x%x rot:%d",
 				 DRMID(phys_enc->parent), WBID(wb_enc), fb->base.id,
 				 fb->format->format, fb->modifier, rotation_type);
 		return rc;
diff --git a/msm/sde_dbg.c b/msm/sde_dbg.c
index 963defd1b3..ca58881010 100644
--- a/msm/sde_dbg.c
+++ b/msm/sde_dbg.c
@@ -659,7 +659,7 @@ static struct notifier_block sde_md_notify_blk = {
 	.priority = INT_MAX,
 };
 
-static int sde_register_md_panic_notifer()
+static int sde_register_md_panic_notifer(void)
 {
 	qcom_va_md_register("display", &sde_md_notify_blk);
 	return 0;
@@ -682,7 +682,7 @@ void sde_mini_dump_add_va_region(const char *name, u32 size, void *virt_addr)
 	return;
 }
 #else
-static int sde_register_md_panic_notifer()
+static int sde_register_md_panic_notifer(void)
 {
 	return 0;
 }