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

8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM #16169

Closed
wants to merge 3 commits into from

Conversation

azuev-java
Copy link
Member

@azuev-java azuev-java commented Oct 12, 2023

As a workaround changing the method that filters out valid resolutions to not allow resolutions unsupported by Apple m1/m2 chips to be reported back to Java side.

Also removing test from problem list as it should pass again now.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16169/head:pull/16169
$ git checkout pull/16169

Update a local copy of the PR:
$ git checkout pull/16169
$ git pull https://git.openjdk.org/jdk.git pull/16169/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16169

View PR using the GUI difftool:
$ git pr show -t 16169

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16169.diff

Webrev

Link to Webrev Comment

…cOS 11 ARM

As a workaround changing the method that filters out valid resolutions
to not allow resolutions unsupported by Apple m1/m2 chips to be
reported back to Java side.
Also removing test from problem list as it should pass again now.
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 12, 2023

👋 Welcome back kizune! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 12, 2023
@openjdk
Copy link

openjdk bot commented Oct 12, 2023

@azuev-java The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Oct 12, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 12, 2023

Webrevs

static BOOL isValidDisplayMode(CGDisplayModeRef mode) {
// Workaround for apple bug FB13261205, since it only affects arm based macs
// and arm support started with macOS 11 ignore the workaround for previous versions
if (@available(macOS 11, *)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI there's a PR out to make macos 11 the minimum for JDK 22
#16155, but this check would be needed in any backport.

@openjdk
Copy link

openjdk bot commented Oct 12, 2023

@azuev-java This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8266242: java/awt/GraphicsDevice/CheckDisplayModes.java failing on macOS 11 ARM

Reviewed-by: prr, azvegint, aivanov

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 21 new commits pushed to the master branch:

  • 77fa44f: 8317847: Typo in API documentation of class JPopupMenu
  • 0983b54: 8318038: ProblemList runtime/CompressedOops/CompressedClassPointers.java on two platforms
  • 64ee3c9: 8317266: Move nmethod::check_all_dependencies to codeCache.cpp and mark it NOT_PRODUCT
  • 32ac72c: 8312522: Implementation of Foreign Function & Memory API
  • 9728e21: 8317967: Enhance test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java to handle default cases
  • a8473b7: 8317336: Assertion error thrown during 'this' escape analysis
  • 16fd43c: 8316693: Simplify at-requires checkDockerSupport()
  • c1f698d: 8317956: Make jdk.internal.util.Architecture current architecture final
  • 9355431: 8316426: Optimization for HexFormat.formatHex
  • 32ccf01: 8317772: NMT: Make peak values available in release builds
  • ... and 11 more: https://git.openjdk.org/jdk/compare/8d2ad2b1ae37d2411649e35d4000b0fe873facdb...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 12, 2023
@@ -35,6 +35,7 @@
#define DEFAULT_DEVICE_HEIGHT 768
#define DEFAULT_DEVICE_DPI 72

static NSInteger architecture = -1;
Copy link
Member

Choose a reason for hiding this comment

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

This is optional, but since the architecture variable is only used in isValidDisplayMode, it can be declared static inside the method itself.

@azuev-java
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 13, 2023

Going to push as commit f7d6d7a.
Since your change was applied there have been 42 commits pushed to the master branch:

  • e942f36: 8317535: Shenandoah: Remove unused code
  • 7cb2e6d: 8317514: Ensure MemorySegment is initialized before touching NativeMemorySegmentImpl
  • 9622de2: 8317372: Refactor some NumberFormat tests to use JUnit
  • 72c4dcb: 8317970: Bump target macosx-x64 version to 11.00.00
  • 32a60cf: 8317824: Beef up javadoc for base offset in var handles derived from layouts (mainline)
  • b12c471: 8317837: Leftover FFM implementation-only changes
  • 605c976: 8318039: GHA: Bump macOS and Xcode versions
  • 6273ab9: 8317808: HTTP/2 stream cancelImpl may leave subscriber registered
  • 7d31146: 8318028: Remove unused class="centered" from FocusCycle.svg
  • 45b7aed: 8317433: Async UL: Only grab lock once when write():ing
  • ... and 32 more: https://git.openjdk.org/jdk/compare/8d2ad2b1ae37d2411649e35d4000b0fe873facdb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 13, 2023
@openjdk openjdk bot closed this Oct 13, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 13, 2023
@openjdk
Copy link

openjdk bot commented Oct 13, 2023

@azuev-java Pushed as commit f7d6d7a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client client-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants