diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 11:23:36 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 11:23:36 -0400 |
| commit | 789faf9daf15ebdd1ce5663a2d08bca39158445d (patch) | |
| tree | 2a477c1bda0cca51fb08fa0b045ba5a17ca3ad19 | |
| parent | bf4fffd69fe7a01feb6e9b33f2f960e416c7024e (diff) | |
| download | longterm-queue-4.12-789faf9daf15ebdd1ce5663a2d08bca39158445d.tar.gz | |
drm: sun4i ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-sun4i-Fix-error-path-handling.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/drm-sun4i-Fix-error-path-handling.patch b/queue/drm-sun4i-Fix-error-path-handling.patch index b958664..71b5755 100644 --- a/queue/drm-sun4i-Fix-error-path-handling.patch +++ b/queue/drm-sun4i-Fix-error-path-handling.patch @@ -1,4 +1,4 @@ -From 92411f6d7f1afcc95e54295d40e96a75385212ec Mon Sep 17 00:00:00 2001 +From 4bde918a3eac902736f4afee58e101ee59d59b6c Mon Sep 17 00:00:00 2001 From: Maxime Ripard <maxime.ripard@free-electrons.com> Date: Thu, 7 Dec 2017 16:58:50 +0100 Subject: [PATCH] drm/sun4i: Fix error path handling @@ -19,12 +19,13 @@ Fixes: 4c7f16d14a33 ("drm/sun4i: Fix TCON clock and regmap initialization sequen Reviewed-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Link: https://patchwork.freedesktop.org/patch/msgid/f83c1cebc731f0b4251f5ddd7b38c718cd79bb0b.1512662253.git-series.maxime.ripard@free-electrons.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c -index e122f5b2a395..f4284b51bdca 100644 +index 9a83a85529ac..60bb803e4fa6 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c -@@ -724,12 +724,12 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, +@@ -463,12 +463,12 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, if (IS_ERR(tcon->crtc)) { dev_err(dev, "Couldn't create our CRTC\n"); ret = PTR_ERR(tcon->crtc); @@ -37,8 +38,8 @@ index e122f5b2a395..f4284b51bdca 100644 - goto err_free_clocks; + goto err_free_dotclock; - if (tcon->quirks->needs_de_be_mux) { - /* + return 0; + -- 2.15.0 |