Merge "drm/dsi-staging: account for h_active for pixel clk calculation"