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

kernel: modules: video: drm: fixup 6.6 adaptations #14899

Merged
merged 4 commits into from Mar 15, 2024

Conversation

robimarko
Copy link
Contributor

@robimarko robimarko commented Mar 15, 2024

As part of adding kernel 6.6 support, DRM_EXEC and DRM_SUBALLOC_HELPER were added to the kmod-drm, however these are not used by any kmod we package and currently cause a build failure for mediatek targets.

So, remove both of these for now from the main DRM kmod, package them individually and select for AMDGPU and radeon kmods.

Fixes: 5b08b56 ("kernel: modules: video: adapt for kernel 6.6")

@github-actions github-actions bot added kernel pull request/issue with Linux kernel related changes core packages pull request/issue for core (in-tree) packages labels Mar 15, 2024
@robimarko
Copy link
Contributor Author

@hauke Any chance you could sanity check this?

@KanjiMonster
Copy link
Member

Looking at drivers/gpu/drm, both are non user selectable modules, with DRM_EXEC being selected by amdgpu, xe and powervr, and DRM_SUBALLOC_HELPER by amdgpu.

Since amdgpu seems to be the only one of these being packaged by us currently, these should be moved into drm-amdgpu instead to avoid breaking amdgpu for 6.6.

@robimarko
Copy link
Contributor Author

robimarko commented Mar 15, 2024

Yeah, let me switch to x86 as amdgpu is limited to it only(Hence why it did not fail on mediatek) and try packaging these separately.

And done, now they are selected when required and x86 compiles fine.

@robimarko robimarko changed the title kernel: modules: video: drm: remove DRM_EXEC and DRM_SUBALLOC_HELPER kernel: modules: video: drm: fixup 6.6 adaptations Mar 15, 2024
As part of adding kernel 6.6 support, DRM_EXEC and DRM_SUBALLOC_HELPER were
added to the kmod-drm, however these are only used by drm-amdgpu and
drm-radeon which are only supported on x86.

So, lets start fixing building of other targets by removing these from the
main kmod-drm, in follow-up commits they will be packaged separately and
selected when required.

Fixes: 5b08b56 ("kernel: modules: video: adapt for kernel 6.6")
Signed-off-by: Robert Marko <robimarko@gmail.com>
Linux 6.6 has added DRM EXEC as a separate symbol, so package it separately
as AMDGPU requires it.

Signed-off-by: Robert Marko <robimarko@gmail.com>
Linux 6.4 has split out the previously AMDGPU specific suballocation
helper into a generic one and it has its own symbol now.

So, lets package it as a separate helper as AMDGPU still requires it
for 6.6.

Signed-off-by: Robert Marko <robimarko@gmail.com>
…MDGPU

drm-amdgpu and drm-radeon require drm-exec and/or drm-suballoc-helper in
6.6, so since we have them packaged separately include them when required.

Fixes: 5b08b56 ("kernel: modules: video: adapt for kernel 6.6")
Signed-off-by: Robert Marko <robimarko@gmail.com>
@openwrt-bot openwrt-bot merged commit 8fb2346 into openwrt:main Mar 15, 2024
4 checks passed
@robimarko
Copy link
Contributor Author

Thanks! Rebased on top of main and merged!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core packages pull request/issue for core (in-tree) packages kernel pull request/issue with Linux kernel related changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants