Skip to contentSkip to conversation

drm/i915/dsi: rename the current DSI files based on first platform

PATCH In review Jani Nikula 4 participants 10 messages Jul 5, 2018 – Jul 6, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/3 drm/i915/dsi: rename the current DSI files based on first platform

Starting from ICL or gen 11 we have a new DSI block which requires completely different programming from the current implementation. Having them in the same file would be confusing. Rename the current DSI and DSI PLL implementation files as vlv_dsi.c and vlv_dsi_pll.c.

No functional changes.

v2: use "gen7" prefix.

v3: use "vlv" prefix.

References: https://patchwork.freedesktop.org/series/44823/

Cc Madhav Chauhan <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/Makefile                           | 6 +++---
 drivers/gpu/drm/i915/intel_drv.h                        | 2 +-
 drivers/gpu/drm/i915/intel_dsi.h                        | 4 ++--
 drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c}         | 0
 drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (100%)
 rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (100%)
drivers/gpu/drm/i915/Makefile +3 -3
index 4c6adae23e18..e7fedb83aafc 100644
@@ -141,9 +141,7 @@ i915-y += dvo_ch7017.o \
 	  intel_dp_link_training.o \
 	  intel_dp_mst.o \
 	  intel_dp.o \
-	  intel_dsi.o \
 	  intel_dsi_dcs_backlight.o \
-	  intel_dsi_pll.o \
 	  intel_dsi_vbt.o \
 	  intel_dvo.o \
 	  intel_hdmi.o \
@@ -152,7 +150,9 @@ i915-y += dvo_ch7017.o \
 	  intel_lvds.o \
 	  intel_panel.o \
 	  intel_sdvo.o \
-	  intel_tv.o
+	  intel_tv.o \
+	  vlv_dsi.o \
+	  vlv_dsi_pll.o
 
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/intel_drv.h +1 -1
index b9b70321c054..46b940dd8ecb 100644
@@ -1730,7 +1730,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
 /* intel_dp_mst.c */
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
 void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void intel_dsi_init(struct drm_i915_private *dev_priv);
 
 /* intel_dsi_dcs_backlight.c */
drivers/gpu/drm/i915/intel_dsi.h +2 -2
index 7afeb9580f41..dce9bcc2de53 100644
@@ -129,11 +129,11 @@ static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder)
 	return container_of(encoder, struct intel_dsi, base.base);
 }
 
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port);
 enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt);
 
-/* intel_dsi_pll.c */
+/* vlv_dsi_pll.c */
 bool intel_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);
 int intel_compute_dsi_pll(struct intel_encoder *encoder,
 			  struct intel_crtc_state *config);
drivers/gpu/drm/i915/vlv_dsi.c renamed from drivers/gpu/drm/i915/intel_dsi.c +0 -0
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi.c
rename to drivers/gpu/drm/i915/vlv_dsi.c
drivers/gpu/drm/i915/vlv_dsi_pll.c renamed from drivers/gpu/drm/i915/intel_dsi_pll.c +0 -0
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_pll.c
rename to drivers/gpu/drm/i915/vlv_dsi_pll.c
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v3 2/3 drm/i915/dsi: use vlv and bxt prefixes for the global DSI functions

Avoid confusion with the functions to be added for the new ICL or gen 11 DSI implementation by renaming the current DSI functions. While at it, permutate the words in the function names to make them all start with "vlv_dsi" or "vlv_dsi_pll" etc.

Reduce the platform abstractions in the PLL file while at it, moving the checks to vlv_dsi.c instead, where we typically already have the necessary if ladders.

Leave the static functions as-is for now; they could be renamed later if needed.

No functional changes.

v2: use "gen7" prefix.

v3: use "vlv" and "bxt" prefixes, reduce the abstractions.

References: https://patchwork.freedesktop.org/series/44823/

