Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i915: chase new-bus #314

Closed

Conversation

ekhramtsov
Copy link

@ekhramtsov ekhramtsov commented Aug 27, 2024

Chase base 9dbf5b0e6876 ("new-bus: Remove the 'rid' and 'type' arguments from BUS_RELEASE_RESOURCE") and base 2baed46e85d3 ("new-bus: Remove the 'rid' and 'type' arguments from BUS_*ACTIVATE_RESOURCE")

[...]
/tmp/drm-kmod/drivers/gpu/drm/i915/i915_drv.c:240:50: error: too many arguments to function call, expected 3, have 5
  239 |                 BUS_RELEASE_RESOURCE(device_get_parent(vga),
      |                 ~~~~~~~~~~~~~~~~~~~~
  240 |                     dev_priv->drm.dev->bsddev, SYS_RES_MEMORY, dev_priv->mch_res_rid,
      |                                                                ^~~~~~~~~~~~~~~~~~~~~~
  241 |                     dev_priv->mch_res.bsd_res);
      |                     ~~~~~~~~~~~~~~~~~~~~~~~~~
./bus_if.h:520:21: note: 'BUS_RELEASE_RESOURCE' declared here
  520 | static __inline int BUS_RELEASE_RESOURCE(device_t _dev, device_t _child,
      |                     ^                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  521 |                                          struct resource *_res)
      |                                          ~~~~~~~~~~~~~~~~~~~~~
[...]

Chase base 9dbf5b0e6876 ("new-bus: Remove the 'rid' and 'type'
arguments from BUS_RELEASE_RESOURCE") and base 2baed46e85d3
("new-bus: Remove the 'rid' and 'type' arguments from
BUS_*ACTIVATE_RESOURCE")

[...]
/tmp/drm-kmod/drivers/gpu/drm/i915/i915_drv.c:240:50: error: too many arguments to function call, expected 3, have 5
  239 |                 BUS_RELEASE_RESOURCE(device_get_parent(vga),
      |                 ~~~~~~~~~~~~~~~~~~~~
  240 |                     dev_priv->drm.dev->bsddev, SYS_RES_MEMORY, dev_priv->mch_res_rid,
      |                                                                ^~~~~~~~~~~~~~~~~~~~~~
  241 |                     dev_priv->mch_res.bsd_res);
      |                     ~~~~~~~~~~~~~~~~~~~~~~~~~
./bus_if.h:520:21: note: 'BUS_RELEASE_RESOURCE' declared here
  520 | static __inline int BUS_RELEASE_RESOURCE(device_t _dev, device_t _child,
      |                     ^                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  521 |                                          struct resource *_res)
      |                                          ~~~~~~~~~~~~~~~~~~~~~
[...]
@ekhramtsov
Copy link
Author

See freebsd/freebsd-src#1396 for main and stable/14

@evadot
Copy link
Contributor

evadot commented Aug 28, 2024

5.10 isn't supported for main and stable/14, please update to 5.15 or 6.1 (or even 6.6 aka master for main.

@evadot evadot closed this Aug 28, 2024
@ekhramtsov
Copy link
Author

please update to 5.15 or 6.1 (or even 6.6 aka master for main

Irrelevant whether I will or not. This is mainly for testing/bisect by others while not disabling i915 build.

>=5.15 branches are dysfunctional for me and I can't afford downtime at the moment to bisect regressing commits or even attempt (probably futile due to lacking VM knowledge) implementing use_dma_alloc. 5.10-lts serves as a temporarily band-aid.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants