Skip to contentSkip to conversation

drm/i915/dsi: rename the current DSI legacy

RFC PATCH In review Jani Nikula 3 participants 7 messages Jun 29, 2018

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

RFC PATCH 1/2 drm/i915/dsi: rename the current DSI legacy

Starting from ICL 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 out of the way as legacy DSI, to make way for the ICL+ implementation. We'll want to call the new DSI block "intel_dsi".

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

Cc Madhav Chauhan <[email protected]>

---

Are there any reasonable alternatives to "legacy"?

Where we have the encoder implementations for different platforms in the same file, the names would be platform derived. In the DSI case, we could call this "BYT DSI" after the first platform with DSI support in i915, and name the files and functions accordingly. byt_dsi.c, byt_dsi_pll.c, byt_dsi_init(), and so on.

---
 drivers/gpu/drm/i915/Makefile                                    | 4 ++--
 drivers/gpu/drm/i915/intel_drv.h                                 | 2 +-
 drivers/gpu/drm/i915/intel_dsi.h                                 | 4 ++--
 drivers/gpu/drm/i915/{intel_dsi.c => intel_legacy_dsi.c}         | 0
 drivers/gpu/drm/i915/{intel_dsi_pll.c => intel_legacy_dsi_pll.c} | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename drivers/gpu/drm/i915/{intel_dsi.c => intel_legacy_dsi.c} (100%)
 rename drivers/gpu/drm/i915/{intel_dsi_pll.c => intel_legacy_dsi_pll.c} (100%)
drivers/gpu/drm/i915/Makefile +2 -2
index 4c6adae23e18..4bc6509efd28 100644
@@ -141,13 +141,13 @@ 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 \
 	  intel_i2c.o \
+	  intel_legacy_dsi.o \
+	  intel_legacy_dsi_pll.o \
 	  intel_lspcon.o \
 	  intel_lvds.o \
 	  intel_panel.o \
drivers/gpu/drm/i915/intel_drv.h +1 -1
index a6ff2600a3a0..65e1b4ddc0d0 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 */
+/* intel_legacy_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..429471ca49ca 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 */
+/* intel_legacy_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 */
+/* intel_legacy_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/intel_legacy_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/intel_legacy_dsi.c
drivers/gpu/drm/i915/intel_legacy_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/intel_legacy_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

RFC PATCH 2/2 drm/i915/dsi: rename relevant legacy DSI functions

Avoid confusion with the functions to be added for ICL+ DSI implementation.

The idea is that static functions and functions only called within the legacy DSI implementation files (intel_legacy_dsi.c and intel_legacy_dsi_pll.c) could remain as they are.

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

Cc Madhav Chauhan <[email protected]>

---

More could be renamed, but the first question is, should these be intel_legacy_dsi_foo() or byt_dsi_foo(). See previous patch.

---
 drivers/gpu/drm/i915/intel_display.c    | 4 ++--
 drivers/gpu/drm/i915/intel_drv.h        | 2 +-
 drivers/gpu/drm/i915/intel_legacy_dsi.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
index 56818a45181c..157372737847 100644
@@ -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);
+		intel_legacy_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);
+		intel_legacy_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 65e1b4ddc0d0..14189b34d601 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);
 /* intel_legacy_dsi.c */
-void intel_dsi_init(struct drm_i915_private *dev_priv);
+void intel_legacy_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_legacy_dsi.c +1 -1
index 3b7acb5a70b3..446cdda38c35 100644
@@ -1713,7 +1713,7 @@ static void intel_dsi_add_properties(struct intel_connector *connector)
 	}
 }
 