Cc Madhav Chauhan <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/intel_display.c |  6 +--
 drivers/gpu/drm/i915/intel_drv.h     |  2 +-
 drivers/gpu/drm/i915/intel_dsi.h     | 30 +++++++----
 drivers/gpu/drm/i915/intel_dsi_vbt.c |  2 +-
 drivers/gpu/drm/i915/vlv_dsi.c       | 61 ++++++++++++++--------
 drivers/gpu/drm/i915/vlv_dsi_pll.c   | 98 +++++++-----------------------------
 6 files changed, 80 insertions(+), 119 deletions(-)
drivers/gpu/drm/i915/intel_display.c +3 -3
index 681e0710a467..54b6ce760ee7 100644
@@ -9414,7 +9414,7 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
 		 * registers/MIPI[BXT]. We can break out here early, since we
 		 * need the same DSI PLL to be enabled for both DSI ports.
 		 */
-		if (!intel_dsi_pll_is_enabled(dev_priv))
+		if (!bxt_dsi_pll_is_enabled(dev_priv))
 			break;
 
 		/* XXX: this works for video mode only */
@@ -14133,7 +14133,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 		intel_ddi_init(dev_priv, PORT_B);
 		intel_ddi_init(dev_priv, PORT_C);
 
-		intel_dsi_init(dev_priv);
+		vlv_dsi_init(dev_priv);
 	} else if (HAS_DDI(dev_priv)) {
 		int found;
 
@@ -14239,7 +14239,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 				intel_hdmi_init(dev_priv, CHV_HDMID, PORT_D);
 		}
 
-		intel_dsi_init(dev_priv);
+		vlv_dsi_init(dev_priv);
 	} else if (!IS_GEN2(dev_priv) && !IS_PINEVIEW(dev_priv)) {
 		bool found = false;
 
drivers/gpu/drm/i915/intel_drv.h +1 -1
index 46b940dd8ecb..330f5d2fbe4e 100644
@@ -1731,7 +1731,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
 void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
 /* vlv_dsi.c */
-void intel_dsi_init(struct drm_i915_private *dev_priv);
+void vlv_dsi_init(struct drm_i915_private *dev_priv);
 
 /* intel_dsi_dcs_backlight.c */
 int intel_dsi_dcs_init_backlight_funcs(struct intel_connector *intel_connector);
drivers/gpu/drm/i915/intel_dsi.h +19 -11
index dce9bcc2de53..ad7c1cb32983 100644
@@ -130,20 +130,28 @@ static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder)
 }
 
 /* vlv_dsi.c */
-void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port);
+void vlv_dsi_wait_for_fifo_empty(struct intel_dsi *intel_dsi, enum port port);
 enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt);
 
 /* vlv_dsi_pll.c */
-bool intel_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);
-int intel_compute_dsi_pll(struct intel_encoder *encoder,
-			  struct intel_crtc_state *config);
-void intel_enable_dsi_pll(struct intel_encoder *encoder,
-			  const struct intel_crtc_state *config);
-void intel_disable_dsi_pll(struct intel_encoder *encoder);
-u32 intel_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp,
-		       struct intel_crtc_state *config);
-void intel_dsi_reset_clocks(struct intel_encoder *encoder,
-			    enum port port);
+int vlv_dsi_pll_compute(struct intel_encoder *encoder,
+			struct intel_crtc_state *config);
+void vlv_dsi_pll_enable(struct intel_encoder *encoder,
+			const struct intel_crtc_state *config);
+void vlv_dsi_pll_disable(struct intel_encoder *encoder);
+u32 vlv_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp,
+		     struct intel_crtc_state *config);
+void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port);
+
+bool bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);
+int bxt_dsi_pll_compute(struct intel_encoder *encoder,
+			struct intel_crtc_state *config);
+void bxt_dsi_pll_enable(struct intel_encoder *encoder,
+			const struct intel_crtc_state *config);
+void bxt_dsi_pll_disable(struct intel_encoder *encoder);
+u32 bxt_dsi_get_pclk(struct intel_encoder *encoder, int pipe_bpp,
+		     struct intel_crtc_state *config);
+void bxt_dsi_reset_clocks(struct intel_encoder *encoder, enum port port);
 
 /* intel_dsi_vbt.c */
 bool intel_dsi_vbt_init(struct intel_dsi *intel_dsi, u16 panel_id);
