diff --git a/drivers/media/platform/msm/cvp/cvp_hfi.c b/drivers/media/platform/msm/cvp/cvp_hfi.c
index 377a6d9bb23a..5c3009df6240 100644
--- a/drivers/media/platform/msm/cvp/cvp_hfi.c
+++ b/drivers/media/platform/msm/cvp/cvp_hfi.c
@@ -951,6 +951,20 @@ static void __set_registers(struct iris_hfi_device *device)
 					reg_set->reg_tbl[i].reg,
 					reg_set->reg_tbl[i].value);
 	}
+
+	/* CVP NOC QoS Settings */
+	__write_register(device,
+			CVP_NOC_QOSGENERATOR_MAINCTL_LOW, 0x48);
+	__write_register(device,
+			CVP_NOC_DMA_MAIN_PRIORITYLUT_LOW, 0x22222222);
+	__write_register(device,
+			CVP_NOC_DMA_MAIN_PRIORITYLUT_HIGH, 0x33332222);
+	__write_register(device,
+			CVP_NOC_DMA_MAIN_URGENCY_LOW, 0x1022);
+	__write_register(device,
+			CVP_NOC_DMA_MAIN_DANGERLUT_LOW, 0x5500);
+	__write_register(device,
+			CVP_NOC_DMA_MAIN_SAFELUT_LOW, 0xffff);
 }
 
 /*
diff --git a/drivers/media/platform/msm/cvp/cvp_hfi_io.h b/drivers/media/platform/msm/cvp/cvp_hfi_io.h
index 925cc2f3b4cc..d64ec1db3c01 100644
--- a/drivers/media/platform/msm/cvp/cvp_hfi_io.h
+++ b/drivers/media/platform/msm/cvp/cvp_hfi_io.h
@@ -181,6 +181,8 @@
 #define CVP_NOC_SBM_SENSELN0_LOW	(CVP_NOC_BASE_OFFS + 0x300)
 
 #define CVP_NOC_CORE_BASE_OFFS			0x00010000
+#define CVP_NOC_QOSGENERATOR_MAINCTL_LOW \
+		(CVP_NOC_CORE_BASE_OFFS + 0x808)
 #define CVP_NOC_MAIN_SIDEBANDMANAGER_SENSELN0_LOW \
 		(CVP_NOC_CORE_BASE_OFFS + 0x1100)
 #define CVP_NOC_MAIN_SIDEBANDMANAGER_SENSELN1_HIGH \
@@ -211,6 +213,16 @@
 		(CVP_NOC_CORE_BASE_OFFS + 0x1238)
 #define CVP_NOC_CORE_ERR_ERRLOG3_HIGH_OFFS \
 		(CVP_NOC_CORE_BASE_OFFS + 0x123C)
+#define CVP_NOC_DMA_MAIN_PRIORITYLUT_LOW \
+		(CVP_NOC_CORE_BASE_OFFS + 0x3030)
+#define CVP_NOC_DMA_MAIN_PRIORITYLUT_HIGH \
+		(CVP_NOC_CORE_BASE_OFFS + 0x3034)
+#define CVP_NOC_DMA_MAIN_URGENCY_LOW \
+		(CVP_NOC_CORE_BASE_OFFS + 0x3038)
+#define CVP_NOC_DMA_MAIN_DANGERLUT_LOW \
+		(CVP_NOC_CORE_BASE_OFFS + 0x3040)
+#define CVP_NOC_DMA_MAIN_SAFELUT_LOW \
+		(CVP_NOC_CORE_BASE_OFFS + 0x3048)
 
 
 #define CVP_AON_WRAPPER_MVP_NOC_LPI_CONTROL	(CVP_AON_BASE_OFFS)