On Thu, 29 Apr 2021, Janusz Krzysztofik <janusz.krzysztofik@xxxxxxxxxxxxxxx> wrote:
> Commit 7a0f9ef9703d ("drm/i915: Use drm_fb_helper_fill_info")
> effectively changed our FB driver name from "inteldrmfb" to
> "i915drmfb". However, we are still using the old name when kicking out
> a firmware fbdev driver potentially bound to our device. Use the new
> name to avoid confusion.
>
> Note: since the new name is assigned by a DRM fbdev helper called at
> the DRM driver registration time, that name is not available when we
> kick the other driver out early, hence a hardcoded name must be used
> unless the DRM layer exposes a macro for converting a DRM driver name
> to its associated fbdev driver name.
>
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@xxxxxxxxxxxxxxx>
LGTM, Daniel?
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
$ dim fixes 7a0f9ef9703d
Fixes: 7a0f9ef9703d ("drm/i915: Use drm_fb_helper_fill_info")
Cc: Noralf Trønnes <noralf@xxxxxxxxxxx>
Cc: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
Cc: <stable@xxxxxxxxxxxxxxx> # v5.2+
> ---
> drivers/gpu/drm/i915/i915_drv.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 785dcf20c77b..46082490dc9a 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -554,7 +554,7 @@ static int i915_driver_hw_probe(struct drm_i915_private *dev_priv)
> if (ret)
> goto err_perf;
>
> - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "inteldrmfb");
> + ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, "i915drmfb");
> if (ret)
> goto err_ggtt;
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
