[Intel-xe] [PATCH 1/1] fixup! drm/xe/display: Implement display support

Lucas De Marchi lucas.demarchi at intel.com
Wed Sep 6 20:49:55 UTC 2023


On Wed, Sep 06, 2023 at 05:00:49PM -0300, Gustavo Sousa wrote:
>The function xe_display_driver_probe_defer() is supposed to return
>-EPROBE_DEFER when not yet ready to continue the probing, but the
>current implementation is actually returning 1 instead of the proper
>value, which would probably keep the probe operation to be attempted
>again. Fix that by returning the expected value in case we need to defer
>the probe.
>
>Signed-off-by: Gustavo Sousa <gustavo.sousa at intel.com>
>---
> drivers/gpu/drm/xe/xe_display.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
>index a453946ad108..bf475f9a7e14 100644
>--- a/drivers/gpu/drm/xe/xe_display.c
>+++ b/drivers/gpu/drm/xe/xe_display.c
>@@ -45,7 +45,10 @@ int xe_display_driver_probe_defer(struct pci_dev *pdev)
> 	if (!enable_display)
> 		return 0;
>
>-	return intel_display_driver_probe_defer(pdev);
>+	if (intel_display_driver_probe_defer(pdev))
>+		return -EPROBE_DEFER;

but now we have the odd situation that xe_display_driver_probe_defer()
returns an int (with < 0 as error code) and
intel_display_driver_probe_defer() returns a bool. I'd rather convert
xe_display_driver_probe_defer() to a bool and then force the -EPROBE_DEFER
return code in the caller, like is done by i915_pci_probe().

Lucas De Marchi

>+
>+	return 0;
> }
>
> static void xe_display_last_close(struct drm_device *dev)
>-- 
>2.41.0
>


More information about the Intel-xe mailing list