drivers/gpu/drm/i915/intel_dsi_vbt.c +1 -1
index 4d6ffa7b3e7b..ac83d6b89ae0 100644
@@ -181,7 +181,7 @@ static const u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi,
 		break;
 	}
 
-	wait_for_dsi_fifo_empty(intel_dsi, port);
+	vlv_dsi_wait_for_fifo_empty(intel_dsi, port);
 
 out:
 	data += len;
drivers/gpu/drm/i915/vlv_dsi.c +39 -22

120 lines not on this page · raw message

drivers/gpu/drm/i915/vlv_dsi_pll.c +17 -81

167 lines not on this page · raw message

Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v3 3/3 drm/i915/dsi: update some of the platform based checks

In reply to Jani Nikula

Use the more customary order of latest platform first, and don't bother with an if in the last branch.

Cc Madhav Chauhan <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/vlv_dsi.c | 56 ++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/vlv_dsi.c +26 -30
index 0aa99eeae271..435a2c35ee8c 100644
@@ -550,12 +550,12 @@ static void intel_dsi_device_ready(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 
-	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
-		vlv_dsi_device_ready(encoder);
-	else if (IS_BROXTON(dev_priv))
-		bxt_dsi_device_ready(encoder);
-	else if (IS_GEMINILAKE(dev_priv))
+	if (IS_GEMINILAKE(dev_priv))
 		glk_dsi_device_ready(encoder);
+	else if (IS_GEN9_LP(dev_priv))
+		bxt_dsi_device_ready(encoder);
+	else
+		vlv_dsi_device_ready(encoder);
 }
 
 static void glk_dsi_enter_low_power_mode(struct intel_encoder *encoder)
@@ -938,11 +938,10 @@ static void intel_dsi_clear_device_ready(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 
-	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv) ||
-	    IS_BROXTON(dev_priv))
-		vlv_dsi_clear_device_ready(encoder);
-	else if (IS_GEMINILAKE(dev_priv))
+	if (IS_GEMINILAKE(dev_priv))
 		glk_dsi_clear_device_ready(encoder);
+	else
+		vlv_dsi_clear_device_ready(encoder);
 }
 
 static void intel_dsi_post_disable(struct intel_encoder *encoder,
@@ -1599,23 +1598,24 @@ static void intel_dsi_unprepare(struct intel_encoder *encoder)
 	enum port port;
 	u32 val;
 
-	if (!IS_GEMINILAKE(dev_priv)) {
-		for_each_dsi_port(port, intel_dsi->ports) {
-			/* Panel commands can be sent when clock is in LP11 */
-			I915_WRITE(MIPI_DEVICE_READY(port), 0x0);
+	if (IS_GEMINILAKE(dev_priv))
+		return;
 
-			if (IS_GEN9_LP(dev_priv))
-				bxt_dsi_reset_clocks(encoder, port);
-			else
-				vlv_dsi_reset_clocks(encoder, port);
-			I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP);
+	for_each_dsi_port(port, intel_dsi->ports) {
+		/* Panel commands can be sent when clock is in LP11 */
+		I915_WRITE(MIPI_DEVICE_READY(port), 0x0);
 
-			val = I915_READ(MIPI_DSI_FUNC_PRG(port));
-			val &= ~VID_MODE_FORMAT_MASK;
-			I915_WRITE(MIPI_DSI_FUNC_PRG(port), val);
+		if (IS_GEN9_LP(dev_priv))
+			bxt_dsi_reset_clocks(encoder, port);
+		else
+			vlv_dsi_reset_clocks(encoder, port);
+		I915_WRITE(MIPI_EOT_DISABLE(port), CLOCKSTOP);
 
-			I915_WRITE(MIPI_DEVICE_READY(port), 0x1);
-		}
+		val = I915_READ(MIPI_DSI_FUNC_PRG(port));
+		val &= ~VID_MODE_FORMAT_MASK;
+		I915_WRITE(MIPI_DSI_FUNC_PRG(port), val);
+
+		I915_WRITE(MIPI_DEVICE_READY(port), 0x1);
 	}
 }
 
