On Thu, 2024-10-03 at 17:44 +0200, Maarten Lankhorst wrote:
> This is already handled below by fixup_initial_plane_config.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> Fixes: a8153627520a ("drm/i915: Try to relocate the BIOS fb to the start of ggtt")
> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/xe/display/xe_plane_initial.c | 9 ---------
> 1 file changed, 9 deletions(-)
I had the same change as part of some other BMG bug analysis. But was never merged upstream!
(https://patchwork.freedesktop.org/patch/590387/?series=132649&rev=2)
Anyway, I think this change as part of this series could go instead.
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx>
>
> diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c
> b/drivers/gpu/drm/xe/display/xe_plane_initial.c
> index cf139921e7817..1f5128927c07c 100644
> --- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
> +++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
> @@ -197,8 +197,6 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
> to_intel_plane(crtc->base.primary);
> struct intel_plane_state *plane_state =
> to_intel_plane_state(plane->base.state);
> - struct intel_crtc_state *crtc_state =
> - to_intel_crtc_state(crtc->base.state);
> struct drm_framebuffer *fb;
> struct i915_vma *vma;
>
> @@ -245,13 +243,6 @@ intel_find_initial_plane_obj(struct intel_crtc *crtc,
>
> plane_config->vma = vma;
>
> - /*
> - * Flip to the newly created mapping ASAP, so we can re-use the
> - * first part of GGTT for WOPCM, prevent flickering, and prevent
> - * the lookup of sysmem scratch pages.
> - */
> - plane->check_plane(crtc_state, plane_state);
> - plane->async_flip(plane, crtc_state, plane_state, true);
> return;
>
> nofb:
