Commit dc51c682 authored by Matthew Auld's avatar Matthew Auld
Browse files

drm/xe/display: move device_remove over to drmm 



i915 display calls this when releasing the drm_device, match this also
in xe by using drmm. intel_display_device_remove() is freeing purely
software state for the drm_device.

v2: fix build error

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240522102143.128069-36-matthew.auld@intel.com
parent 48d74a0a

drivers/gpu/drm/xe/display/xe_display.c

+16 −4
Original line number Diff line number Diff line
@@ -245,8 +245,6 @@ void xe_display_driver_remove(struct xe_device *xe) 
		return;



	intel_display_driver_remove(xe);



	intel_display_device_remove(xe);

}



/* IRQ-related functions */
@@ -388,17 +386,31 @@ void xe_display_pm_resume(struct xe_device *xe) 
	intel_power_domains_enable(xe);

}



void xe_display_probe(struct xe_device *xe)

static void display_device_remove(struct drm_device *dev, void *arg)

{

	struct xe_device *xe = arg;



	intel_display_device_remove(xe);

}



int xe_display_probe(struct xe_device *xe)

{

	int err;



	if (!xe->info.enable_display)

		goto no_display;



	intel_display_device_probe(xe);



	err = drmm_add_action_or_reset(&xe->drm, display_device_remove, xe);

	if (err)

		return err;



	if (has_display(xe))

		return;

		return 0;



no_display:

	xe->info.enable_display = false;

	unset_display_features(xe);

	return 0;

}

drivers/gpu/drm/xe/display/xe_display.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void xe_display_driver_remove(struct xe_device *xe); 


int xe_display_create(struct xe_device *xe);



void xe_display_probe(struct xe_device *xe);

int xe_display_probe(struct xe_device *xe);



int xe_display_init_nommio(struct xe_device *xe);

int xe_display_init_noirq(struct xe_device *xe);
@@ -47,7 +47,7 @@ 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 void xe_display_probe(struct xe_device *xe) { }

static inline int xe_display_probe(struct xe_device *xe) { return 0; }



static inline int xe_display_init_nommio(struct xe_device *xe) { return 0; }

static inline int xe_display_init_noirq(struct xe_device *xe) { return 0; }

drivers/gpu/drm/xe/xe_pci.c

+3 −1
Original line number Diff line number Diff line
@@ -767,7 +767,9 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		return err;



	xe_display_probe(xe);

	err = xe_display_probe(xe);

	if (err)

		return err;



	drm_dbg(&xe->drm, "%s %s %04x:%04x dgfx:%d gfx:%s (%d.%02d) media:%s (%d.%02d) display:%s dma_m_s:%d tc:%d gscfi:%d",

		desc->platform_name,