diff options
Diffstat (limited to 'bcm283x-Pull-upstream-fixes-plus-iproc-mmc-driver.patch')
| -rw-r--r-- | bcm283x-Pull-upstream-fixes-plus-iproc-mmc-driver.patch | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/bcm283x-Pull-upstream-fixes-plus-iproc-mmc-driver.patch b/bcm283x-Pull-upstream-fixes-plus-iproc-mmc-driver.patch index 56f2a3981..092e7206a 100644 --- a/bcm283x-Pull-upstream-fixes-plus-iproc-mmc-driver.patch +++ b/bcm283x-Pull-upstream-fixes-plus-iproc-mmc-driver.patch @@ -2288,46 +2288,6 @@ index 6bcf51d..d8b8649 100644 -- 2.7.3 -From d258332b618af0136386d4fb8f738caedae8c71d Mon Sep 17 00:00:00 2001 -From: Dan Carpenter <dan.carpenter@oracle.com> -Date: Tue, 8 Mar 2016 15:09:41 +0300 -Subject: [PATCH 18/36] drm/vc4: Return -EFAULT on copy_from_user() failure - -The copy_from_user() function returns the number of bytes not copied but -we want to return a negative error code. - -Fixes: 463873d57014 ('drm/vc4: Add an API for creating GPU shaders in GEM BOs.') -Cc: stable@vger.kernel.org -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -Reviewed-by: Eric Anholt <eric@anholt.net> -Signed-off-by: Eric Anholt <eric@anholt.net> ---- - drivers/gpu/drm/vc4/vc4_bo.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c -index 22278bc..ac8eafe 100644 ---- a/drivers/gpu/drm/vc4/vc4_bo.c -+++ b/drivers/gpu/drm/vc4/vc4_bo.c -@@ -499,11 +499,12 @@ vc4_create_shader_bo_ioctl(struct drm_device *dev, void *data, - if (IS_ERR(bo)) - return PTR_ERR(bo); - -- ret = copy_from_user(bo->base.vaddr, -+ if (copy_from_user(bo->base.vaddr, - (void __user *)(uintptr_t)args->data, -- args->size); -- if (ret != 0) -+ args->size)) { -+ ret = -EFAULT; - goto fail; -+ } - /* Clear the rest of the memory from allocating from the BO - * cache. - */ --- -2.7.3 - From ed6836e411dd559a811dd063509a01772f4fe00f Mon Sep 17 00:00:00 2001 From: Eric Anholt <eric@anholt.net> Date: Fri, 4 Mar 2016 12:32:07 -0800 @@ -2361,54 +2321,6 @@ index 31de5d1..e6d3c60 100644 -- 2.7.3 -From 142ad4bd29558b85f269a02b74c5149b514acf88 Mon Sep 17 00:00:00 2001 -From: Eric Anholt <eric@anholt.net> -Date: Mon, 15 Feb 2016 19:03:57 -0800 -Subject: [PATCH 20/36] clk: bcm2835: Fix setting of PLL divider clock rates - -Our dividers weren't being set successfully because CM_PASSWORD wasn't -included in the register write. It looks easier to just compute the -divider to write ourselves than to update clk-divider for the ability -to OR in some arbitrary bits on write. - -Fixes about half of the video modes on my HDMI monitor (everything -except 720x400). - -Cc: stable@vger.kernel.org -Signed-off-by: Eric Anholt <eric@anholt.net> -Signed-off-by: Michael Turquette <mturquette@baylibre.com> ---- - drivers/clk/bcm/clk-bcm2835.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 015e687..9f4df8f 100644 ---- a/drivers/clk/bcm/clk-bcm2835.c -+++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1107,13 +1107,15 @@ static int bcm2835_pll_divider_set_rate(struct clk_hw *hw, - struct bcm2835_pll_divider *divider = bcm2835_pll_divider_from_hw(hw); - struct bcm2835_cprman *cprman = divider->cprman; - const struct bcm2835_pll_divider_data *data = divider->data; -- u32 cm; -- int ret; -+ u32 cm, div, max_div = 1 << A2W_PLL_DIV_BITS; - -- ret = clk_divider_ops.set_rate(hw, rate, parent_rate); -- if (ret) -- return ret; -+ div = DIV_ROUND_UP_ULL(parent_rate, rate); -+ -+ div = min(div, max_div); -+ if (div == max_div) -+ div = 0; - -+ cprman_write(cprman, data->a2w_reg, div); - cm = cprman_read(cprman, data->cm_reg); - cprman_write(cprman, data->cm_reg, cm | data->load_mask); - cprman_write(cprman, data->cm_reg, cm & ~data->load_mask); --- -2.7.3 - From 55acd7db60c8247d926969b705373765c26c1f44 Mon Sep 17 00:00:00 2001 From: Martin Sperl <kernel@martin.sperl.org> Date: Fri, 11 Sep 2015 11:22:05 +0000 |