]> www.infradead.org Git - users/jedix/linux-maple.git/commit
drm/xe: Fix xe_display_fini() calls
authorLucas De Marchi <lucas.demarchi@intel.com>
Thu, 13 Feb 2025 19:28:58 +0000 (11:28 -0800)
committerLucas De Marchi <lucas.demarchi@intel.com>
Fri, 14 Feb 2025 19:42:54 +0000 (11:42 -0800)
commit8b3f09fb44a3b4e88c87a4654f4bf859c2c6447e
tree4ee7a09218e71a97110727dac43c7a8a27042e67
parent776e3b502b6e49b1a72507d1a01a9b49d67fd843
drm/xe: Fix xe_display_fini() calls

xe_display_fini() undoes things from xe_display_init() (technically from
intel_display_driver_probe()). Those `goto err` in xe_device_probe()
were wrong and being accumulated over time.

Commit 65e366ace5ee ("drm/xe/display: Use a single early init call for
display") made it easier to fix now that we don't have xe_display_* init
calls spread on xe_device_probe(). Change xe_display_init() to use
devm_add_action_or_reset() that will finalize display in the right
order.

While at it, also add a newline and comment about calling
xe_driver_flr_fini.

Cc: Maarten Lankhorst <dev@lankhorst.se>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250213192909.996148-2-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
drivers/gpu/drm/xe/display/xe_display.c
drivers/gpu/drm/xe/display/xe_display.h
drivers/gpu/drm/xe/xe_device.c