github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe: Fix xe_display_fini() calls

Browse Source 
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 65e366ace5 ("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>
This commit is contained in:
Lucas De Marchi 2025-02-13 11:28:58 -08:00
parent 776e3b502b
commit 8b3f09fb44
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/xe/display/xe_display.c
View File

@ -162,27 +162,29 @@ int xe_display_init_early(struct xe_device *xe)
return err;
}
static void xe_display_fini(void *arg)
{
struct xe_device *xe = arg;
struct intel_display *display = &xe->display;
intel_hpd_poll_fini(xe);
intel_hdcp_component_fini(display);
intel_audio_deinit(xe);
}
int xe_display_init(struct xe_device *xe)
{
struct intel_display *display = &xe->display;
int err;
if (!xe->info.probe_display)
return 0;
return intel_display_driver_probe(display);
}
err = intel_display_driver_probe(display);
if (err)
return err;
void xe_display_fini(struct xe_device *xe)
{
struct intel_display *display = &xe->display;
if (!xe->info.probe_display)
return;
intel_hpd_poll_fini(xe);
intel_hdcp_component_fini(display);
intel_audio_deinit(xe);
return xe_device_add_action_or_reset(xe, xe_display_fini, xe);
}
void xe_display_register(struct xe_device *xe)

2
drivers/gpu/drm/xe/display/xe_display.h
View File

@ -22,7 +22,6 @@ int xe_display_probe(struct xe_device *xe);
int xe_display_init_early(struct xe_device *xe);
int xe_display_init(struct xe_device *xe);
void xe_display_fini(struct xe_device *xe);
void xe_display_register(struct xe_device *xe);
void xe_display_unregister(struct xe_device *xe);
@ -54,7 +53,6 @@ static inline int xe_display_probe(struct xe_device *xe) { return 0; }
static inline int xe_display_init_early(struct xe_device *xe) { return 0; }
static inline int xe_display_init(struct xe_device *xe) { return 0; }
static inline void xe_display_fini(struct xe_device *xe) {}
static inline void xe_display_register(struct xe_device *xe) {}
static inline void xe_display_unregister(struct xe_device *xe) {}

21
drivers/gpu/drm/xe/xe_device.c
View File

@ -741,6 +741,7 @@ static int probe_has_flat_ccs(struct xe_device *xe)
"Flat CCS has been disabled in bios, May lead to performance impact");
xe_force_wake_put(gt_to_fw(gt), fw_ref);
return 0;
}
@ -812,22 +813,26 @@ int xe_device_probe(struct xe_device *xe)
err = xe_devcoredump_init(xe);
if (err)
return err;
/*
* From here on, if a step fails, make sure a Driver-FLR is triggereed
*/
err = devm_add_action_or_reset(xe->drm.dev, xe_driver_flr_fini, xe);
if (err)
return err;
err = probe_has_flat_ccs(xe);
if (err)
goto err;
return err;
err = xe_vram_probe(xe);
if (err)
goto err;
return err;
for_each_tile(tile, xe, id) {
err = xe_tile_init_noalloc(tile);
if (err)
goto err;
return err;
}
/* Allocate and map stolen after potential VRAM resize */
@ -841,17 +846,17 @@ int xe_device_probe(struct xe_device *xe)
*/
err = xe_display_init_early(xe);
if (err)
goto err;
return err;
for_each_tile(tile, xe, id) {
err = xe_tile_init(tile);
if (err)
goto err;
return err;
}
err = xe_irq_install(xe);
if (err)
goto err;
return err;
for_each_gt(gt, xe, id) {
last_gt = id;
@ -913,8 +918,6 @@ int xe_device_probe(struct xe_device *xe)
break;
}
err:
xe_display_fini(xe);
return err;
}
@ -990,8 +993,6 @@ void xe_device_remove(struct xe_device *xe)
xe_device_remove_display(xe);
xe_display_fini(xe);
xe_oa_fini(xe);
xe_heci_gsc_fini(xe);