-void intel_dsi_init(struct drm_i915_private *dev_priv)
+void intel_legacy_dsi_init(struct drm_i915_private *dev_priv)
 {
 	struct drm_device *dev = &dev_priv->drm;
 	struct intel_dsi *intel_dsi;
Signature · 6 lines
2.11.0

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

✗ Fi.CI.CHECKPATCH: warning for series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy
URL : https://patchwork.freedesktop.org/series/45643/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
d5f58c7ef825 drm/i915/dsi: rename the current DSI legacy
-:69: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#69: 
rename from drivers/gpu/drm/i915/intel_dsi.c

total: 0 errors, 1 warnings, 0 checks, 36 lines checked 6b05867de132 drm/i915/dsi: rename relevant legacy DSI functions

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

#3 lore raw

✗ Fi.CI.SPARSE: warning for series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy
URL : https://patchwork.freedesktop.org/series/45643/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Commit: drm/i915/dsi: rename the current DSI legacy
-drivers/gpu/drm/i915/intel_legacy_dsi.c:113:33: warning: expression using sizeof(void)
-drivers/gpu/drm/i915/intel_legacy_dsi.c:97:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/intel_legacy_dsi.c:113:33: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/intel_legacy_dsi.c:97:33: warning: expression using sizeof(void)

Commit: drm/i915/dsi: rename relevant legacy DSI functions Okay!

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

#4 lore raw

✓ Fi.CI.BAT: success for series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy
URL : https://patchwork.freedesktop.org/series/45643/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4403 -> Patchwork_9481 =

== Summary - SUCCESS ==

No regressions found.

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

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      fi-bxt-dsi:         PASS -> INCOMPLETE (fdo#103927)

    
    ==== Possible fixes ====

    igt@kms_chamelium@dp-crc-fast:
      fi-kbl-7500u:       DMESG-FAIL (fdo#103841) -> PASS

fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927

== Participating hosts (43 -> 39) ==

Missing (4): fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u

== Build changes ==

* Linux: CI_DRM_4403 -> Patchwork_9481

CI_DRM_4403: d5ec143981dab1497ec923c943288dbc1be673d0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4531: a14bc8b4d69eaca189665de505e6b10cbfbb7730 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9481: 6b05867de13222e47743ed6273cc24cdfbf87efe @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

6b05867de132 drm/i915/dsi: rename relevant legacy DSI functions d5f58c7ef825 drm/i915/dsi: rename the current DSI legacy

== Logs ==

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

#5 lore raw
In reply to Jani Nikula
Quoted 8 lines

-----Original Message-----
From: Nikula, Jani
Sent: Friday, June 29, 2018 2:58 PM
To: [email protected]
Cc: Nikula, Jani <[email protected]>; Chauhan, Madhav <[email protected]>
Subject: [RFC PATCH 1/2] drm/i915/dsi: rename the current DSI legacy

Quoted 5 lines

Starting from ICL 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 out of the way as legacy DSI, to make way for the ICL+ implementation. We'll want to call the new DSI block "intel_dsi".

We can also use intel_dsi_byt.c, intel_dsi_byt_pll.c, intel_dsi_byt_init(), looks more informative and aligns with file naming convention inside i915/ as well. But having byt_dsi.c and so on looks different from naming perspective :)

I am also fine with naming proposed by you i.e. using "legacy" for current Implementation, a legacy way :)

Regards,
Madhav

Quoted 91 lines

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

Cc Madhav Chauhan <[email protected]>

---

Are there any reasonable alternatives to "legacy"?

Where we have the encoder implementations for different platforms in the same file, the names would be platform derived. In the DSI case, we could call this "BYT DSI" after the first platform with DSI support in i915, and name the files and functions accordingly. byt_dsi.c, byt_dsi_pll.c, byt_dsi_init(), and so on.

---
 drivers/gpu/drm/i915/Makefile                                    | 4 ++--
 drivers/gpu/drm/i915/intel_drv.h                                 | 2 +-
 drivers/gpu/drm/i915/intel_dsi.h                                 | 4 ++--
 drivers/gpu/drm/i915/{intel_dsi.c => intel_legacy_dsi.c}         | 0
 drivers/gpu/drm/i915/{intel_dsi_pll.c => intel_legacy_dsi_pll.c} | 0
 5 files changed, 5 insertions(+), 5 deletions(-)  rename

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

drivers/gpu/drm/i915/Makefile +2 -2
index 4c6adae23e18..4bc6509efd28 100644
@@ -141,13 +141,13 @@ 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 \
 	  intel_i2c.o \
+	  intel_legacy_dsi.o \
+	  intel_legacy_dsi_pll.o \
 	  intel_lspcon.o \
 	  intel_lvds.o \
 	  intel_panel.o \
drivers/gpu/drm/i915/intel_drv.h +0 -0
index a6ff2600a3a0..65e1b4ddc0d0 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);

drivers/gpu/drm/i915/intel_drv.h +1 -1
-/* intel_dsi.c */
+/* intel_legacy_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..429471ca49ca 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 */
+/* intel_legacy_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 */
+/* intel_legacy_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/intel_legacy_dsi.c renamed from drivers/gpu/drm/i915/intel_dsi.c rename to +0 -0
similarity index 100%
rename from drivers/gpu/drm/i915/intel_dsi.c rename to

drivers/gpu/drm/i915/intel_legacy_dsi.c

drivers/gpu/drm/i915/intel_legacy_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/intel_legacy_dsi_pll.c
--
Quoted 1 line

2.11.0

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

#6 lore raw

✓ Fi.CI.IGT: success for series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [RFC,1/2] drm/i915/dsi: rename the current DSI legacy
URL : https://patchwork.freedesktop.org/series/45643/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4403_full -> Patchwork_9481_full =

== Summary - SUCCESS ==

No regressions found.

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_gtt:
      shard-glk:          PASS -> FAIL (fdo#105347)

    igt@drv_suspend@shrink:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665, fdo#106886)

    igt@gem_exec_schedule@pi-ringfull-render:
      shard-kbl:          NOTRUN -> FAIL (fdo#103158)

    igt@kms_flip_tiling@flip-to-x-tiled:
      shard-glk:          PASS -> FAIL (fdo#103822, fdo#104724) +1

    igt@kms_plane_lowres@pipe-b-tiling-y:
      shard-kbl:          PASS -> DMESG-WARN (fdo#105345)

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

    igt@kms_vblank@pipe-a-accuracy-idle:
      shard-glk:          PASS -> FAIL (fdo#102583)

    
    ==== Possible fixes ====

    igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled:
      shard-glk:          FAIL (fdo#103232, fdo#104724) -> PASS

    igt@kms_flip@flip-vs-expired-vblank-interruptible:
      shard-apl:          FAIL (fdo#102887, fdo#105363) -> PASS

fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105345 https://bugs.freedesktop.org/show_bug.cgi?id=105345
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
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_4403 -> Patchwork_9481

CI_DRM_4403: d5ec143981dab1497ec923c943288dbc1be673d0 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4531: a14bc8b4d69eaca189665de505e6b10cbfbb7730 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9481: 6b05867de13222e47743ed6273cc24cdfbf87efe @ 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_9481/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx