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

ssv6051 and panel-dsi-simple driver patch for kernel 6.6, 6.9, 6.12 and 6.13 #7795

Merged
merged 2 commits into from
Feb 20, 2025

Conversation

qbisi
Copy link
Contributor

@qbisi qbisi commented Feb 7, 2025

Description

patch for ssv6051 fix build failure on nix sandbox.
patch for panel-dsi-simple fix build failure with gcc14.

Both patch are tested on kernel 6.12 and 6.13 and should work for 6.6 and 6.9 due to unchanged api.

@qbisi qbisi requested a review from igorpecovnik as a code owner February 7, 2025 18:16
@github-actions github-actions bot added size/small PR with less then 50 lines Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Feb 7, 2025
@paolosabatino
Copy link
Contributor

I would keep this on hold until 25.02 is released; @qbisi could you please describe what kind of issue you have and on what platform you are experiencing that? Because I see no particular issues while compiling on regular amd64 containers.

@qbisi
Copy link
Contributor Author

qbisi commented Feb 8, 2025

I just simply pick thouse patch files in building nixos kernel packages. See
https://github.com/qbisi/nixos-images/blob/master/pkgs/kernels/linux-rockchip64-6.12.nix

  1. For old ssv6051 patch, the compiler complains
../drivers/net/wireless/ssv6051/ssvdevice/ssv_cmd.c:22:10: fatal error: ssv6200_reg.h: No such file or directory
   22 | #include <ssv6200_reg.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
...
../drivers/net/wireless/ssv6051/ssvdevice/ssvdevice.c:25:10: fatal error: ssv_cfg.h: No such file or directory
   25 | #include "ssv_cfg.h"
      |          ^~~~~~~~~~~
compilation terminated.

cause makefile of ssv6051 give a non standard include path like -I ${srctree}/${src}/include and nix sandbox build environment cannot handle this correctly. (will be fixed with -I ${src}/include)
2. For apanel-simple-dsi patch, the compiler complains type mismatch of the third parameter on function of_get_drm_display_mode ( u32 offered and u32 * required ). I am also curious why compiling armbian give no issue.

@paolosabatino
Copy link
Contributor

@qbisi thank you for the explanation; changes seems to legitimate to me, but I want to be sure they don't break compilation now that armbian 25.02 is about to be released.

Did you have had the chance to test a compilation of vanilla armbian in docker/virtual machine?

@qbisi
Copy link
Contributor Author

qbisi commented Feb 18, 2025

Rebased and test of building hinlink-h88k-edge image passed.
log-build-fec370ad-77f9-4ce3-85fe-8f9f06b1a12c.log

This image works on my hinlink-h88k machine.

Copy link
Contributor

@amazingfate amazingfate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Now we only use 6.12 and 6.13 for rockchip64 mainline. After this pr is merged I will rebase #7835 based on it.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 05 Milestone: Second quarter release and removed Needs review Seeking for review labels Feb 19, 2025
@igorpecovnik igorpecovnik merged commit 3cdf696 into armbian:main Feb 20, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
05 Milestone: Second quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines
Development

Successfully merging this pull request may close these issues.

4 participants