On Fri, 06 Jul 2018, "Chauhan, Madhav" <madhav.chauhan@xxxxxxxxx> wrote: >> -----Original Message----- >> From: Nikula, Jani >> Sent: Thursday, July 5, 2018 6:55 PM >> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx >> Cc: Nikula, Jani <jani.nikula@xxxxxxxxx>; Chauhan, Madhav >> <madhav.chauhan@xxxxxxxxx>; Daniel Vetter <daniel@xxxxxxxx>; Chris >> Wilson <chris@xxxxxxxxxxxxxxxxxx>; Ville Syrjälä >> <ville.syrjala@xxxxxxxxxxxxxxx> >> 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. >> >> No functional changes. >> >> v2: use "gen7" prefix. >> >> v3: use "vlv" prefix. > > Reviewed-by: Madhav Chauhan <madhav.chauhan@xxxxxxxxx> Thanks for the reviews, pushed to dinq after much bikeshedding all around. BR, Jani. > > Regards, > Madhav > >> >> References: https://patchwork.freedesktop.org/series/44823/ >> Cc: Madhav Chauhan <madhav.chauhan@xxxxxxxxx> >> Cc: Daniel Vetter <daniel@xxxxxxxx> >> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> >> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> >> --- >> 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%) >> >> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile >> index 4c6adae23e18..e7fedb83aafc 100644 >> --- a/drivers/gpu/drm/i915/Makefile >> +++ b/drivers/gpu/drm/i915/Makefile >> @@ -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 >> --- a/drivers/gpu/drm/i915/intel_drv.h >> +++ b/drivers/gpu/drm/i915/intel_drv.h >> @@ -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 */ >> diff --git a/drivers/gpu/drm/i915/intel_dsi.h >> b/drivers/gpu/drm/i915/intel_dsi.h >> index 7afeb9580f41..dce9bcc2de53 100644 >> --- a/drivers/gpu/drm/i915/intel_dsi.h >> +++ b/drivers/gpu/drm/i915/intel_dsi.h >> @@ -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); >> diff --git a/drivers/gpu/drm/i915/intel_dsi.c >> 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 >> diff --git a/drivers/gpu/drm/i915/intel_dsi_pll.c >> b/drivers/gpu/drm/i915/vlv_dsi_pll.c >> 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 > -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
