Skip to contentSkip to conversation

lib/ioctl_wrappers: Delete gem_total_mappable_size()

PATCH In review Ashutosh Dixit 3 participants 3 messages Apr 27, 2020 Library code

lore
Share & tools
lore

Ashutosh Dixit

author
#0 lore raw

PATCH 1/1 lib/ioctl_wrappers: Delete gem_total_mappable_size()

gem_total_mappable_size() has no callers and calls the DRM_I915_GEM_GET_APERTURE ioctl using 'struct local_i915_gem_get_aperture' which has fields which are unsupported in the kernel. Delete the function.

Signed-off-by Ashutosh Dixit <[email protected]>
---
 lib/ioctl_wrappers.c | 17 -----------------
 lib/ioctl_wrappers.h |  1 -
 2 files changed, 18 deletions(-)
lib/ioctl_wrappers.c +0 -17
index 627717d2b..25d04b3e6 100644
@@ -980,23 +980,6 @@ struct local_i915_gem_get_aperture {
 };
 #define DRM_I915_GEM_GET_APERTURE	0x23
 #define LOCAL_IOCTL_I915_GEM_GET_APERTURE DRM_IOR  (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct local_i915_gem_get_aperture)
-/**
- * gem_total_mappable_size:
- * @fd: open i915 drm file descriptor
- *
- * Feature test macro to query the kernel for the total mappable size.
- *
- * Returns: Total mappable address space size.
- */
-uint64_t gem_total_mappable_size(int fd)
-{
-	struct local_i915_gem_get_aperture aperture;
-
-	memset(&aperture, 0, sizeof(aperture));
-	do_ioctl(fd, LOCAL_IOCTL_I915_GEM_GET_APERTURE, &aperture);
-
-	return aperture.map_total_size;
-}
 
 /**
  * gem_total_stolen_size:
lib/ioctl_wrappers.h +0 -1
index 9b29fce81..799d90266 100644
@@ -132,7 +132,6 @@ int gem_gpu_reset_type(int fd);
 bool gem_gpu_reset_enabled(int fd);
 bool gem_engine_reset_enabled(int fd);
 int gem_available_fences(int fd);
-uint64_t gem_total_mappable_size(int fd);
 uint64_t gem_total_stolen_size(int fd);
 uint64_t gem_available_aperture_size(int fd);
 uint64_t gem_aperture_size(int fd);
Signature · 6 lines
2.26.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Reviewed-by on v1 1/1
#1 lore raw

Quoting Ashutosh Dixit (2020-04-27 16:51:38)

Quoted 6 lines

gem_total_mappable_size() has no callers and calls the DRM_I915_GEM_GET_APERTURE ioctl using 'struct local_i915_gem_get_aperture' which has fields which are unsupported in the kernel. Delete the function.

Signed-off-by Ashutosh Dixit <[email protected]>

True. Still hardcoded where it matters most, for shame.

Reviewed-by Chris Wilson <[email protected]>

-Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

CI
#2 lore raw

[igt-dev] ✗ Fi.CI.BAT: failure for lib/ioctl_wrappers: Delete gem_total_mappable_size()

In reply to Ashutosh Dixit
== Series Details ==

== Series Details ==

Series: lib/ioctl_wrappers: Delete gem_total_mappable_size()
URL : https://patchwork.freedesktop.org/series/76560/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_8373 -> IGTPW_4510
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_4510 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_4510, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_4510:

### IGT changes ###

#### Possible regressions ####

* igt@i915_selftest@live@execlists:
- fi-icl-guc: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-icl-guc/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-icl-guc/igt@i915_selftest@[email protected]

Known issues
------------

Here are the changes found in IGTPW_4510 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@gt_pm:
- fi-hsw-4770: [PASS][3] -> [DMESG-FAIL][4] ([i915#1791])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-hsw-4770/igt@i915_selftest@live@gt_pm.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-hsw-4770/igt@i915_selftest@live@gt_pm.html

#### Possible fixes ####

* igt@i915_selftest@live@gt_lrc:
- fi-bwr-2160: [INCOMPLETE][5] ([i915#489]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-bwr-2160/igt@i915_selftest@live@gt_lrc.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-bwr-2160/igt@i915_selftest@live@gt_lrc.html

* igt@i915_selftest@live@gt_pm:
- fi-kbl-x1275: [DMESG-FAIL][7] ([i915#1791]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-kbl-x1275/igt@i915_selftest@live@gt_pm.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-kbl-x1275/igt@i915_selftest@live@gt_pm.html
- fi-icl-u2: [DMESG-FAIL][9] -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-icl-u2/igt@i915_selftest@live@gt_pm.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-icl-u2/igt@i915_selftest@live@gt_pm.html
- fi-skl-lmem: [DMESG-FAIL][11] ([i915#1791]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-skl-lmem/igt@i915_selftest@live@gt_pm.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-skl-lmem/igt@i915_selftest@live@gt_pm.html

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [FAIL][13] -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-kbl-7500u/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-kbl-7500u/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][15] ([i915#227]) -> [PASS][16] +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8373/fi-kbl-7500u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/fi-kbl-7500u/igt@[email protected]

[i915#1791]: https://gitlab.freedesktop.org/drm/intel/issues/1791
[i915#227]: https://gitlab.freedesktop.org/drm/intel/issues/227
[i915#489]: https://gitlab.freedesktop.org/drm/intel/issues/489

Participating hosts (49 -> 43)
------------------------------

Missing (6): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5612 -> IGTPW_4510

CI-20190529: 20190529
CI_DRM_8373: 9d63a10e83b2d271007e281fe875d6f650a1849e @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4510: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/index.html
IGT_5612: c8dc1fd926a550308b971ca7d83fe0a927a38152 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4510/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev