diff options
| author | Jesse Hall <jessehall@google.com> | 2021-06-07 21:57:32 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2021-06-07 21:57:32 -0700 |
| commit | b4f227d1905ae5b96e7af36a6145765204d3d19a (patch) | |
| tree | 76519bfb3e20a6f9035943abb3b163794931f66e /mali_pixel/mali_pixel_mod.c | |
| parent | 2a59ad85558be15c11a7c076c373031272c53433 (diff) | |
| download | gpu-b4f227d1905ae5b96e7af36a6145765204d3d19a.tar.gz | |
mali_pixel: allow building without pixel stats
Bug: 190389925
Signed-off-by: Jesse Hall <jessehall@google.com>
Change-Id: I212815b4170900d62cd06ac517777ba36e01ae43
Diffstat (limited to 'mali_pixel/mali_pixel_mod.c')
| -rw-r--r-- | mali_pixel/mali_pixel_mod.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/mali_pixel/mali_pixel_mod.c b/mali_pixel/mali_pixel_mod.c index 19e9f71..8f4442c 100644 --- a/mali_pixel/mali_pixel_mod.c +++ b/mali_pixel/mali_pixel_mod.c @@ -7,34 +7,14 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Pixel platform integration for GPU"); MODULE_AUTHOR("<sidaths@google.com>"); MODULE_VERSION("1.0"); -MODULE_SOFTDEP("pre: pixel_stat_sysfs"); - -extern struct kobject *pixel_stat_kobj; - -struct kobject *pixel_stat_gpu_kobj; - -static int mali_pixel_init_pixel_stats(void) -{ - struct kobject *pixel_stat = pixel_stat_kobj; - - WARN_ON(pixel_stat_kobj == NULL); - - pixel_stat_gpu_kobj = kobject_create_and_add("gpu", pixel_stat); - if (!pixel_stat_gpu_kobj) - return -ENOMEM; - - return 0; -} static int __init mali_pixel_init(void) { int ret = 0; - /* The Pixel Stats Sysfs module needs to be loaded first */ - if (pixel_stat_kobj == NULL) - return -EPROBE_DEFER; - +#ifdef CONFIG_MALI_PIXEL_STATS ret = mali_pixel_init_pixel_stats(); +#endif if (ret) goto fail_pixel_stats; @@ -46,7 +26,6 @@ static int __init mali_pixel_init(void) #ifdef CONFIG_MALI_PRIORITY_CONTROL_MANAGER ret = platform_driver_register(&priority_control_manager_driver); -#else #endif if (ret) goto fail_pcm; |