Re: [PATCH v10 2/3] drm/xe/tests: Fix pf_set_admin_mode() after sriov.pf.admin_only removal

[Michal Wajdeczko <michal.wajdeczko@intel.com>]

title: after patch reorder there is nothing to 'fix', so maybe:

	drm/xe/tests: Update admin-only mode selection

On 4/8/2026 6:05 PM, Satyanarayana K V P wrote:
> Admin-only mode is now derived from xe_device_is_admin_only(), which
> checks whether the device was registered under the admin-only DRM driver
> instance or not.
> 
> Update the kunit test to have a stub function to mimic the functionality
> of xe_device_is_admin_only().
> 
> Signed-off-by: Satyanarayana K V P <satyanarayana.k.v.p@intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> 
> ---
> V9 -> V10:
> - Moved kunit_activate_static_stub() to pf_set_admin_mode() (Michal).
> 
> V8 -> V9:
> - New commit.
> ---
>  .../xe/tests/xe_gt_sriov_pf_config_kunit.c    | 22 +++++++++++++++++--
>  drivers/gpu/drm/xe/xe_device.c                |  3 +++
>  2 files changed, 23 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c b/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c
> index efa8963ec248..a235ec04d6b6 100644
> --- a/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c
> +++ b/drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c
> @@ -7,16 +7,34 @@
>  #include <kunit/test.h>
>  #include <kunit/test-bug.h>
>  
> +#include "xe_device.h"
>  #include "xe_kunit_helpers.h"
>  #include "xe_pci_test.h"
>  
>  #define TEST_MAX_VFS	63
>  #define TEST_VRAM	0x7a800000ull	/* random size that works on 32-bit */
>  
> +static bool xe_device_is_admin_only_stub_enable(const struct xe_device *xe)
> +{
> +	return true;
> +}
> +
> +static bool xe_device_is_admin_only_stub_disable(const struct xe_device *xe)
> +{
> +	return false;
> +}
> +
>  static void pf_set_admin_mode(struct xe_device *xe, bool enable)
>  {
> -	/* should match logic of xe_sriov_pf_admin_only() */
> -	xe->sriov.pf.admin_only = enable;
> +	if (enable)
> +		kunit_activate_static_stub(kunit_get_current_test(),
> +					   xe_device_is_admin_only,
> +					   xe_device_is_admin_only_stub_enable);
> +	else
> +		kunit_activate_static_stub(kunit_get_current_test(),
> +					   xe_device_is_admin_only,
> +					   xe_device_is_admin_only_stub_disable);

nit: to avoid some code duplication you can write this as:

	typeof(xe_device_is_admin_only) stub = enable ?
			xe_device_is_admin_only_stub_enable :
			xe_device_is_admin_only_stub_disable;

	kunit_activate_static_stub(kunit_get_current_test(),
				   xe_device_is_admin_only,
				   stub);

> +
>  	KUNIT_EXPECT_EQ(kunit_get_current_test(), enable, xe_sriov_pf_admin_only(xe));
>  }
>  
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index b0bbb079ca8e..f391a1987682 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -17,6 +17,7 @@
>  #include <drm/drm_managed.h>
>  #include <drm/drm_pagemap_util.h>
>  #include <drm/drm_print.h>
> +#include <kunit/static_stub.h>
>  #include <uapi/drm/xe_drm.h>
>  
>  #include "display/xe_display.h"
> @@ -446,6 +447,8 @@ static struct drm_driver admin_only_driver = {
>   */
>  bool xe_device_is_admin_only(const struct xe_device *xe)
>  {
> +	KUNIT_STATIC_STUB_REDIRECT(xe_device_is_admin_only, xe);
> +
>  #ifdef CONFIG_PCI_IOV
>  	return xe->drm.driver == &admin_only_driver;
>  #endif