@@ -1747,14 +1747,10 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
 	if (!intel_bios_is_dsi_present(dev_priv, &port))
 		return;
 
-	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
-		dev_priv->mipi_mmio_base = VLV_MIPI_BASE;
-	} else if (IS_GEN9_LP(dev_priv)) {
+	if (IS_GEN9_LP(dev_priv))
 		dev_priv->mipi_mmio_base = BXT_MIPI_BASE;
-	} else {
-		DRM_ERROR("Unsupported Mipi device to reg base");
-		return;
-	}
+	else
+		dev_priv->mipi_mmio_base = VLV_MIPI_BASE;
 
 	intel_dsi = kzalloc(sizeof(*intel_dsi), GFP_KERNEL);
 	if (!intel_dsi)
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v3 1/3
#3 lore raw
In reply to Jani Nikula
Quoted 9 lines · Jani Nikula

Starting from ICL or gen 11 we have a new DSI block which requires completely different programming from the current implementation. Having them in the same file would be confusing. Rename the current DSI and DSI PLL implementation files as vlv_dsi.c and vlv_dsi_pll.c.

No functional changes.

v2: use "gen7" prefix.

Quoted 8 lines

v3: use "vlv" prefix.

References: https://patchwork.freedesktop.org/series/44823/

Cc Madhav Chauhan <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>

Series lgtm

Quoted 76 lines
---
 drivers/gpu/drm/i915/Makefile                           | 6 +++---
 drivers/gpu/drm/i915/intel_drv.h                        | 2 +-
 drivers/gpu/drm/i915/intel_dsi.h                        | 4 ++--
 drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c}         | 0
 drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (100%)
 rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (100%)
drivers/gpu/drm/i915/Makefile +3 -3
index 4c6adae23e18..e7fedb83aafc 100644
@@ -141,9 +141,7 @@ i915-y += dvo_ch7017.o \
 	  intel_dp_link_training.o \
 	  intel_dp_mst.o \
 	  intel_dp.o \
-	  intel_dsi.o \
 	  intel_dsi_dcs_backlight.o \
-	  intel_dsi_pll.o \
 	  intel_dsi_vbt.o \
 	  intel_dvo.o \
 	  intel_hdmi.o \
@@ -152,7 +150,9 @@ i915-y += dvo_ch7017.o \
 	  intel_lvds.o \
 	  intel_panel.o \
 	  intel_sdvo.o \
-	  intel_tv.o
+	  intel_tv.o \
+	  vlv_dsi.o \
+	  vlv_dsi_pll.o
 
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o
drivers/gpu/drm/i915/intel_drv.h +1 -1
index b9b70321c054..46b940dd8ecb 100644
@@ -1730,7 +1730,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector);
 /* intel_dp_mst.c */
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_id);
 void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void intel_dsi_init(struct drm_i915_private *dev_priv);
 
 /* intel_dsi_dcs_backlight.c */
drivers/gpu/drm/i915/intel_dsi.h +2 -2
index 7afeb9580f41..dce9bcc2de53 100644
@@ -129,11 +129,11 @@ static inline struct intel_dsi *enc_to_intel_dsi(struct drm_encoder *encoder)
 	return container_of(encoder, struct intel_dsi, base.base);
 }
 
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port);
 enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt);
 
-/* intel_dsi_pll.c */
+/* vlv_dsi_pll.c */
 bool intel_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);
 int intel_compute_dsi_pll(struct intel_encoder *encoder,
 			  struct intel_crtc_state *config);
drivers/gpu/drm/i915/vlv_dsi.c renamed from drivers/gpu/drm/i915/intel_dsi.c +0 -0
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi.c
rename to drivers/gpu/drm/i915/vlv_dsi.c
drivers/gpu/drm/i915/vlv_dsi_pll.c renamed from drivers/gpu/drm/i915/intel_dsi_pll.c +0 -0
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_pll.c
rename to drivers/gpu/drm/i915/vlv_dsi_pll.c
Signature · 1 line
2.11.0
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

