Merge pull request #4400 from Kwiboo/rk-5.7

Rockchip: linux: update patches for 5.7

projects/Rockchip/patches/linux/default/linux-0021-drm-from-5.8.patch

@@ -1,4 +1,4 @@
-From 064ad063cb8d2542f32e2ecd1b3f5ec6924f2b0c Mon Sep 17 00:00:00 2001
+From abd39f808afe2c9a6174dc4b69d18972eb3a3ce1 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Sat, 22 Feb 2020 10:42:06 +0800
 Subject: [PATCH] drm/lima: save process info for debug usage
@@ -53,7 +53,7 @@ index 6154e5c9bfe4..74e2be09090f 100644
  
  struct lima_ctx_mgr {
 
-From 7c69866883cde01c17b0c29dae3d94fdc17b5bf9 Mon Sep 17 00:00:00 2001
+From 6bd6464811e273f2a7762e61d58de95dcb83150f Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Sat, 22 Feb 2020 10:42:07 +0800
 Subject: [PATCH] drm/lima: add max_error_tasks module parameter
@@ -105,7 +105,7 @@ index f492ecc6a5d9..fdbd4077c768 100644
  struct lima_vm;
  struct lima_bo;
 
-From 070b06f9488d12e2a5d4555476588980161c44c2 Mon Sep 17 00:00:00 2001
+From ebf8e20f3660b300f5fbd4b1731d61c2221234a6 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Sat, 7 Mar 2020 21:44:23 +0800
 Subject: [PATCH] drm/lima: save task info dump when task fail
@@ -449,7 +449,7 @@ index d64393fb50a9..a1496cb7bc41 100644
  	struct drm_sched_job base;
  
 
-From 7471965e2ec9aff125024800138aea82e3861832 Mon Sep 17 00:00:00 2001
+From ac6495c5c05c06f4e84fe746ec11227b99f127ba Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Sat, 22 Feb 2020 10:42:09 +0800
 Subject: [PATCH] drm/lima: add error sysfs to export error task dump
@@ -586,7 +586,7 @@ index e235d4545b6c..97ed70c36340 100644
  	lima_device_fini(ldev);
  	drm_dev_put(ddev);
 
-From e90d2f007f7e6179ef8b9d15b6d9d6700329ad53 Mon Sep 17 00:00:00 2001
+From 1cccc638000e02f6dc64ad2707a9c2a2458cb283 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Sat, 7 Mar 2020 21:54:38 +0800
 Subject: [PATCH] drm/lima: add trace point for tasks
@@ -747,7 +747,265 @@ index 000000000000..3a430e93d384
 +#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/lima
 +#include <trace/define_trace.h>
 
-From 2da1774e24feaa9de132e7e7c19d6984c893509c Mon Sep 17 00:00:00 2001
+From ab3fb4a5301fa97b5ccdb8c66906a3dd6d73488c Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Thu, 5 Mar 2020 00:25:10 +0100
+Subject: [PATCH] drm/bridge: dw-hdmi: do not force "none" scan mode
+
+Setting scan mode to "none" confuses some TVs like LG B8, which randomly
+change overscan percentage over time. Digital outputs like HDMI and DVI,
+handled by this controller, don't really need overscan, so we can always
+set scan mode to underscan. Actually, this is exactly what
+drm_hdmi_avi_infoframe_from_display_mode() already does, so we can just
+remove offending line.
+
+Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
+Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
+[updated commit message]
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+Link: https://patchwork.freedesktop.org/patch/msgid/20200304232512.51616-3-jernej.skrabec@siol.net
+(cherry picked from commit 6b633e3efbb45b574bdd803ebdddc8e010758a95)
+---
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+index 383b1073d7de..cb4d7bed2d9c 100644
+--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+@@ -1654,8 +1654,6 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
+ 			HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
+ 	}
+ 
+-	frame.scan_mode = HDMI_SCAN_MODE_NONE;
+-
+ 	/*
+ 	 * The Designware IP uses a different byte format from standard
+ 	 * AVI info frames, though generally the bits are in the correct
+
+From bf75586c3a0f9f2c4eb81150aba797a5ba4b94c8 Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@siol.net>
+Date: Thu, 5 Mar 2020 00:25:11 +0100
+Subject: [PATCH] drm/bridge: dw-hdmi: Add support for RGB limited range
+
+CEA 861 standard requestis that RGB quantization range is "limited" for
+CEA modes. Support that by adding CSC matrix which downscales values.
+
+This allows proper color reproduction on TV and PC monitor at the same
+time. In future, override property can be added, like "Broadcast RGB"
+in i915 driver.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+Link: https://patchwork.freedesktop.org/patch/msgid/20200304232512.51616-4-jernej.skrabec@siol.net
+(cherry picked from commit 86af379ebca2ef0b01d998a49e531cd495dcf9a3)
+---
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 63 ++++++++++++++++++++++---------
+ 1 file changed, 46 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+index cb4d7bed2d9c..164ee8c353ab 100644
+--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+@@ -92,6 +92,12 @@ static const u16 csc_coeff_rgb_in_eitu709[3][4] = {
+ 	{ 0x6756, 0x78ab, 0x2000, 0x0200 }
+ };
+ 
++static const u16 csc_coeff_rgb_full_to_rgb_limited[3][4] = {
++	{ 0x1b7c, 0x0000, 0x0000, 0x0020 },
++	{ 0x0000, 0x1b7c, 0x0000, 0x0020 },
++	{ 0x0000, 0x0000, 0x1b7c, 0x0020 }
++};
++
+ struct hdmi_vmode {
+ 	bool mdataenablepolarity;
+ 
+@@ -109,6 +115,7 @@ struct hdmi_data_info {
+ 	unsigned int pix_repet_factor;
+ 	unsigned int hdcp_enable;
+ 	struct hdmi_vmode video_mode;
++	bool rgb_limited_range;
+ };
+ 
+ struct dw_hdmi_i2c {
+@@ -956,7 +963,11 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi)
+ 
+ static int is_color_space_conversion(struct dw_hdmi *hdmi)
+ {
+-	return hdmi->hdmi_data.enc_in_bus_format != hdmi->hdmi_data.enc_out_bus_format;
++	return (hdmi->hdmi_data.enc_in_bus_format !=
++			hdmi->hdmi_data.enc_out_bus_format) ||
++	       (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format) &&
++		hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) &&
++		hdmi->hdmi_data.rgb_limited_range);
+ }
+ 
+ static int is_color_space_decimation(struct dw_hdmi *hdmi)
+@@ -986,25 +997,27 @@ static int is_color_space_interpolation(struct dw_hdmi *hdmi)
+ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi)
+ {
+ 	const u16 (*csc_coeff)[3][4] = &csc_coeff_default;
++	bool is_input_rgb, is_output_rgb;
+ 	unsigned i;
+ 	u32 csc_scale = 1;
+ 
+-	if (is_color_space_conversion(hdmi)) {
+-		if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
+-			if (hdmi->hdmi_data.enc_out_encoding ==
+-						V4L2_YCBCR_ENC_601)
+-				csc_coeff = &csc_coeff_rgb_out_eitu601;
+-			else
+-				csc_coeff = &csc_coeff_rgb_out_eitu709;
+-		} else if (hdmi_bus_fmt_is_rgb(
+-					hdmi->hdmi_data.enc_in_bus_format)) {
+-			if (hdmi->hdmi_data.enc_out_encoding ==
+-						V4L2_YCBCR_ENC_601)
+-				csc_coeff = &csc_coeff_rgb_in_eitu601;
+-			else
+-				csc_coeff = &csc_coeff_rgb_in_eitu709;
+-			csc_scale = 0;
+-		}
++	is_input_rgb = hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format);
++	is_output_rgb = hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format);
++
++	if (!is_input_rgb && is_output_rgb) {
++		if (hdmi->hdmi_data.enc_out_encoding == V4L2_YCBCR_ENC_601)
++			csc_coeff = &csc_coeff_rgb_out_eitu601;
++		else
++			csc_coeff = &csc_coeff_rgb_out_eitu709;
++	} else if (is_input_rgb && !is_output_rgb) {
++		if (hdmi->hdmi_data.enc_out_encoding == V4L2_YCBCR_ENC_601)
++			csc_coeff = &csc_coeff_rgb_in_eitu601;
++		else
++			csc_coeff = &csc_coeff_rgb_in_eitu709;
++		csc_scale = 0;
++	} else if (is_input_rgb && is_output_rgb &&
++		   hdmi->hdmi_data.rgb_limited_range) {
++		csc_coeff = &csc_coeff_rgb_full_to_rgb_limited;
+ 	}
+ 
+ 	/* The CSC registers are sequential, alternating MSB then LSB */
+@@ -1614,6 +1627,18 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
+ 	drm_hdmi_avi_infoframe_from_display_mode(&frame,
+ 						 &hdmi->connector, mode);
+ 
++	if (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) {
++		drm_hdmi_avi_infoframe_quant_range(&frame, &hdmi->connector,
++						   mode,
++						   hdmi->hdmi_data.rgb_limited_range ?
++						   HDMI_QUANTIZATION_RANGE_LIMITED :
++						   HDMI_QUANTIZATION_RANGE_FULL);
++	} else {
++		frame.quantization_range = HDMI_QUANTIZATION_RANGE_DEFAULT;
++		frame.ycc_quantization_range =
++			HDMI_YCC_QUANTIZATION_RANGE_LIMITED;
++	}
++
+ 	if (hdmi_bus_fmt_is_yuv444(hdmi->hdmi_data.enc_out_bus_format))
+ 		frame.colorspace = HDMI_COLORSPACE_YUV444;
+ 	else if (hdmi_bus_fmt_is_yuv422(hdmi->hdmi_data.enc_out_bus_format))
+@@ -2117,6 +2142,10 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode)
+ 	if (hdmi->hdmi_data.enc_out_bus_format == MEDIA_BUS_FMT_FIXED)
+ 		hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24;
+ 
++	hdmi->hdmi_data.rgb_limited_range = hdmi->sink_is_hdmi &&
++		drm_default_rgb_quant_range(mode) ==
++		HDMI_QUANTIZATION_RANGE_LIMITED;
++
+ 	hdmi->hdmi_data.pix_repet_factor = 0;
+ 	hdmi->hdmi_data.hdcp_enable = 0;
+ 	hdmi->hdmi_data.video_mode.mdataenablepolarity = true;
+
+From cc76b13e07c2e7900bf2963f23fb469517dfa1ec Mon Sep 17 00:00:00 2001
+From: Jernej Skrabec <jernej.skrabec@siol.net>
+Date: Thu, 5 Mar 2020 00:25:12 +0100
+Subject: [PATCH] drm/bridge: dw-hdmi: rework csc related functions
+
+is_color_space_conversion() is a misnomer. It checks not only if color
+space conversion is needed, but also if format conversion is needed.
+This is actually desired behaviour because result of this function
+determines if CSC block should be enabled or not (CSC block can also do
+format conversion).
+
+In order to clear misunderstandings, let's rework
+is_color_space_conversion() to do exactly what is supposed to do and add
+another function which will determine if CSC block must be enabled or
+not.
+
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
+Link: https://patchwork.freedesktop.org/patch/msgid/20200304232512.51616-5-jernej.skrabec@siol.net
+(cherry picked from commit 0e8003076aca7b29c868e923e73f332cca12ed8b)
+---
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 +++++++++++++++++++++----------
+ 1 file changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+index 164ee8c353ab..30681398cfb0 100644
+--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
++++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+@@ -963,11 +963,14 @@ static void hdmi_video_sample(struct dw_hdmi *hdmi)
+ 
+ static int is_color_space_conversion(struct dw_hdmi *hdmi)
+ {
+-	return (hdmi->hdmi_data.enc_in_bus_format !=
+-			hdmi->hdmi_data.enc_out_bus_format) ||
+-	       (hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_in_bus_format) &&
+-		hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format) &&
+-		hdmi->hdmi_data.rgb_limited_range);
++	struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data;
++	bool is_input_rgb, is_output_rgb;
++
++	is_input_rgb = hdmi_bus_fmt_is_rgb(hdmi_data->enc_in_bus_format);
++	is_output_rgb = hdmi_bus_fmt_is_rgb(hdmi_data->enc_out_bus_format);
++
++	return (is_input_rgb != is_output_rgb) ||
++	       (is_input_rgb && is_output_rgb && hdmi_data->rgb_limited_range);
+ }
+ 
+ static int is_color_space_decimation(struct dw_hdmi *hdmi)
+@@ -994,6 +997,13 @@ static int is_color_space_interpolation(struct dw_hdmi *hdmi)
+ 	return 0;
+ }
+ 
++static bool is_csc_needed(struct dw_hdmi *hdmi)
++{
++	return is_color_space_conversion(hdmi) ||
++	       is_color_space_decimation(hdmi) ||
++	       is_color_space_interpolation(hdmi);
++}
++
+ static void dw_hdmi_update_csc_coeffs(struct dw_hdmi *hdmi)
+ {
+ 	const u16 (*csc_coeff)[3][4] = &csc_coeff_default;
+@@ -2033,18 +2043,19 @@ static void dw_hdmi_enable_video_path(struct dw_hdmi *hdmi)
+ 	hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);
+ 
+ 	/* Enable csc path */
+-	if (is_color_space_conversion(hdmi)) {
++	if (is_csc_needed(hdmi)) {
+ 		hdmi->mc_clkdis &= ~HDMI_MC_CLKDIS_CSCCLK_DISABLE;
+ 		hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);
+-	}
+ 
+-	/* Enable color space conversion if needed */
+-	if (is_color_space_conversion(hdmi))
+ 		hdmi_writeb(hdmi, HDMI_MC_FLOWCTRL_FEED_THROUGH_OFF_CSC_IN_PATH,
+ 			    HDMI_MC_FLOWCTRL);
+-	else
++	} else {
++		hdmi->mc_clkdis |= HDMI_MC_CLKDIS_CSCCLK_DISABLE;
++		hdmi_writeb(hdmi, hdmi->mc_clkdis, HDMI_MC_CLKDIS);
++
+ 		hdmi_writeb(hdmi, HDMI_MC_FLOWCTRL_FEED_THROUGH_OFF_CSC_BYPASS,
+ 			    HDMI_MC_FLOWCTRL);
++	}
+ }
+ 
+ /* Workaround to clear the overflow condition */
+
+From 42c7d0e07348361a6d5d12a5012c8f4845d7a740 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
 Date: Thu, 19 Mar 2020 21:34:27 +0100
 Subject: [PATCH] drm/lima: Add optional devfreq and cooling device support
