diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 21:02:00 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-15 21:02:00 -0400 |
| commit | 2f74610b9b2b1f0aecd1786ecf4bfab791e0b32d (patch) | |
| tree | 4c99f437c26dd0f8deb6ba35cc62a3dbc475f652 | |
| parent | 50c3d245353fc385e5594c3283cc3e5b0b04b850 (diff) | |
| download | longterm-queue-4.18-2f74610b9b2b1f0aecd1786ecf4bfab791e0b32d.tar.gz | |
drm: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch b/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch index 5fa52d9..7f0363c 100644 --- a/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch +++ b/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch @@ -1,4 +1,4 @@ -From fe4ed1b457943113ee1138c939fbdeede4af6cf3 Mon Sep 17 00:00:00 2001 +From 7840e7b2bc4d5ae079adfe5f88c18d2fe8bc06af Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@atomide.com> Date: Thu, 7 Feb 2019 07:45:16 -0800 Subject: [PATCH] drm/omap: dsi: Fix PM for display blank with paired dss_pll @@ -37,10 +37,10 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c -index 5c34fba51975..5202862d89b5 100644 +index d4a680629825..516a7cca75e8 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c -@@ -1342,12 +1342,9 @@ static int dsi_pll_enable(struct dss_pll *pll) +@@ -1386,12 +1386,9 @@ static int dsi_pll_enable(struct dss_pll *pll) */ dsi_enable_scp_clk(dsi); @@ -56,7 +56,7 @@ index 5c34fba51975..5202862d89b5 100644 /* XXX PLL does not come out of reset without this... */ dispc_pck_free_enable(dsi->dss->dispc, 1); -@@ -1372,36 +1369,25 @@ static int dsi_pll_enable(struct dss_pll *pll) +@@ -1416,36 +1413,25 @@ static int dsi_pll_enable(struct dss_pll *pll) return 0; err1: @@ -99,8 +99,8 @@ index 5c34fba51975..5202862d89b5 100644 + DSSDBG("PLL disable done\n"); } - static int dsi_dump_dsi_clocks(struct seq_file *s, void *p) -@@ -4089,11 +4075,11 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) + static void dsi_dump_dsi_clocks(struct dsi_data *dsi, struct seq_file *s) +@@ -4195,11 +4181,11 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) r = dss_pll_enable(&dsi->pll); if (r) @@ -114,7 +114,7 @@ index 5c34fba51975..5202862d89b5 100644 dss_select_dsi_clk_source(dsi->dss, dsi->module_id, dsi->module_id == 0 ? -@@ -4101,6 +4087,14 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) +@@ -4207,6 +4193,14 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) DSSDBG("PLL OK\n"); @@ -129,7 +129,7 @@ index 5c34fba51975..5202862d89b5 100644 r = dsi_cio_init(dsi); if (r) goto err2; -@@ -4129,10 +4123,13 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) +@@ -4235,10 +4229,13 @@ static int dsi_display_init_dsi(struct dsi_data *dsi) err3: dsi_cio_uninit(dsi); err2: @@ -145,7 +145,7 @@ index 5c34fba51975..5202862d89b5 100644 return r; } -@@ -4151,7 +4148,12 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, +@@ -4257,7 +4254,12 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, dss_select_dsi_clk_source(dsi->dss, dsi->module_id, DSS_CLK_SRC_FCK); dsi_cio_uninit(dsi); @@ -158,7 +158,7 @@ index 5c34fba51975..5202862d89b5 100644 + } } - static void dsi_display_enable(struct omap_dss_device *dssdev) + static int dsi_display_enable(struct omap_dss_device *dssdev) -- 2.7.4 |