diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2014-08-12 16:30:45 -0400 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2014-08-12 16:31:08 -0400 |
| commit | 0c88b0b7fbe28b63646cf494b36c0b03187eb292 (patch) | |
| tree | 32811999690af77c4ee2685399265138343e4a1c | |
| parent | 1fd75f556a645ecdd4d7ddf6016b056b74d3aa87 (diff) | |
| download | kernel-0c88b0b7fbe28b63646cf494b36c0b03187eb292.tar.gz kernel-0c88b0b7fbe28b63646cf494b36c0b03187eb292.tar.xz kernel-0c88b0b7fbe28b63646cf494b36c0b03187eb292.zip | |
nouveau_platform-fix.patch: handle nouveau_dev() removal
(also fix previous patch... sigh.)
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | nouveau_platform-fix.patch | 13 | ||||
| -rw-r--r-- | tegra-powergate-header-move.patch | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index f1e05118..69c47f30 100644 --- a/kernel.spec +++ b/kernel.spec @@ -637,6 +637,7 @@ Patch26013: acpi-video-Add-use-native-backlight-quirk-for-the-Th.patch Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch Patch27000: tegra-powergate-header-move.patch +Patch27001: nouveau_platform-fix.patch # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel Patch30000: kernel-arm64.patch @@ -1361,6 +1362,7 @@ ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch ApplyPatch 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch ApplyPatch tegra-powergate-header-move.patch +ApplyPatch nouveau_platform-fix.patch %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch @@ -2246,6 +2248,7 @@ fi %changelog * Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org> - tegra-powergate-header-move.patch: deal with armv7hl breakage +- nouveau_platform-fix.patch: handle nouveau_dev() removal * Tue Aug 12 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc0.git4.1 - Add updated crash driver from Dave Anderson and re-enable diff --git a/nouveau_platform-fix.patch b/nouveau_platform-fix.patch new file mode 100644 index 00000000..de618013 --- /dev/null +++ b/nouveau_platform-fix.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/gpu/drm/nouveau/nouveau_platform.c b/drivers/gpu/drm/nouveau/nouveau_platform.c +index 0ffeb50..e53e854 100644 +--- a/drivers/gpu/drm/nouveau/nouveau_platform.c ++++ b/drivers/gpu/drm/nouveau/nouveau_platform.c +@@ -149,7 +149,7 @@ power_down: + static int nouveau_platform_remove(struct platform_device *pdev) + { + struct drm_device *drm_dev = platform_get_drvdata(pdev); +- struct nouveau_device *device = nouveau_dev(drm_dev); ++ struct nouveau_device *device = nv_device(nouveau_drm(dev)->device); + struct nouveau_platform_gpu *gpu = nv_device_to_platform(device)->gpu; + + nouveau_drm_device_remove(drm_dev); diff --git a/tegra-powergate-header-move.patch b/tegra-powergate-header-move.patch index 436ec083..2f053c87 100644 --- a/tegra-powergate-header-move.patch +++ b/tegra-powergate-header-move.patch @@ -7,7 +7,7 @@ index fc3df47..4392190 100644 #include <linux/of_device.h> #include <linux/platform_device.h> -#include <linux/tegra-powergate.h> -+#include <soc/tegra/powergate.h> ++#include <soc/tegra/pmc.h> #include <linux/regulator/consumer.h> #include "ahci.h" |