@@ -1252,7 +1510,7 @@ index 02dfa14d7083..90f03c48ef4a 100644
  	struct lima_vm *current_vm;
  
 
-From 7821c61008707e65dd0ade8d814e315f57d103c7 Mon Sep 17 00:00:00 2001
+From a88d271097a216df71ea1e105229896993bb416d Mon Sep 17 00:00:00 2001
 From: Robin Murphy <robin.murphy@arm.com>
 Date: Tue, 21 Apr 2020 23:51:36 +0100
 Subject: [PATCH] drm/lima: Clean up IRQ warnings
@@ -1297,7 +1555,7 @@ index 247f51fd40a2..c334d297796a 100644
  			goto out;
  		ip->irq = err;
 
-From 0ce8a27f95b2fcf2b5c43237ba41dfa5b4511c10 Mon Sep 17 00:00:00 2001
+From 538de78c323ed1cff6e46e73756bd1fdd332a61e Mon Sep 17 00:00:00 2001
 From: Robin Murphy <robin.murphy@arm.com>
 Date: Tue, 21 Apr 2020 23:51:37 +0100
 Subject: [PATCH] drm/lima: Clean up redundant pdev pointer
@@ -1395,7 +1653,7 @@ index bbbdc8455e2f..4e5dd75822c0 100644
  	ldev->id = (enum lima_gpu_id)of_device_get_match_data(&pdev->dev);
  
 
