nouveau_platform-fix.patch: handle nouveau_dev() removal
(also fix previous patch... sigh.)
This commit is contained in:
parent
1fd75f556a
commit
0c88b0b7fb
@ -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
|
Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
|
||||||
|
|
||||||
Patch27000: tegra-powergate-header-move.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
|
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
|
||||||
Patch30000: kernel-arm64.patch
|
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 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
|
||||||
|
|
||||||
ApplyPatch tegra-powergate-header-move.patch
|
ApplyPatch tegra-powergate-header-move.patch
|
||||||
|
ApplyPatch nouveau_platform-fix.patch
|
||||||
|
|
||||||
%if 0%{?aarch64patches}
|
%if 0%{?aarch64patches}
|
||||||
ApplyPatch kernel-arm64.patch
|
ApplyPatch kernel-arm64.patch
|
||||||
@ -2246,6 +2248,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org>
|
* Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org>
|
||||||
- tegra-powergate-header-move.patch: deal with armv7hl breakage
|
- 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
|
* 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
|
- Add updated crash driver from Dave Anderson and re-enable
|
||||||
|
13
nouveau_platform-fix.patch
Normal file
13
nouveau_platform-fix.patch
Normal file
@ -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);
|
@ -7,7 +7,7 @@ index fc3df47..4392190 100644
|
|||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
-#include <linux/tegra-powergate.h>
|
-#include <linux/tegra-powergate.h>
|
||||||
+#include <soc/tegra/powergate.h>
|
+#include <soc/tegra/pmc.h>
|
||||||
#include <linux/regulator/consumer.h>
|
#include <linux/regulator/consumer.h>
|
||||||
#include "ahci.h"
|
#include "ahci.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user