diff options
| author | Edmund Wu <fangkazuto@gmail.com> | 2018-09-07 19:43:33 -0400 |
|---|---|---|
| committer | Edmund Wu <fangkazuto@gmail.com> | 2018-09-07 19:43:33 -0400 |
| commit | af3fdb44ee43568228ee1b7f4dd5619c87c94f7b (patch) | |
| tree | 77c67bf8bd7047bf3c2f909d3a525f3921c5038f /pkgs/os-specific/linux/nvidia-x11 | |
| parent | 7e405b950b13fafedd1c1e53214b5324ecb4370c (diff) | |
| download | nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.tar nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.tar.gz nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.tar.bz2 nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.tar.lz nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.tar.xz nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.tar.zst nixlib-af3fdb44ee43568228ee1b7f4dd5619c87c94f7b.zip | |
nvidia_x11: include drm_mode_connector patch
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index d9f24874058b..d9ff157e1429 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -22,6 +22,8 @@ rec { sha256_64bit = "07k1kq8lkgbvjyr2dnbxcz6nppcwpq17wf925w8kfq78345hla9q"; settingsSha256 = "0xlaiy7jr95z0v2c6cwll89nxnb142pybw7m08jg44r7n13ffv3r"; persistencedSha256 = "0mhwk321garyl6m12261cj03ycv0qz1sbrlbq6cqwjpq4f1s7h58"; + + patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; }; beta = stable; # not enough interest to maintain beta ATM diff --git a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch new file mode 100644 index 000000000000..58cf06fae45f --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch @@ -0,0 +1,24 @@ +diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c +--- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400 ++++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400 +@@ -226,7 +226,7 @@ + + + if (nv_connector->edid != NULL) { +- drm_mode_connector_update_edid_property( ++ drm_connector_update_edid_property( + connector, nv_connector->edid); + } + +diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c +--- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400 ++++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400 +@@ -216,7 +216,7 @@ + + /* 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( |