-From 530b7995611d206fb55cc53597b2f436ec504d36 Mon Sep 17 00:00:00 2001
+From 15209ebd3f2bce9a30a5261868d3400762c55693 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:42 +0800
 Subject: [PATCH] drm/lima: use module_platform_driver helper
@@ -1435,7 +1693,7 @@ index 4e5dd75822c0..3d63d496cfc2 100644
  MODULE_AUTHOR("Lima Project Developers");
  MODULE_DESCRIPTION("Lima DRM Driver");
 
-From cc4d56fedff585aff3d70d3a6fdbbd9311a4a25f Mon Sep 17 00:00:00 2001
+From 1a04f643449a17ec603c81f7c87587ec0dddc3d4 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:43 +0800
 Subject: [PATCH] drm/lima: print process name and pid when task error
@@ -1467,7 +1725,7 @@ index a2db1c937424..387f9439450a 100644
  	}
  
 
-From 94aa1cc831365894527d060f429f988792e8a882 Mon Sep 17 00:00:00 2001
+From 2de1ecdd54cc918c60a790a42aa2ca313d388b93 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:44 +0800
 Subject: [PATCH] drm/lima: check vm != NULL in lima_vm_put
@@ -1524,7 +1782,7 @@ index 22aeec77d84d..3a7c74822d8b 100644
  
  void lima_vm_print(struct lima_vm *vm);
 
