On Wed, Oct 10, 2018 at 10:52:04AM +0300, Jani Nikula wrote: > The common denominator here seems to be connector more than > modes. Prepare for moving more connector functions to the same place. No > functional changes. > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> Series is Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/Makefile | 2 +- > .../gpu/drm/i915/{intel_modes.c => intel_connector.c} | 0 > drivers/gpu/drm/i915/intel_drv.h | 18 ++++++++---------- > 3 files changed, 9 insertions(+), 11 deletions(-) > rename drivers/gpu/drm/i915/{intel_modes.c => intel_connector.c} (100%) > > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index ef1480c14e4e..48cae0eae3f9 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -113,6 +113,7 @@ i915-y += intel_audio.o \ > intel_bios.o \ > intel_cdclk.o \ > intel_color.o \ > + intel_connector.o \ > intel_display.o \ > intel_dpio_phy.o \ > intel_dpll_mgr.o \ > @@ -121,7 +122,6 @@ i915-y += intel_audio.o \ > intel_frontbuffer.o \ > intel_hdcp.o \ > intel_hotplug.o \ > - intel_modes.o \ > intel_overlay.o \ > intel_psr.o \ > intel_sideband.o \ > diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_connector.c > similarity index 100% > rename from drivers/gpu/drm/i915/intel_modes.c > rename to drivers/gpu/drm/i915/intel_connector.c > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 4b8fec74ad49..bc373f82c0d2 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1668,6 +1668,14 @@ unsigned int i9xx_plane_max_stride(struct intel_plane *plane, > u32 pixel_format, u64 modifier, > unsigned int rotation); > > +/* intel_connector.c */ > +int intel_connector_update_modes(struct drm_connector *connector, > + struct edid *edid); > +int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); > +void intel_attach_force_audio_property(struct drm_connector *connector); > +void intel_attach_broadcast_rgb_property(struct drm_connector *connector); > +void intel_attach_aspect_ratio_property(struct drm_connector *connector); > + > /* intel_csr.c */ > void intel_csr_ucode_init(struct drm_i915_private *); > void intel_csr_load_program(struct drm_i915_private *); > @@ -1864,16 +1872,6 @@ void intel_lvds_init(struct drm_i915_private *dev_priv); > struct intel_encoder *intel_get_lvds_encoder(struct drm_device *dev); > bool intel_is_dual_link_lvds(struct drm_device *dev); > > - > -/* intel_modes.c */ > -int intel_connector_update_modes(struct drm_connector *connector, > - struct edid *edid); > -int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); > -void intel_attach_force_audio_property(struct drm_connector *connector); > -void intel_attach_broadcast_rgb_property(struct drm_connector *connector); > -void intel_attach_aspect_ratio_property(struct drm_connector *connector); > - > - > /* intel_overlay.c */ > void intel_setup_overlay(struct drm_i915_private *dev_priv); > void intel_cleanup_overlay(struct drm_i915_private *dev_priv); > -- > 2.11.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx