diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-04-02 11:53:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-04-02 14:37:49 +0200 |
| commit | 0dcc4d239da78bc20b091d50c097c386e0e61902 (patch) | |
| tree | 47a71ebb1271cb26429c20e34dcad1f8e3d5e945 /target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch | |
| parent | 1adc6db0362d2fdede68a3f1f3a5f119ca39d30a (diff) | |
| download | mtk-20170518-0dcc4d239da78bc20b091d50c097c386e0e61902.zip mtk-20170518-0dcc4d239da78bc20b091d50c097c386e0e61902.tar.gz mtk-20170518-0dcc4d239da78bc20b091d50c097c386e0e61902.tar.bz2 | |
kernel: update kernel 4.4 to 4.4.59
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch b/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch index d09e6d3..cce4b11 100644 --- a/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch +++ b/target/linux/brcm2708/patches-4.4/0588-drm-vc4-Verify-at-boot-that-CMA-doesn-t-cross-a-256M.patch @@ -14,8 +14,6 @@ Signed-off-by: Eric Anholt <eric@anholt.net> mm/cma.c | 2 ++ 3 files changed, 21 insertions(+) -diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c -index e167a1e1..60f5c25 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c @@ -35,6 +35,7 @@ @@ -26,8 +24,6 @@ index e167a1e1..60f5c25 100644 /* * Default global CMA area size can be defined in kernel's .config. -diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c -index 7cc346a..1d9e5a6 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -16,7 +16,10 @@ @@ -41,7 +37,7 @@ index 7cc346a..1d9e5a6 100644 #include "linux/pm_runtime.h" #include "vc4_drv.h" #include "vc4_regs.h" -@@ -185,8 +188,23 @@ static int vc4_v3d_bind(struct device *dev, struct device *master, void *data) +@@ -185,8 +188,23 @@ static int vc4_v3d_bind(struct device *d struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_v3d *v3d = NULL; @@ -65,11 +61,9 @@ index 7cc346a..1d9e5a6 100644 v3d = devm_kzalloc(&pdev->dev, sizeof(*v3d), GFP_KERNEL); if (!v3d) return -ENOMEM; -diff --git a/mm/cma.c b/mm/cma.c -index bd0e141..efac29b 100644 --- a/mm/cma.c +++ b/mm/cma.c -@@ -47,11 +47,13 @@ phys_addr_t cma_get_base(const struct cma *cma) +@@ -47,11 +47,13 @@ phys_addr_t cma_get_base(const struct cm { return PFN_PHYS(cma->base_pfn); } @@ -83,6 +77,3 @@ index bd0e141..efac29b 100644 static unsigned long cma_bitmap_aligned_mask(const struct cma *cma, int align_order) --- -2.1.4 - |