✗ Fi.CI.CHECKPATCH: warning for series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform
URL : https://patchwork.freedesktop.org/series/45984/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
a94f7eba00d8 drm/i915/dsi: rename the current DSI files based on first platform
-:87: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#87: 
rename from drivers/gpu/drm/i915/intel_dsi.c

total: 0 errors, 1 warnings, 0 checks, 40 lines checked 26c7edae7f16 drm/i915/dsi: use vlv and bxt prefixes for the global DSI functions a40953b0f71a drm/i915/dsi: update some of the platform based checks

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.SPARSE: warning for series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform
URL : https://patchwork.freedesktop.org/series/45984/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Commit: drm/i915/dsi: rename the current DSI files based on first platform
-drivers/gpu/drm/i915/vlv_dsi.c:113:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/vlv_dsi.c:97:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/vlv_dsi.c:113:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/vlv_dsi.c:97:33: warning: expression using sizeof(void)

Commit: drm/i915/dsi: use vlv and bxt prefixes for the global DSI functions Okay!

Commit: drm/i915/dsi: update some of the platform based checks Okay!

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

✓ Fi.CI.BAT: success for series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform
URL : https://patchwork.freedesktop.org/series/45984/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4433 -> Patchwork_9539 =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_9539 need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_9539, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/45984/revisions/1/mbox/

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_9539:

