~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1060,7 +1060,7 @@
1060	1060	}
1061	1061
1062	1062	/* aspect ratio VUI */
1063		- readl(mfc_regs->e_h264_options);
	1063	+ reg = readl(mfc_regs->e_h264_options);
1064	1064	reg &= ~(0x1 << 5);
1065	1065	reg \|= ((p_h264->vui_sar & 0x1) << 5);
1066	1066	writel(reg, mfc_regs->e_h264_options);
..	..	@@ -1083,7 +1083,7 @@
1083	1083
1084	1084	/* intra picture period for H.264 open GOP */
1085	1085	/* control */
1086		- readl(mfc_regs->e_h264_options);
	1086	+ reg = readl(mfc_regs->e_h264_options);
1087	1087	reg &= ~(0x1 << 4);
1088	1088	reg \|= ((p_h264->open_gop & 0x1) << 4);
1089	1089	writel(reg, mfc_regs->e_h264_options);
..	..	@@ -1097,23 +1097,23 @@
1097	1097	}
1098	1098
1099	1099	/* 'WEIGHTED_BI_PREDICTION' for B is disable */
1100		- readl(mfc_regs->e_h264_options);
	1100	+ reg = readl(mfc_regs->e_h264_options);
1101	1101	reg &= ~(0x3 << 9);
1102	1102	writel(reg, mfc_regs->e_h264_options);
1103	1103
1104	1104	/* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */
1105		- readl(mfc_regs->e_h264_options);
	1105	+ reg = readl(mfc_regs->e_h264_options);
1106	1106	reg &= ~(0x1 << 14);
1107	1107	writel(reg, mfc_regs->e_h264_options);
1108	1108
1109	1109	/* ASO */
1110		- readl(mfc_regs->e_h264_options);
	1110	+ reg = readl(mfc_regs->e_h264_options);
1111	1111	reg &= ~(0x1 << 6);
1112	1112	reg \|= ((p_h264->aso & 0x1) << 6);
1113	1113	writel(reg, mfc_regs->e_h264_options);
1114	1114
1115	1115	/* hier qp enable */
1116		- readl(mfc_regs->e_h264_options);
	1116	+ reg = readl(mfc_regs->e_h264_options);
1117	1117	reg &= ~(0x1 << 8);
1118	1118	reg \|= ((p_h264->open_gop & 0x1) << 8);
1119	1119	writel(reg, mfc_regs->e_h264_options);
..	..	@@ -1134,7 +1134,7 @@
1134	1134	writel(reg, mfc_regs->e_h264_num_t_layer);
1135	1135
1136	1136	/* frame packing SEI generation */
1137		- readl(mfc_regs->e_h264_options);
	1137	+ reg = readl(mfc_regs->e_h264_options);
1138	1138	reg &= ~(0x1 << 25);
1139	1139	reg \|= ((p_h264->sei_frame_packing & 0x1) << 25);
1140	1140	writel(reg, mfc_regs->e_h264_options);