Re: [PATCH] drm/amdgpu/display: fix merge breakage