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

rockchip-rk3588-edge: update to v6.13-rc1 #7560

Closed
wants to merge 4 commits into from

Conversation

efectn
Copy link
Member

@efectn efectn commented Dec 10, 2024

Description

  • Update rockchip-rk3588 edge kernel to v6.13-rc1
  • Update HDMI patches from recent changes (HDMI1 and display mode support stuff)
  • Remove some mainlined patches
  • Remove orangepi5 and nanopir6 devicetrees and converts missing changes to patches

GitHub issue reference:
Jira reference number [AR-9999]

Documentation summary for feature / change

Please delete this section if entry to main documentation is not needed.

If documentation entry is predicted, please provide key elements for further implementation into main documentation and set label to "Needs Documentation". You are welcome to open a PR to documentation or you can leave following information for technical writer:

  • short description (copy / paste of PR title)
  • summary (description relevant for end users)
  • example of usage (how to see this in function)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • Orange Pi5 works. All USB ports and HDMI output are working
  • Test HDMI1 with OPI5+ by adding devicetree node for that
  • Test other boards

Checklist:

Please delete options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@efectn efectn requested a review from igorpecovnik as a code owner December 10, 2024 21:14
@github-actions github-actions bot added size/large PR with 250 lines or more Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Dec 10, 2024
@amazingfate
Copy link
Contributor

I have a plan to merge rockchip-rk3588 to rockchip64 since mainline support for rk3588 is at good state since v6.12.
TODO steps:

  • update hdmi display mode patches of rockchip-rk3588 on 6.12
  • merge patches and kernel config from rockchip-rk3588 to rockchip64
  • bump rockchip64-current to 6.12
  • bump rockchip64-edge to 6.13

@efectn
Copy link
Member Author

efectn commented Dec 11, 2024

I have a plan to merge rockchip-rk3588 to rockchip64 since mainline support for rk3588 is at good state since v6.12. TODO steps:

  • update hdmi display mode patches of rockchip-rk3588 on 6.12
  • merge patches and kernel config from rockchip-rk3588 to rockchip64
  • bump rockchip64-current to 6.12
  • bump rockchip64-edge to 6.13

I think we can do it when 6.13 is released

@amazingfate
Copy link
Contributor

I have a plan to merge rockchip-rk3588 to rockchip64 since mainline support for rk3588 is at good state since v6.12. TODO steps:

  • update hdmi display mode patches of rockchip-rk3588 on 6.12
  • merge patches and kernel config from rockchip-rk3588 to rockchip64
  • bump rockchip64-current to 6.12
  • bump rockchip64-edge to 6.13

I think we can do it when 6.13 is released

I wish this could be done before bumping rockchip64-edge and rockchip-rk3588-edge. So we can do less work, work one time for two families.

@efectn
Copy link
Member Author

efectn commented Dec 11, 2024

I have a plan to merge rockchip-rk3588 to rockchip64 since mainline support for rk3588 is at good state since v6.12. TODO steps:

  • update hdmi display mode patches of rockchip-rk3588 on 6.12
  • merge patches and kernel config from rockchip-rk3588 to rockchip64
  • bump rockchip64-current to 6.12
  • bump rockchip64-edge to 6.13

I think we can do it when 6.13 is released

I wish this could be done before bumping rockchip64-edge and rockchip-rk3588-edge. So we can do less work, work one time for two families.

I think it would be eaiser to merge both families when they both have been bumped to 6.13. however i can merge them for 6.13-rc1 anyway after rockchip64-current gets 6.12

@rpardini
Copy link
Member

I had similar effort on my tree. With the landing of #7566 this will need rework, of course; the good part is that we'd be doing the 6.13 bump once for all rockchips.

@rpardini rpardini added Work in progress Unfinished / work in progress and removed Needs review Seeking for review labels Dec 21, 2024
@amazingfate
Copy link
Contributor

I have deleted dir rockchip-rk3588-6.12 in my branch so that we can have a clear overview on what is changed:
amazingfate/build@08e7bba...2fd60b2

@amazingfate amazingfate mentioned this pull request Dec 23, 2024
6 tasks
@efectn efectn closed this Dec 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... size/large PR with 250 lines or more Work in progress Unfinished / work in progress
Development

Successfully merging this pull request may close these issues.

3 participants