-From d0391f8e46ad6cb2f762560f7b7b27b4a7291cc8 Mon Sep 17 00:00:00 2001
+From 5ea849a4318381e84ffe009e0033259eafcd8708 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:45 +0800
 Subject: [PATCH] drm/lima: always set page directory when switch vm
@@ -1596,7 +1854,7 @@ index 3ac5797e31fc..eb46db0717cd 100644
  
  	pipe->error = false;
 
-From fc8fec0f2fc8ea0b6ac307e6997218bbeb4f5835 Mon Sep 17 00:00:00 2001
+From 39ad4523b059035b59cd5082409dabbecafba62d Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:46 +0800
 Subject: [PATCH] drm/lima: add lima_devfreq_resume/suspend
@@ -1658,7 +1916,7 @@ index 8d71ba9fb22a..5eed2975a375 100644
 +
  #endif
 
-From ad078628978dec05a64d17dcd20855663a0e1f76 Mon Sep 17 00:00:00 2001
+From 588dcb54eb7b406b9cfe2aadaa813b28b46bc53c Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:47 +0800
 Subject: [PATCH] drm/lima: power down ip blocks when pmu exit
@@ -1769,7 +2027,7 @@ index 571f6d661581..d476569f2043 100644
 +	}
  }
 
-From 7fede3db582de001517ab59d6782f2dc3581de1b Mon Sep 17 00:00:00 2001
+From 9bc4824a7756fcca51e1edb7324e0354889ad055 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:48 +0800
 Subject: [PATCH] drm/lima: add resume/suspend callback for each ip