=== IGT changes ===

    ==== Possible regressions ====

    igt@drv_selftest@live_workarounds:
      {fi-kbl-x1275}:     PASS -> INCOMPLETE

    
    ==== Warnings ====

    igt@drv_selftest@live_gtt:
      fi-cfl-s3:          INCOMPLETE (fdo#107127) -> FAIL

    igt@gem_exec_suspend@basic-s4-devices:
      {fi-kbl-8809g}:     INCOMPLETE -> DMESG-WARN

== Known issues ==

Here are the changes found in Patchwork_9539 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_gtt:
      {fi-kbl-8809g}:     NOTRUN -> INCOMPLETE (fdo#107127)
      {fi-skl-iommu}:     PASS -> FAIL (fdo#105347)
      fi-kbl-7567u:       PASS -> INCOMPLETE (fdo#107127)

    igt@drv_selftest@mock_scatterlist:
      fi-snb-2520m:       NOTRUN -> DMESG-WARN (fdo#103667)
      {fi-kbl-8809g}:     NOTRUN -> DMESG-WARN (fdo#103667)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_gtt:
      fi-bdw-gvtdvm:      FAIL -> PASS +1
      fi-kbl-7560u:       INCOMPLETE (fdo#107127) -> PASS
      fi-skl-6260u:       INCOMPLETE (fdo#107127) -> PASS

    igt@drv_selftest@live_hangcheck:
      fi-hsw-peppy:       DMESG-FAIL -> PASS

    igt@gem_exec_suspend@basic-s4-devices:
      fi-kbl-7500u:       DMESG-WARN (fdo#105128) -> PASS

    igt@kms_flip@basic-flip-vs-dpms:
      fi-skl-6700hq:      DMESG-WARN (fdo#105998) -> PASS

    igt@kms_frontbuffer_tracking@basic:
      fi-hsw-peppy:       DMESG-FAIL (fdo#106103, fdo#102614) -> PASS

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-snb-2520m:       INCOMPLETE (fdo#103713) -> PASS

    
    ==== Warnings ====

    igt@drv_selftest@live_gtt:
      fi-kbl-7500u:       INCOMPLETE (fdo#107127) -> FAIL (fdo#105347)
      fi-cfl-guc:         FAIL -> INCOMPLETE (fdo#106693, fdo#107127)
      fi-kbl-r:           FAIL (fdo#105347) -> INCOMPLETE (fdo#107127)

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103667 https://bugs.freedesktop.org/show_bug.cgi?id=103667
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
fdo#106693 https://bugs.freedesktop.org/show_bug.cgi?id=106693
fdo#107127 https://bugs.freedesktop.org/show_bug.cgi?id=107127

== Participating hosts (47 -> 40) ==

Missing (7): fi-ilk-m540 fi-bxt-dsi fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-ctg-p8600

== Build changes ==

* Linux: CI_DRM_4433 -> Patchwork_9539

CI_DRM_4433: 23e041a1ac3302be0f3522389090f693faf797de @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4538: 9b3f41a6c6da7d767516a93dccf17469a551e942 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9539: a40953b0f71acd1ccac4f947b3eaeb06a454b190 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

a40953b0f71a drm/i915/dsi: update some of the platform based checks 26c7edae7f16 drm/i915/dsi: use vlv and bxt prefixes for the global DSI functions a94f7eba00d8 drm/i915/dsi: rename the current DSI files based on first platform

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9539/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

✗ Fi.CI.IGT: failure for series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [v3,1/3] drm/i915/dsi: rename the current DSI files based on first platform
URL : https://patchwork.freedesktop.org/series/45984/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4433_full -> Patchwork_9539_full =

== Summary - FAILURE ==

Serious unknown changes coming with Patchwork_9539_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_9539_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_9539_full:

=== IGT changes ===

    ==== Possible regressions ====

    igt@kms_flip_tiling@flip-to-y-tiled:
      shard-glk:          PASS -> FAIL

    
    ==== Warnings ====

    igt@gem_mocs_settings@mocs-rc6-ctx-render:
      shard-kbl:          PASS -> SKIP

== Known issues ==

Here are the changes found in Patchwork_9539_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_gtt:
      shard-kbl:          PASS -> FAIL (fdo#105347, fdo#107127)

    igt@gem_exec_params@rs-invalid-on-bsd-ring:
      shard-snb:          SKIP -> INCOMPLETE (fdo#105411)

    igt@kms_cursor_legacy@cursor-vs-flip-toggle:
      shard-hsw:          PASS -> FAIL (fdo#103355)

    igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#105363)

    igt@kms_flip@2x-plain-flip-ts-check-interruptible:
      shard-hsw:          PASS -> FAIL (fdo#100368)

    igt@kms_flip@plain-flip-fb-recreate:
      shard-glk:          PASS -> FAIL (fdo#100368) +2

    igt@kms_vblank@pipe-c-ts-continuation-suspend:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665)

    igt@perf@rc6-disable:
      shard-kbl:          PASS -> FAIL (fdo#103179)

    
    ==== Possible fixes ====

    igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
      shard-glk:          FAIL (fdo#106509) -> PASS

    igt@kms_flip_tiling@flip-y-tiled:
      shard-glk:          FAIL -> PASS

    igt@kms_setmode@basic:
      shard-kbl:          FAIL (fdo#99912) -> PASS

    
    ==== Warnings ====

    igt@drv_selftest@live_gtt:
      shard-apl:          INCOMPLETE (fdo#103927, fdo#107127) -> FAIL (fdo#105347, fdo#107127)

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103179 https://bugs.freedesktop.org/show_bug.cgi?id=103179
fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#107127 https://bugs.freedesktop.org/show_bug.cgi?id=107127
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

== Participating hosts (5 -> 5) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_4433 -> Patchwork_9539

CI_DRM_4433: 23e041a1ac3302be0f3522389090f693faf797de @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4538: 9b3f41a6c6da7d767516a93dccf17469a551e942 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9539: a40953b0f71acd1ccac4f947b3eaeb06a454b190 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9539/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v3 1/3
#8 lore raw
In reply to Jani Nikula
Quoted 16 lines

-----Original Message-----
From: Nikula, Jani
Sent: Thursday, July 5, 2018 6:55 PM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; Chauhan, Madhav <[email protected]>; Daniel Vetter <[email protected]>; Chris Wilson <[email protected]>; Ville Syrjälä <[email protected]>
Subject: [PATCH v3 1/3] drm/i915/dsi: rename the current DSI files based on first platform

Starting from ICL or gen 11 we have a new DSI block which requires completely different programming from the current implementation. Having them in the same file would be confusing. Rename the current DSI and DSI PLL implementation files as vlv_dsi.c and vlv_dsi_pll.c.

Quoted 5 lines

No functional changes.

v2: use "gen7" prefix.

v3: use "vlv" prefix.

Regards,
Madhav

Quoted 85 lines

References: https://patchwork.freedesktop.org/series/44823/

Cc Madhav Chauhan <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/Makefile                           | 6 +++---
 drivers/gpu/drm/i915/intel_drv.h                        | 2 +-
 drivers/gpu/drm/i915/intel_dsi.h                        | 4 ++--
 drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c}         | 0
 drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)  rename

drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (100%) rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (100%)

drivers/gpu/drm/i915/Makefile +3 -3
index 4c6adae23e18..e7fedb83aafc 100644
@@ -141,9 +141,7 @@ i915-y += dvo_ch7017.o \
 	  intel_dp_link_training.o \
 	  intel_dp_mst.o \
 	  intel_dp.o \
-	  intel_dsi.o \
 	  intel_dsi_dcs_backlight.o \
-	  intel_dsi_pll.o \
 	  intel_dsi_vbt.o \
 	  intel_dvo.o \
 	  intel_hdmi.o \
@@ -152,7 +150,9 @@ i915-y += dvo_ch7017.o \
 	  intel_lvds.o \
 	  intel_panel.o \
 	  intel_sdvo.o \
-	  intel_tv.o
+	  intel_tv.o \
+	  vlv_dsi.o \
+	  vlv_dsi_pll.o
 
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o diff --git

a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index b9b70321c054..46b940dd8ecb 100644

drivers/gpu/drm/i915/intel_drv.h +0 -0
@@ -1730,7 +1730,7 @@ int intel_dp_aux_init_backlight_funcs(struct
 intel_connector *intel_connector);
 /* intel_dp_mst.c */
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int

conn_id); void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);

drivers/gpu/drm/i915/intel_drv.h +1 -1
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void intel_dsi_init(struct drm_i915_private *dev_priv);
 
 /* intel_dsi_dcs_backlight.c */
drivers/gpu/drm/i915/intel_dsi.h +2 -2
index 7afeb9580f41..dce9bcc2de53 100644
@@ -129,11 +129,11 @@ static inline struct intel_dsi
 *enc_to_intel_dsi(struct drm_encoder *encoder)
 	return container_of(encoder, struct intel_dsi, base.base);  }
 
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port);
 enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt);
 
-/* intel_dsi_pll.c */
+/* vlv_dsi_pll.c */
 bool intel_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);  int
 intel_compute_dsi_pll(struct intel_encoder *encoder,
 			  struct intel_crtc_state *config);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/vlv_dsi.c similarity index 100% rename from drivers/gpu/drm/i915/intel_dsi.c rename to drivers/gpu/drm/i915/vlv_dsi.c

drivers/gpu/drm/i915/vlv_dsi_pll.c renamed from drivers/gpu/drm/i915/intel_dsi_pll.c +0 -1
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_pll.c
rename to drivers/gpu/drm/i915/vlv_dsi_pll.c
--
Quoted 1 line

2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 16 lines · Madhav
Quoted 16 lines

-----Original Message-----
From: Nikula, Jani
Sent: Thursday, July 5, 2018 6:55 PM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; Chauhan, Madhav <[email protected]>; Daniel Vetter <[email protected]>; Chris Wilson <[email protected]>; Ville Syrjälä <[email protected]>
Subject: [PATCH v3 1/3] drm/i915/dsi: rename the current DSI files based on first platform

Starting from ICL or gen 11 we have a new DSI block which requires completely different programming from the current implementation. Having them in the same file would be confusing. Rename the current DSI and DSI PLL implementation files as vlv_dsi.c and vlv_dsi_pll.c.

Quoted 7 lines
Quoted 5 lines

No functional changes.

v2: use "gen7" prefix.

v3: use "vlv" prefix.

Thanks for the reviews, pushed to dinq after much bikeshedding all around.

BR,
Jani.

Quoted 91 lines

Regards,
Madhav

Quoted 86 lines

References: https://patchwork.freedesktop.org/series/44823/

Cc Madhav Chauhan <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/Makefile                           | 6 +++---
 drivers/gpu/drm/i915/intel_drv.h                        | 2 +-
 drivers/gpu/drm/i915/intel_dsi.h                        | 4 ++--
 drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c}         | 0
 drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} | 0
 5 files changed, 6 insertions(+), 6 deletions(-)  rename

drivers/gpu/drm/i915/{intel_dsi.c => vlv_dsi.c} (100%) rename drivers/gpu/drm/i915/{intel_dsi_pll.c => vlv_dsi_pll.c} (100%)

drivers/gpu/drm/i915/Makefile +3 -3
index 4c6adae23e18..e7fedb83aafc 100644
@@ -141,9 +141,7 @@ i915-y += dvo_ch7017.o \
 	  intel_dp_link_training.o \
 	  intel_dp_mst.o \
 	  intel_dp.o \
-	  intel_dsi.o \
 	  intel_dsi_dcs_backlight.o \
-	  intel_dsi_pll.o \
 	  intel_dsi_vbt.o \
 	  intel_dvo.o \
 	  intel_hdmi.o \
@@ -152,7 +150,9 @@ i915-y += dvo_ch7017.o \
 	  intel_lvds.o \
 	  intel_panel.o \
 	  intel_sdvo.o \
-	  intel_tv.o
+	  intel_tv.o \
+	  vlv_dsi.o \
+	  vlv_dsi_pll.o
 
 # Post-mortem debug and GPU hang state capture
 i915-$(CONFIG_DRM_I915_CAPTURE_ERROR) += i915_gpu_error.o diff --git

a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index b9b70321c054..46b940dd8ecb 100644

drivers/gpu/drm/i915/intel_drv.h +0 -0
@@ -1730,7 +1730,7 @@ int intel_dp_aux_init_backlight_funcs(struct
 intel_connector *intel_connector);
 /* intel_dp_mst.c */
 int intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int

conn_id); void intel_dp_mst_encoder_cleanup(struct intel_digital_port *intel_dig_port);

drivers/gpu/drm/i915/intel_drv.h +1 -1
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void intel_dsi_init(struct drm_i915_private *dev_priv);
 
 /* intel_dsi_dcs_backlight.c */
drivers/gpu/drm/i915/intel_dsi.h +2 -2
index 7afeb9580f41..dce9bcc2de53 100644
@@ -129,11 +129,11 @@ static inline struct intel_dsi
 *enc_to_intel_dsi(struct drm_encoder *encoder)
 	return container_of(encoder, struct intel_dsi, base.base);  }
 
-/* intel_dsi.c */
+/* vlv_dsi.c */
 void wait_for_dsi_fifo_empty(struct intel_dsi *intel_dsi, enum port port);
 enum mipi_dsi_pixel_format pixel_format_from_register_bits(u32 fmt);
 
-/* intel_dsi_pll.c */
+/* vlv_dsi_pll.c */
 bool intel_dsi_pll_is_enabled(struct drm_i915_private *dev_priv);  int
 intel_compute_dsi_pll(struct intel_encoder *encoder,
 			  struct intel_crtc_state *config);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/vlv_dsi.c similarity index 100% rename from drivers/gpu/drm/i915/intel_dsi.c rename to drivers/gpu/drm/i915/vlv_dsi.c

drivers/gpu/drm/i915/vlv_dsi_pll.c renamed from drivers/gpu/drm/i915/intel_dsi_pll.c +0 -1
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi_pll.c
rename to drivers/gpu/drm/i915/vlv_dsi_pll.c
--

2.11.0

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx