Merge "drm/msm/sde: handle esd recovery in sde encoder"