Sync some ARM patches from F-25 branch
This commit is contained in:
parent
c9d9163df9
commit
c0853e1c3f
2669
AllWinner-net-emac.patch
Normal file
2669
AllWinner-net-emac.patch
Normal file
File diff suppressed because it is too large
Load Diff
43
bcm283x-vc4-fixes.patch
Normal file
43
bcm283x-vc4-fixes.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From 30772942cc1095c3129eecfa182e2c568e566b9d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dan Carpenter <dan.carpenter@oracle.com>
|
||||||
|
Date: Thu, 13 Oct 2016 11:54:31 +0300
|
||||||
|
Subject: [PATCH] drm/vc4: Fix a couple error codes in vc4_cl_lookup_bos()
|
||||||
|
|
||||||
|
If the allocation fails the current code returns success. If
|
||||||
|
copy_from_user() fails it returns the number of bytes remaining instead
|
||||||
|
of -EFAULT.
|
||||||
|
|
||||||
|
Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.")
|
||||||
|
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
|
||||||
|
Reviewed-by: Eric Anholt <eric@anholt.net>
|
||||||
|
---
|
||||||
|
drivers/gpu/drm/vc4/vc4_gem.c | 9 +++++----
|
||||||
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
|
||||||
|
index ae1609e..4050540 100644
|
||||||
|
--- a/drivers/gpu/drm/vc4/vc4_gem.c
|
||||||
|
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
|
||||||
|
@@ -548,14 +548,15 @@ vc4_cl_lookup_bos(struct drm_device *dev,
|
||||||
|
|
||||||
|
handles = drm_malloc_ab(exec->bo_count, sizeof(uint32_t));
|
||||||
|
if (!handles) {
|
||||||
|
+ ret = -ENOMEM;
|
||||||
|
DRM_ERROR("Failed to allocate incoming GEM handles\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ret = copy_from_user(handles,
|
||||||
|
- (void __user *)(uintptr_t)args->bo_handles,
|
||||||
|
- exec->bo_count * sizeof(uint32_t));
|
||||||
|
- if (ret) {
|
||||||
|
+ if (copy_from_user(handles,
|
||||||
|
+ (void __user *)(uintptr_t)args->bo_handles,
|
||||||
|
+ exec->bo_count * sizeof(uint32_t))) {
|
||||||
|
+ ret = -EFAULT;
|
||||||
|
DRM_ERROR("Failed to copy in GEM handles\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.9.3
|
||||||
|
|
@ -198,6 +198,7 @@ CONFIG_TEGRA_ACONNECT=m
|
|||||||
CONFIG_SUNXI_RSB=m
|
CONFIG_SUNXI_RSB=m
|
||||||
CONFIG_AHCI_SUNXI=m
|
CONFIG_AHCI_SUNXI=m
|
||||||
CONFIG_NET_VENDOR_ALLWINNER=y
|
CONFIG_NET_VENDOR_ALLWINNER=y
|
||||||
|
CONFIG_SUN8I_EMAC=m
|
||||||
# CONFIG_SUN4I_EMAC is not set
|
# CONFIG_SUN4I_EMAC is not set
|
||||||
# CONFIG_MDIO_SUN4I is not set
|
# CONFIG_MDIO_SUN4I is not set
|
||||||
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
|
# CONFIG_KEYBOARD_SUN4I_LRADC is not set
|
||||||
|
@ -225,6 +225,7 @@ CONFIG_IR_SUNXI=m
|
|||||||
CONFIG_MDIO_SUN4I=m
|
CONFIG_MDIO_SUN4I=m
|
||||||
CONFIG_DWMAC_SUNXI=m
|
CONFIG_DWMAC_SUNXI=m
|
||||||
CONFIG_SUN4I_EMAC=m
|
CONFIG_SUN4I_EMAC=m
|
||||||
|
CONFIG_SUN8I_EMAC=m
|
||||||
CONFIG_RTC_DRV_SUN6I=m
|
CONFIG_RTC_DRV_SUN6I=m
|
||||||
CONFIG_MTD_NAND_SUNXI=m
|
CONFIG_MTD_NAND_SUNXI=m
|
||||||
CONFIG_SERIO_SUN4I_PS2=m
|
CONFIG_SERIO_SUN4I_PS2=m
|
||||||
|
@ -523,6 +523,10 @@ Patch430: ARM-tegra-usb-no-reset.patch
|
|||||||
|
|
||||||
Patch431: bcm2837-initial-support.patch
|
Patch431: bcm2837-initial-support.patch
|
||||||
|
|
||||||
|
Patch432: bcm283x-vc4-fixes.patch
|
||||||
|
|
||||||
|
Patch433: AllWinner-net-emac.patch
|
||||||
|
|
||||||
Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
|
Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
|
||||||
|
|
||||||
Patch466: input-kill-stupid-messages.patch
|
Patch466: input-kill-stupid-messages.patch
|
||||||
@ -2154,6 +2158,9 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 8 2016 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
|
- Sync some ARM patches from F-25 branch
|
||||||
|
|
||||||
* Mon Nov 07 2016 Laura Abbott <labbott@redhat.com>
|
* Mon Nov 07 2016 Laura Abbott <labbott@redhat.com>
|
||||||
- Enable CONFIG_EXT4_ENCRYPTION (rhbz 1389509)
|
- Enable CONFIG_EXT4_ENCRYPTION (rhbz 1389509)
|
||||||
- Enable CONFIG_NFSD_FLEXFILELAYOUT
|
- Enable CONFIG_NFSD_FLEXFILELAYOUT
|
||||||
|
Loading…
Reference in New Issue
Block a user