@@ -2285,7 +2543,7 @@ index bf60c77b2633..16ec96de15a9 100644
  void lima_pp_bcast_fini(struct lima_ip *ip);
  
 
-From 967e2d3c43e4a5dbdf00c724a6d113483594af21 Mon Sep 17 00:00:00 2001
+From 9190b3bed7ccb96f6c8cfa25b3d058a2f9fe26d5 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:49 +0800
 Subject: [PATCH] drm/lima: separate clk/regulator enable/disable function
@@ -2452,7 +2710,7 @@ index a2d4ec75b3b3..1d9b7f415da1 100644
  
  static int lima_init_ip(struct lima_device *dev, int index)
 
-From 18ea54c4483f3b54aae9bf289c36065eef03fa8f Mon Sep 17 00:00:00 2001
+From e713efb3f1f71c0ed9feabcd70d81ef307edaf76 Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:50 +0800
 Subject: [PATCH] drm/lima: add pm resume/suspend ops
@@ -2622,7 +2880,7 @@ index 3d63d496cfc2..f3fe0a2f764b 100644
  	},
  };
 
-From 62a63e139bd7e97ae2cb1a57f5098a0add7526c0 Mon Sep 17 00:00:00 2001
+From c5775edca0fba03c638c6fb7c8aefca111b1294c Mon Sep 17 00:00:00 2001
 From: Qiang Yu <yuq825@gmail.com>
 Date: Tue, 21 Apr 2020 21:35:51 +0800
 Subject: [PATCH] drm/lima: enable runtime pm