Unverified Commit f3e875b3 authored by Raag Jadav's avatar Raag Jadav Committed by Rodrigo Vivi
Browse files

drm/xe: Move xe_device_sysfs_init() to xe_device_probe() 



Since xe_device_sysfs_init() exposes device specific attributes, a better
place for it is xe_device_probe().

Signed-off-by: default avatarRaag Jadav <raag.jadav@intel.com>
Reviewed-by: default avatarRiana Tauro <riana.tauro@intel.com>
Link: https://lore.kernel.org/r/20250506054835.3395220-2-raag.jadav@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 432cd94e

drivers/gpu/drm/xe/xe_device.c

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "xe_bo_evict.h"

#include "xe_debugfs.h"

#include "xe_devcoredump.h"

#include "xe_device_sysfs.h"

#include "xe_dma_buf.h"

#include "xe_drm_client.h"

#include "xe_drv.h"
@@ -915,6 +916,10 @@ int xe_device_probe(struct xe_device *xe) 
	if (err)

		goto err_unregister_display;



	err = xe_device_sysfs_init(xe);

	if (err)

		goto err_unregister_display;



	xe_debugfs_register(xe);



	err = xe_hwmon_register(xe);

drivers/gpu/drm/xe/xe_device_sysfs.c

+7 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static void xe_device_sysfs_fini(void *arg) 
{

	struct xe_device *xe = arg;



	if (xe->d3cold.capable)

		sysfs_remove_file(&xe->drm.dev->kobj, &dev_attr_vram_d3cold_threshold.attr);

}
@@ -75,9 +76,11 @@ int xe_device_sysfs_init(struct xe_device *xe) 
	struct device *dev = xe->drm.dev;

	int ret;



	if (xe->d3cold.capable) {

		ret = sysfs_create_file(&dev->kobj, &dev_attr_vram_d3cold_threshold.attr);

		if (ret)

			return ret;

	}



	return devm_add_action_or_reset(dev, xe_device_sysfs_fini, xe);

}

drivers/gpu/drm/xe/xe_pm.c

+1 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include "xe_bo.h"

#include "xe_bo_evict.h"

#include "xe_device.h"

#include "xe_device_sysfs.h"

#include "xe_ggtt.h"

#include "xe_gt.h"

#include "xe_guc.h"
@@ -273,6 +272,7 @@ int xe_pm_init_early(struct xe_device *xe) 
	if (err)

		return err;



	xe->d3cold.capable = xe_pm_pci_d3cold_capable(xe);

	return 0;

}

ALLOW_ERROR_INJECTION(xe_pm_init_early, ERRNO); /* See xe_pci_probe() */
@@ -344,13 +344,7 @@ int xe_pm_init(struct xe_device *xe) 
	if (!xe_device_uc_enabled(xe))

		return 0;



	xe->d3cold.capable = xe_pm_pci_d3cold_capable(xe);



	if (xe->d3cold.capable) {

		err = xe_device_sysfs_init(xe);

		if (err)

			goto err_unregister;



		vram_threshold = vram_threshold_value(xe);

		err = xe_pm_set_vram_threshold(xe, vram_threshold);

		if (err)