drm/i915/icl: Drop a couple unnecessary workarounds