mirror of
https://github.com/torvalds/linux.git
synced 2026-04-30 20:42:33 -04:00
8b3f09fb44
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>
77 lines
3.0 KiB
C
77 lines
3.0 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
/*
|
|
* Copyright © 2023 Intel Corporation
|
|
*/
|
|
|
|
#ifndef _XE_DISPLAY_H_
|
|
#define _XE_DISPLAY_H_
|
|
|
|
#include "xe_device.h"
|
|
|
|
struct drm_driver;
|
|
|
|
#if IS_ENABLED(CONFIG_DRM_XE_DISPLAY)
|
|
|
|
bool xe_display_driver_probe_defer(struct pci_dev *pdev);
|
|
void xe_display_driver_set_hooks(struct drm_driver *driver);
|
|
void xe_display_driver_remove(struct xe_device *xe);
|
|
|
|
int xe_display_create(struct xe_device *xe);
|
|
|
|
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_register(struct xe_device *xe);
|
|
void xe_display_unregister(struct xe_device *xe);
|
|
|
|
void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl);
|
|
void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir);
|
|
void xe_display_irq_reset(struct xe_device *xe);
|
|
void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt);
|
|
|
|
void xe_display_pm_suspend(struct xe_device *xe);
|
|
void xe_display_pm_shutdown(struct xe_device *xe);
|
|
void xe_display_pm_suspend_late(struct xe_device *xe);
|
|
void xe_display_pm_shutdown_late(struct xe_device *xe);
|
|
void xe_display_pm_resume_early(struct xe_device *xe);
|
|
void xe_display_pm_resume(struct xe_device *xe);
|
|
void xe_display_pm_runtime_suspend(struct xe_device *xe);
|
|
void xe_display_pm_runtime_suspend_late(struct xe_device *xe);
|
|
void xe_display_pm_runtime_resume(struct xe_device *xe);
|
|
|
|
#else
|
|
|
|
static inline int xe_display_driver_probe_defer(struct pci_dev *pdev) { return 0; }
|
|
static inline void xe_display_driver_set_hooks(struct drm_driver *driver) { }
|
|
static inline void xe_display_driver_remove(struct xe_device *xe) {}
|
|
|
|
static inline int xe_display_create(struct xe_device *xe) { return 0; }
|
|
|
|
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_register(struct xe_device *xe) {}
|
|
static inline void xe_display_unregister(struct xe_device *xe) {}
|
|
|
|
static inline void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl) {}
|
|
static inline void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir) {}
|
|
static inline void xe_display_irq_reset(struct xe_device *xe) {}
|
|
static inline void xe_display_irq_postinstall(struct xe_device *xe, struct xe_gt *gt) {}
|
|
|
|
static inline void xe_display_pm_suspend(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_shutdown(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_suspend_late(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_shutdown_late(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_resume_early(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_resume(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_runtime_suspend(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_runtime_suspend_late(struct xe_device *xe) {}
|
|
static inline void xe_display_pm_runtime_resume(struct xe_device *xe) {}
|
|
|
|
#endif /* CONFIG_DRM_XE_DISPLAY */
|
|
#endif /* _XE_DISPLAY_H_ */
|