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.

Sign up for GitHub

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

Jump to bottom

nvidia_x11: 390.77 -> 390.87 #45683

Merged
merged 2 commits into from
Sep 23, 2018
Merged

nvidia_x11: 390.77 -> 390.87 #45683

merged 2 commits into from
Sep 23, 2018
+31 −5

Conversation

eadwu
Copy link
Member

@eadwu eadwu commented Aug 27, 2018 •
edited
Loading

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Aug 27, 2018
@eadwu
Copy link
Member Author

eadwu commented Aug 31, 2018

http://rglinuxtech.com/?p=2391 proposes a solution for 4.19-rc1 though I personally haven't had success with it.

patches = lib.optional (lib.versionAtLeast "4.19" (kernel.version or "0")) ./drm_mode_connector.patch;

with the following patch

diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
--- a/kernel/nvidia-drm/nvidia-drm-connector.c
+++ b/kernel/nvidia-drm/nvidia-drm-connector.c
@@ -226,7 +226,7 @@ static int nv_drm_connector_get_modes(struct drm_connector *connector)


     if (nv_connector->edid != NULL) {
-        drm_mode_connector_update_edid_property(
+        drm_connector_update_edid_property(
             connector, nv_connector->edid);
     }

diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
--- a/kernel/nvidia-drm/nvidia-drm-encoder.c
+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c
@@ -216,7 +216,7 @@ nv_drm_add_encoder(struct drm_device *dev, NvKmsKapiDisplay hDisplay)

     /* Attach encoder and connector */

-    ret = drm_mode_connector_attach_encoder(connector, encoder);
+    ret = drm_connector_attach_encoder(connector, encoder);

     if (ret != 0) {
         NV_DRM_DEV_LOG_ERR(

@xeji
Copy link
Contributor

xeji commented Sep 1, 2018

cc maintainer @vcunat

@eadwu
Copy link
Member Author

eadwu commented Sep 7, 2018 •
edited
Loading

Compiles fine on 4.19.0-rc2 though haven't actually tested this version yet.

Tested it now and seems to work fine.

vcunat
vcunat approved these changes Sep 23, 2018
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Tested running on 18.09 with 4.18 kernel, and building with 4.19 kernel.

@vcunat
Copy link
Member

vcunat commented Sep 23, 2018

I'm sorry this has been lying here for so long.

@xeji xeji merged commit af3fdb4 into NixOS:master Sep 23, 2018
vcunat added a commit that referenced this pull request Sep 23, 2018
@vcunat
Merge #45683: nvidia_x11: 390.77 -> 390.87
d9f7d27
@xeji
Copy link
Contributor

xeji commented Sep 23, 2018

@vcunat this is really weird: github says : "xeji merged commit af3fdb4.." above when it's clearly you who merged this. Do you see this too?

@vcunat
Copy link
Member

vcunat commented Sep 23, 2018

That's currently a very common GitHub error. It used to be rarer and I've reported it once or twice to their support, some year or two ago, but...

@xeji
Copy link
Contributor

xeji commented Sep 23, 2018

Thanks. That really got me scared for a moment...

@vcunat
Copy link
Member

vcunat commented Sep 23, 2018

😄 I tend to push signed merge commits instead of using buttons, so that accountability less likely to be broken by such bugs. (But this bug is still confusing.)

vcunat added a commit that referenced this pull request Sep 29, 2018
@vcunat
Merge #45683: nvidia_x11: 390.77 -> 390.87
fe195c0 
(cherry picked from commit d9f7d27)
@eadwu eadwu deleted the nvidia_x11/390.87 branch November 17, 2020 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@eadwu @xeji @vcunat @GrahamcOfBorg