Merge "msm: disp: rotator: changes to enable rotator on 5.4 kernel"

rotator/sde_rotator_r3.c

@@ -4083,12 +4083,6 @@ int sde_rotator_r3_init(struct sde_rot_mgr *mgr)
 		INIT_LIST_HEAD(&rot->sbuf_ctx[i]);
 	}
 
-	/* set rotator CBCR to shutoff memory/periphery on clock off.*/
-	clk_set_flags(mgr->rot_clk[SDE_ROTATOR_CLK_MDSS_ROT].clk,
-			CLKFLAG_NORETAIN_MEM);
-	clk_set_flags(mgr->rot_clk[SDE_ROTATOR_CLK_MDSS_ROT].clk,
-			CLKFLAG_NORETAIN_PERIPH);
-
 	mdata->sde_rot_hw = rot;
 	return 0;
 error_hw_rev_init: