* [PATCH 0/5] Organize intel_drv.h
@ 2013-09-24 16:52 Paulo Zanoni
2013-09-24 16:52 ` [PATCH 1/5] drm/i915: reorganize intel_drv.h Paulo Zanoni
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Paulo Zanoni @ 2013-09-24 16:52 UTC (permalink / raw)
To: intel-gfx; +Cc: Paulo Zanoni
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Hi
Daniel reccently complained that we keep adding stuff at the bottom of the file
and keep conflicting with each other. So on the first patch I completely
reorganize the file so that it lists functions per-file. With this, different
patches will mostly only conflict when adding new functions to the same file.
Besides this, patches 2-5 try to remove a few lines from intel_drv.h. All the
other functions seem to be either necessary or not trivial to remove.
These patches were written against Friday's tree, and got a simple conflict
today. They get bit-rot very quickly and will conflict with everybody else's
patches touching the same file. If we don't really want this, please speak :)
Also, feel free to suggest more changes on top of these, and flamewar about the
"extern" keywords.
Cheers,
Paulo
Paulo Zanoni (5):
drm/i915: reorganize intel_drv.h
drm/i915: make intel_pipe_has_type static
drm/i915: make intel_crtc_load_lut static
drm/i915: make intel_crtc_fb_gamma_{set,get} static
drm/i915: make hsw_{disable,restore}_lcpll static
drivers/gpu/drm/i915/intel_display.c | 214 ++++++++----------
drivers/gpu/drm/i915/intel_drv.h | 409 ++++++++++++++++++-----------------
drivers/gpu/drm/i915/intel_fb.c | 21 ++
3 files changed, 326 insertions(+), 318 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/5] drm/i915: reorganize intel_drv.h 2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni @ 2013-09-24 16:52 ` Paulo Zanoni 2013-09-24 16:52 ` [PATCH 2/5] drm/i915: make intel_pipe_has_type static Paulo Zanoni ` (4 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: Paulo Zanoni @ 2013-09-24 16:52 UTC (permalink / raw) To: intel-gfx; +Cc: Paulo Zanoni From: Paulo Zanoni <paulo.r.zanoni@intel.com> Daniel complained that we keep adding stuff to the bottom of the file, so we constantly have conflicts. So reorganize everything and split them file-by-file, also sorting the files in alphabetical order. This way, patches touching different files will have a smaller chance of conflicting. Of course, this commit will conflict with everybody on the list :) Also remove a few useless comments and make some things fit into 80 lines. v2: - Conflict with intel_ddi_get_config Requested-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_drv.h | 410 ++++++++++++++++++++------------------- 1 file changed, 214 insertions(+), 196 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index e7fe5f1..805dc92 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -514,81 +514,6 @@ struct intel_unpin_work { bool enable_stall_check; }; -int intel_pch_rawclk(struct drm_device *dev); - -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); - -extern void intel_attach_force_audio_property(struct drm_connector *connector); -extern void intel_attach_broadcast_rgb_property(struct drm_connector *connector); - -extern bool intel_pipe_has_type(struct drm_crtc *crtc, int type); -extern void intel_crt_init(struct drm_device *dev); -extern void intel_hdmi_init(struct drm_device *dev, - int hdmi_reg, enum port port); -extern void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, - struct intel_connector *intel_connector); -extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); -extern bool intel_hdmi_compute_config(struct intel_encoder *encoder, - struct intel_crtc_config *pipe_config); -extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, - bool is_sdvob); -extern void intel_dvo_init(struct drm_device *dev); -extern void intel_tv_init(struct drm_device *dev); -extern void intel_mark_busy(struct drm_device *dev); -extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, - struct intel_ring_buffer *ring); -extern void intel_mark_idle(struct drm_device *dev); -extern void intel_lvds_init(struct drm_device *dev); -extern bool intel_dsi_init(struct drm_device *dev); -extern bool intel_is_dual_link_lvds(struct drm_device *dev); -extern void intel_dp_init(struct drm_device *dev, int output_reg, - enum port port); -extern bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, - struct intel_connector *intel_connector); -extern void intel_dp_init_link_config(struct intel_dp *intel_dp); -extern void intel_dp_start_link_train(struct intel_dp *intel_dp); -extern void intel_dp_complete_link_train(struct intel_dp *intel_dp); -extern void intel_dp_stop_link_train(struct intel_dp *intel_dp); -extern void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); -extern void intel_dp_encoder_destroy(struct drm_encoder *encoder); -extern void intel_dp_check_link_status(struct intel_dp *intel_dp); -extern bool intel_dp_compute_config(struct intel_encoder *encoder, - struct intel_crtc_config *pipe_config); -extern bool intel_dpd_is_edp(struct drm_device *dev); -extern void ironlake_edp_backlight_on(struct intel_dp *intel_dp); -extern void ironlake_edp_backlight_off(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); -extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); -extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, - enum plane plane); - -/* intel_panel.c */ -extern int intel_panel_init(struct intel_panel *panel, - struct drm_display_mode *fixed_mode); -extern void intel_panel_fini(struct intel_panel *panel); - -extern void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, - struct drm_display_mode *adjusted_mode); -extern void intel_pch_panel_fitting(struct intel_crtc *crtc, - struct intel_crtc_config *pipe_config, - int fitting_mode); -extern void intel_gmch_panel_fitting(struct intel_crtc *crtc, - struct intel_crtc_config *pipe_config, - int fitting_mode); -extern void intel_panel_set_backlight(struct drm_device *dev, - u32 level, u32 max); -extern int intel_panel_setup_backlight(struct drm_connector *connector); -extern void intel_panel_enable_backlight(struct drm_device *dev, - enum pipe pipe); -extern void intel_panel_disable_backlight(struct drm_device *dev); -extern void intel_panel_destroy_backlight(struct drm_device *dev); -extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); - struct intel_set_config { struct drm_encoder **save_connector_encoders; struct drm_crtc **save_encoder_crtcs; @@ -597,18 +522,14 @@ struct intel_set_config { bool mode_changed; }; -extern void intel_crtc_restore_mode(struct drm_crtc *crtc); -extern void intel_crtc_load_lut(struct drm_crtc *crtc); -extern void intel_crtc_update_dpms(struct drm_crtc *crtc); -extern void intel_encoder_destroy(struct drm_encoder *encoder); -extern void intel_connector_dpms(struct drm_connector *, int mode); -extern bool intel_connector_get_hw_state(struct intel_connector *connector); -extern void intel_modeset_check_state(struct drm_device *dev); -extern void intel_plane_restore(struct drm_plane *plane); -extern void intel_plane_disable(struct drm_plane *plane); - +struct intel_load_detect_pipe { + struct drm_framebuffer *release_fb; + bool load_detect_temp; + int dpms_mode; +}; -static inline struct intel_encoder *intel_attached_encoder(struct drm_connector *connector) +static inline struct intel_encoder * +intel_attached_encoder(struct drm_connector *connector) { return to_intel_connector(connector)->encoder; } @@ -636,73 +557,106 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi) return container_of(intel_hdmi, struct intel_digital_port, hdmi); } + +/* i915_irq.c */ +extern bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, + enum pipe pipe, + bool enable); +extern bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, + enum transcoder pch_transcoder, + bool enable); +extern void ilk_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); +extern void ilk_disable_gt_irq(struct drm_i915_private *dev_priv, + uint32_t mask); +extern void snb_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); +extern void snb_disable_pm_irq(struct drm_i915_private *dev_priv, + uint32_t mask); +extern void hsw_pc8_disable_interrupts(struct drm_device *dev); +extern void hsw_pc8_restore_interrupts(struct drm_device *dev); + + +/* intel_crt.c */ +extern void intel_crt_init(struct drm_device *dev); + + +/* intel_ddi.c */ +extern void intel_prepare_ddi(struct drm_device *dev); +extern void hsw_fdi_link_train(struct drm_crtc *crtc); +extern void intel_ddi_init(struct drm_device *dev, enum port port); +extern enum port +intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); +extern bool intel_ddi_get_hw_state(struct intel_encoder *encoder, + enum pipe *pipe); +extern int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); +extern void intel_ddi_pll_init(struct drm_device *dev); +extern void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); +extern void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, + enum transcoder cpu_transcoder); +extern void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc); +extern void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc); +extern void intel_ddi_setup_hw_pll_state(struct drm_device *dev); +extern bool intel_ddi_pll_mode_set(struct drm_crtc *crtc); +extern void intel_ddi_put_crtc_pll(struct drm_crtc *crtc); +extern void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); +extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder); +extern bool +intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); +extern void intel_ddi_fdi_disable(struct drm_crtc *crtc); +extern void intel_ddi_get_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config); + + +/* intel_display.c */ +int intel_pch_rawclk(struct drm_device *dev); +extern bool intel_pipe_has_type(struct drm_crtc *crtc, int type); +extern void intel_mark_busy(struct drm_device *dev); +extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, + struct intel_ring_buffer *ring); +extern void intel_mark_idle(struct drm_device *dev); +extern void intel_crtc_restore_mode(struct drm_crtc *crtc); +extern void intel_crtc_load_lut(struct drm_crtc *crtc); +extern void intel_crtc_update_dpms(struct drm_crtc *crtc); +extern void intel_encoder_destroy(struct drm_encoder *encoder); +extern void intel_connector_dpms(struct drm_connector *, int mode); +extern bool intel_connector_get_hw_state(struct intel_connector *connector); +extern void intel_modeset_check_state(struct drm_device *dev); bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, struct intel_digital_port *port); - extern void intel_connector_attach_encoder(struct intel_connector *connector, struct intel_encoder *encoder); extern struct drm_encoder *intel_best_encoder(struct drm_connector *connector); - extern struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, struct drm_crtc *crtc); int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, struct drm_file *file_priv); extern enum transcoder -intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, - enum pipe pipe); +intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, enum pipe pipe); extern void intel_wait_for_vblank(struct drm_device *dev, int pipe); extern void intel_wait_for_pipe_off(struct drm_device *dev, int pipe); extern int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp); extern void vlv_wait_port_ready(struct drm_i915_private *dev_priv, int port); - -struct intel_load_detect_pipe { - struct drm_framebuffer *release_fb; - bool load_detect_temp; - int dpms_mode; -}; extern bool intel_get_load_detect_pipe(struct drm_connector *connector, struct drm_display_mode *mode, struct intel_load_detect_pipe *old); extern void intel_release_load_detect_pipe(struct drm_connector *connector, struct intel_load_detect_pipe *old); - extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, u16 blue, int regno); extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, int regno); - extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_i915_gem_object *obj, struct intel_ring_buffer *pipelined); extern void intel_unpin_fb_obj(struct drm_i915_gem_object *obj); - extern int intel_framebuffer_init(struct drm_device *dev, struct intel_framebuffer *ifb, struct drm_mode_fb_cmd2 *mode_cmd, struct drm_i915_gem_object *obj); extern void intel_framebuffer_fini(struct intel_framebuffer *fb); -extern int intel_fbdev_init(struct drm_device *dev); -extern void intel_fbdev_initial_config(struct drm_device *dev); -extern void intel_fbdev_fini(struct drm_device *dev); -extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); extern void intel_prepare_page_flip(struct drm_device *dev, int plane); extern void intel_finish_page_flip(struct drm_device *dev, int pipe); extern void intel_finish_page_flip_plane(struct drm_device *dev, int plane); - -extern void intel_setup_overlay(struct drm_device *dev); -extern void intel_cleanup_overlay(struct drm_device *dev); -extern int intel_overlay_switch_off(struct intel_overlay *overlay); -extern int intel_overlay_put_image(struct drm_device *dev, void *data, - struct drm_file *file_priv); -extern int intel_overlay_attrs(struct drm_device *dev, void *data, - struct drm_file *file_priv); - -extern void intel_fb_output_poll_changed(struct drm_device *dev); -extern void intel_fb_restore_mode(struct drm_device *dev); - -struct intel_shared_dpll * -intel_crtc_to_shared_dpll(struct intel_crtc *crtc); - +struct intel_shared_dpll *intel_crtc_to_shared_dpll(struct intel_crtc *crtc); void assert_shared_dpll(struct drm_i915_private *dev_priv, struct intel_shared_dpll *pll, bool state); @@ -720,46 +674,144 @@ extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, bool state); #define assert_pipe_enabled(d, p) assert_pipe(d, p, true) #define assert_pipe_disabled(d, p) assert_pipe(d, p, false) - -extern void intel_init_clock_gating(struct drm_device *dev); -extern void intel_suspend_hw(struct drm_device *dev); extern void intel_write_eld(struct drm_encoder *encoder, struct drm_display_mode *mode); -extern void intel_prepare_ddi(struct drm_device *dev); -extern void hsw_fdi_link_train(struct drm_crtc *crtc); -extern void intel_ddi_init(struct drm_device *dev, enum port port); -extern enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); - -/* For use by IVB LP watermark workaround in intel_sprite.c */ -extern void intel_update_watermarks(struct drm_crtc *crtc); -extern void intel_update_sprite_watermarks(struct drm_plane *plane, - struct drm_crtc *crtc, - uint32_t sprite_width, int pixel_size, - bool enabled, bool scaled); - extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, unsigned int tiling_mode, unsigned int bpp, unsigned int pitch); +extern void intel_display_handle_reset(struct drm_device *dev); +extern void hsw_disable_lcpll(struct drm_i915_private *dev_priv, + bool switch_to_fclk, bool allow_power_down); +extern void hsw_restore_lcpll(struct drm_i915_private *dev_priv); +extern void hsw_enable_pc8_work(struct work_struct *__work); +extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); +extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); +extern void intel_dp_get_m_n(struct intel_crtc *crtc, + struct intel_crtc_config *pipe_config); +extern int intel_dotclock_calculate(int link_freq, + const struct intel_link_m_n *m_n); +extern void +ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config, + int dotclock); +extern bool intel_crtc_active(struct drm_crtc *crtc); +extern void i915_disable_vga_mem(struct drm_device *dev); -extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data, - struct drm_file *file_priv); -extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data, - struct drm_file *file_priv); -/* Power-related functions, located in intel_pm.c */ +/* intel_dp.c */ +extern void intel_dp_init(struct drm_device *dev, int output_reg, + enum port port); +extern bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, + struct intel_connector *intel_connector); +extern void intel_dp_init_link_config(struct intel_dp *intel_dp); +extern void intel_dp_start_link_train(struct intel_dp *intel_dp); +extern void intel_dp_complete_link_train(struct intel_dp *intel_dp); +extern void intel_dp_stop_link_train(struct intel_dp *intel_dp); +extern void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); +extern void intel_dp_encoder_destroy(struct drm_encoder *encoder); +extern void intel_dp_check_link_status(struct intel_dp *intel_dp); +extern bool intel_dp_compute_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config); +extern bool intel_dpd_is_edp(struct drm_device *dev); +extern void ironlake_edp_backlight_on(struct intel_dp *intel_dp); +extern void ironlake_edp_backlight_off(struct intel_dp *intel_dp); +extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); +extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); +extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); +extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); +extern void intel_edp_psr_enable(struct intel_dp *intel_dp); +extern void intel_edp_psr_disable(struct intel_dp *intel_dp); +extern void intel_edp_psr_update(struct drm_device *dev); + + +/* intel_dsi.c */ +extern bool intel_dsi_init(struct drm_device *dev); + + +/* intel_dvo.c */ +extern void intel_dvo_init(struct drm_device *dev); + + +/* intel_fb.c */ +extern int intel_fbdev_init(struct drm_device *dev); +extern void intel_fbdev_initial_config(struct drm_device *dev); +extern void intel_fbdev_fini(struct drm_device *dev); +extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); +extern void intel_fb_output_poll_changed(struct drm_device *dev); +extern void intel_fb_restore_mode(struct drm_device *dev); + + +/* intel_hdmi.c */ +extern void intel_hdmi_init(struct drm_device *dev, + int hdmi_reg, enum port port); +extern void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, + struct intel_connector *intel_connector); +extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); +extern bool intel_hdmi_compute_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config); + + +/* intel_lvds.c */ +extern void intel_lvds_init(struct drm_device *dev); +extern 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); +extern void intel_attach_force_audio_property(struct drm_connector *connector); +extern void +intel_attach_broadcast_rgb_property(struct drm_connector *connector); + + +/* intel_overlay.c */ +extern void intel_setup_overlay(struct drm_device *dev); +extern void intel_cleanup_overlay(struct drm_device *dev); +extern int intel_overlay_switch_off(struct intel_overlay *overlay); +extern int intel_overlay_put_image(struct drm_device *dev, void *data, + struct drm_file *file_priv); +extern int intel_overlay_attrs(struct drm_device *dev, void *data, + struct drm_file *file_priv); + + +/* intel_panel.c */ +extern int intel_panel_init(struct intel_panel *panel, + struct drm_display_mode *fixed_mode); +extern void intel_panel_fini(struct intel_panel *panel); +extern void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, + struct drm_display_mode *adjusted_mode); +extern void intel_pch_panel_fitting(struct intel_crtc *crtc, + struct intel_crtc_config *pipe_config, + int fitting_mode); +extern void intel_gmch_panel_fitting(struct intel_crtc *crtc, + struct intel_crtc_config *pipe_config, + int fitting_mode); +extern void intel_panel_set_backlight(struct drm_device *dev, + u32 level, u32 max); +extern int intel_panel_setup_backlight(struct drm_connector *connector); +extern void intel_panel_enable_backlight(struct drm_device *dev, + enum pipe pipe); +extern void intel_panel_disable_backlight(struct drm_device *dev); +extern void intel_panel_destroy_backlight(struct drm_device *dev); +extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); + + +/* intel_pm.c */ +extern void intel_init_clock_gating(struct drm_device *dev); +extern void intel_suspend_hw(struct drm_device *dev); +extern void intel_update_watermarks(struct drm_crtc *crtc); +extern void intel_update_sprite_watermarks(struct drm_plane *plane, + struct drm_crtc *crtc, + uint32_t sprite_width, int pixel_size, + bool enabled, bool scaled); extern void intel_init_pm(struct drm_device *dev); -/* FBC */ extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_update_fbc(struct drm_device *dev); -/* IPS */ extern void intel_gpu_ips_init(struct drm_i915_private *dev_priv); extern void intel_gpu_ips_teardown(void); - -/* Power well */ extern int i915_init_power_well(struct drm_device *dev); extern void i915_remove_power_well(struct drm_device *dev); - extern bool intel_display_power_enabled(struct drm_device *dev, enum intel_display_power_domain domain); extern void intel_display_power_get(struct drm_device *dev, @@ -773,62 +825,28 @@ extern void intel_enable_gt_powersave(struct drm_device *dev); extern void intel_disable_gt_powersave(struct drm_device *dev); extern void ironlake_teardown_rc6(struct drm_device *dev); void gen6_update_ring_freq(struct drm_device *dev); +extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); +extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); -extern bool intel_ddi_get_hw_state(struct intel_encoder *encoder, - enum pipe *pipe); -extern int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); -extern void intel_ddi_pll_init(struct drm_device *dev); -extern void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); -extern void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, - enum transcoder cpu_transcoder); -extern void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc); -extern void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc); -extern void intel_ddi_setup_hw_pll_state(struct drm_device *dev); -extern bool intel_ddi_pll_mode_set(struct drm_crtc *crtc); -extern void intel_ddi_put_crtc_pll(struct drm_crtc *crtc); -extern void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); -extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder); -extern bool -intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); -extern void intel_ddi_fdi_disable(struct drm_crtc *crtc); -extern void intel_display_handle_reset(struct drm_device *dev); -extern bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, - enum pipe pipe, - bool enable); -extern bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, - enum transcoder pch_transcoder, - bool enable); +/* intel_sdvo.c */ +extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, + bool is_sdvob); -extern void intel_edp_psr_enable(struct intel_dp *intel_dp); -extern void intel_edp_psr_disable(struct intel_dp *intel_dp); -extern void intel_edp_psr_update(struct drm_device *dev); -extern void hsw_disable_lcpll(struct drm_i915_private *dev_priv, - bool switch_to_fclk, bool allow_power_down); -extern void hsw_restore_lcpll(struct drm_i915_private *dev_priv); -extern void ilk_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); -extern void ilk_disable_gt_irq(struct drm_i915_private *dev_priv, - uint32_t mask); -extern void snb_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); -extern void snb_disable_pm_irq(struct drm_i915_private *dev_priv, - uint32_t mask); -extern void hsw_enable_pc8_work(struct work_struct *__work); -extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); -extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); -extern void hsw_pc8_disable_interrupts(struct drm_device *dev); -extern void hsw_pc8_restore_interrupts(struct drm_device *dev); -extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); -extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); -extern void intel_dp_get_m_n(struct intel_crtc *crtc, - struct intel_crtc_config *pipe_config); -extern int intel_dotclock_calculate(int link_freq, - const struct intel_link_m_n *m_n); -extern void ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config, - int dotclock); -extern bool intel_crtc_active(struct drm_crtc *crtc); -extern void i915_disable_vga_mem(struct drm_device *dev); -extern void intel_ddi_get_config(struct intel_encoder *encoder, - struct intel_crtc_config *pipe_config); +/* intel_sprite.c */ +extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); +extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, + enum plane plane); +extern void intel_plane_restore(struct drm_plane *plane); +extern void intel_plane_disable(struct drm_plane *plane); +extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data, + struct drm_file *file_priv); +extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data, + struct drm_file *file_priv); + + +/* intel_tv.c */ +extern void intel_tv_init(struct drm_device *dev); #endif /* __INTEL_DRV_H__ */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/5] drm/i915: make intel_pipe_has_type static 2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni 2013-09-24 16:52 ` [PATCH 1/5] drm/i915: reorganize intel_drv.h Paulo Zanoni @ 2013-09-24 16:52 ` Paulo Zanoni 2013-09-24 16:52 ` [PATCH 3/5] drm/i915: make intel_crtc_load_lut static Paulo Zanoni ` (3 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: Paulo Zanoni @ 2013-09-24 16:52 UTC (permalink / raw) To: intel-gfx; +Cc: Paulo Zanoni From: Paulo Zanoni <paulo.r.zanoni@intel.com> Also move it to the top of the file so we can remove the forward declaration. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 31 +++++++++++++++---------------- drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 31eac15..4eec067 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -41,7 +41,6 @@ #include <drm/drm_crtc_helper.h> #include <linux/dma_remapping.h> -bool intel_pipe_has_type(struct drm_crtc *crtc, int type); static void intel_increase_pllclock(struct drm_crtc *crtc); static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); @@ -336,6 +335,21 @@ static const intel_limit_t intel_limits_vlv_hdmi = { .p2_slow = 2, .p2_fast = 20 }, }; +/** + * Returns whether any output on the specified pipe is of the specified type + */ +static bool intel_pipe_has_type(struct drm_crtc *crtc, int type) +{ + struct drm_device *dev = crtc->dev; + struct intel_encoder *encoder; + + for_each_encoder_on_crtc(dev, crtc, encoder) + if (encoder->type == type) + return true; + + return false; +} + static const intel_limit_t *intel_ironlake_limit(struct drm_crtc *crtc, int refclk) { @@ -438,21 +452,6 @@ static void i9xx_clock(int refclk, intel_clock_t *clock) clock->dot = clock->vco / clock->p; } -/** - * Returns whether any output on the specified pipe is of the specified type - */ -bool intel_pipe_has_type(struct drm_crtc *crtc, int type) -{ - struct drm_device *dev = crtc->dev; - struct intel_encoder *encoder; - - for_each_encoder_on_crtc(dev, crtc, encoder) - if (encoder->type == type) - return true; - - return false; -} - #define INTELPllInvalid(s) do { /* DRM_DEBUG(s); */ return false; } while (0) /** * Returns whether the given set of divisors are valid for a given refclk with diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 805dc92..04117f7 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -608,7 +608,6 @@ extern void intel_ddi_get_config(struct intel_encoder *encoder, /* intel_display.c */ int intel_pch_rawclk(struct drm_device *dev); -extern bool intel_pipe_has_type(struct drm_crtc *crtc, int type); extern void intel_mark_busy(struct drm_device *dev); extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, struct intel_ring_buffer *ring); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] drm/i915: make intel_crtc_load_lut static 2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni 2013-09-24 16:52 ` [PATCH 1/5] drm/i915: reorganize intel_drv.h Paulo Zanoni 2013-09-24 16:52 ` [PATCH 2/5] drm/i915: make intel_pipe_has_type static Paulo Zanoni @ 2013-09-24 16:52 ` Paulo Zanoni 2013-09-24 16:52 ` [PATCH 4/5] drm/i915: make intel_crtc_fb_gamma_{set, get} static Paulo Zanoni ` (2 subsequent siblings) 5 siblings, 0 replies; 9+ messages in thread From: Paulo Zanoni @ 2013-09-24 16:52 UTC (permalink / raw) To: intel-gfx; +Cc: Paulo Zanoni From: Paulo Zanoni <paulo.r.zanoni@intel.com> And move it so it doesn't need a forward declaration. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 156 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_drv.h | 1 - 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4eec067..2a08446 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3282,6 +3282,84 @@ static void intel_disable_planes(struct drm_crtc *crtc) intel_plane_disable(&intel_plane->base); } +static void hsw_enable_ips(struct intel_crtc *crtc) +{ + struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; + + if (!crtc->config.ips_enabled) + return; + + /* We can only enable IPS after we enable a plane and wait for a vblank. + * We guarantee that the plane is enabled by calling intel_enable_ips + * only after intel_enable_plane. And intel_enable_plane already waits + * for a vblank, so all we need to do here is to enable the IPS bit. */ + assert_plane_enabled(dev_priv, crtc->plane); + I915_WRITE(IPS_CTL, IPS_ENABLE); +} + +static void hsw_disable_ips(struct intel_crtc *crtc) +{ + struct drm_device *dev = crtc->base.dev; + struct drm_i915_private *dev_priv = dev->dev_private; + + if (!crtc->config.ips_enabled) + return; + + assert_plane_enabled(dev_priv, crtc->plane); + I915_WRITE(IPS_CTL, 0); + POSTING_READ(IPS_CTL); + + /* We need to wait for a vblank before we can disable the plane. */ + intel_wait_for_vblank(dev, crtc->pipe); +} + +/** Loads the palette/gamma unit for the CRTC with the prepared values */ +static void intel_crtc_load_lut(struct drm_crtc *crtc) +{ + struct drm_device *dev = crtc->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + enum pipe pipe = intel_crtc->pipe; + int palreg = PALETTE(pipe); + int i; + bool reenable_ips = false; + + /* The clocks have to be on to load the palette. */ + if (!crtc->enabled || !intel_crtc->active) + return; + + if (!HAS_PCH_SPLIT(dev_priv->dev)) { + if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DSI)) + assert_dsi_pll_enabled(dev_priv); + else + assert_pll_enabled(dev_priv, pipe); + } + + /* use legacy palette for Ironlake */ + if (HAS_PCH_SPLIT(dev)) + palreg = LGC_PALETTE(pipe); + + /* Workaround : Do not read or write the pipe palette/gamma data while + * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. + */ + if (intel_crtc->config.ips_enabled && + ((I915_READ(GAMMA_MODE(pipe)) & GAMMA_MODE_MODE_MASK) == + GAMMA_MODE_MODE_SPLIT)) { + hsw_disable_ips(intel_crtc); + reenable_ips = true; + } + + for (i = 0; i < 256; i++) { + I915_WRITE(palreg + 4 * i, + (intel_crtc->lut_r[i] << 16) | + (intel_crtc->lut_g[i] << 8) | + intel_crtc->lut_b[i]); + } + + if (reenable_ips) + hsw_enable_ips(intel_crtc); +} + static void ironlake_crtc_enable(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; @@ -3360,37 +3438,6 @@ static bool hsw_crtc_supports_ips(struct intel_crtc *crtc) return HAS_IPS(crtc->base.dev) && crtc->pipe == PIPE_A; } -static void hsw_enable_ips(struct intel_crtc *crtc) -{ - struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; - - if (!crtc->config.ips_enabled) - return; - - /* We can only enable IPS after we enable a plane and wait for a vblank. - * We guarantee that the plane is enabled by calling intel_enable_ips - * only after intel_enable_plane. And intel_enable_plane already waits - * for a vblank, so all we need to do here is to enable the IPS bit. */ - assert_plane_enabled(dev_priv, crtc->plane); - I915_WRITE(IPS_CTL, IPS_ENABLE); -} - -static void hsw_disable_ips(struct intel_crtc *crtc) -{ - struct drm_device *dev = crtc->base.dev; - struct drm_i915_private *dev_priv = dev->dev_private; - - if (!crtc->config.ips_enabled) - return; - - assert_plane_enabled(dev_priv, crtc->plane); - I915_WRITE(IPS_CTL, 0); - POSTING_READ(IPS_CTL); - - /* We need to wait for a vblank before we can disable the plane. */ - intel_wait_for_vblank(dev, crtc->pipe); -} - static void haswell_crtc_enable(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev; @@ -6786,53 +6833,6 @@ void intel_write_eld(struct drm_encoder *encoder, dev_priv->display.write_eld(connector, crtc); } -/** Loads the palette/gamma unit for the CRTC with the prepared values */ -void intel_crtc_load_lut(struct drm_crtc *crtc) -{ - struct drm_device *dev = crtc->dev; - struct drm_i915_private *dev_priv = dev->dev_private; - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - enum pipe pipe = intel_crtc->pipe; - int palreg = PALETTE(pipe); - int i; - bool reenable_ips = false; - - /* The clocks have to be on to load the palette. */ - if (!crtc->enabled || !intel_crtc->active) - return; - - if (!HAS_PCH_SPLIT(dev_priv->dev)) { - if (intel_pipe_has_type(crtc, INTEL_OUTPUT_DSI)) - assert_dsi_pll_enabled(dev_priv); - else - assert_pll_enabled(dev_priv, pipe); - } - - /* use legacy palette for Ironlake */ - if (HAS_PCH_SPLIT(dev)) - palreg = LGC_PALETTE(pipe); - - /* Workaround : Do not read or write the pipe palette/gamma data while - * GAMMA_MODE is configured for split gamma and IPS_CTL has IPS enabled. - */ - if (intel_crtc->config.ips_enabled && - ((I915_READ(GAMMA_MODE(pipe)) & GAMMA_MODE_MODE_MASK) == - GAMMA_MODE_MODE_SPLIT)) { - hsw_disable_ips(intel_crtc); - reenable_ips = true; - } - - for (i = 0; i < 256; i++) { - I915_WRITE(palreg + 4 * i, - (intel_crtc->lut_r[i] << 16) | - (intel_crtc->lut_g[i] << 8) | - intel_crtc->lut_b[i]); - } - - if (reenable_ips) - hsw_enable_ips(intel_crtc); -} - static void i845_update_cursor(struct drm_crtc *crtc, u32 base) { struct drm_device *dev = crtc->dev; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 04117f7..0074d75 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -613,7 +613,6 @@ extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, struct intel_ring_buffer *ring); extern void intel_mark_idle(struct drm_device *dev); extern void intel_crtc_restore_mode(struct drm_crtc *crtc); -extern void intel_crtc_load_lut(struct drm_crtc *crtc); extern void intel_crtc_update_dpms(struct drm_crtc *crtc); extern void intel_encoder_destroy(struct drm_encoder *encoder); extern void intel_connector_dpms(struct drm_connector *, int mode); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] drm/i915: make intel_crtc_fb_gamma_{set, get} static 2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni ` (2 preceding siblings ...) 2013-09-24 16:52 ` [PATCH 3/5] drm/i915: make intel_crtc_load_lut static Paulo Zanoni @ 2013-09-24 16:52 ` Paulo Zanoni 2013-09-24 16:52 ` [PATCH 5/5] drm/i915: make hsw_{disable, restore}_lcpll static Paulo Zanoni 2013-09-24 17:31 ` [PATCH 0/5] Organize intel_drv.h Daniel Vetter 5 siblings, 0 replies; 9+ messages in thread From: Paulo Zanoni @ 2013-09-24 16:52 UTC (permalink / raw) To: intel-gfx; +Cc: Paulo Zanoni From: Paulo Zanoni <paulo.r.zanoni@intel.com> By moving them to intel_fb.c. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 21 --------------------- drivers/gpu/drm/i915/intel_drv.h | 4 ---- drivers/gpu/drm/i915/intel_fb.c | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2a08446..3d72b99 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7102,27 +7102,6 @@ static int intel_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) return 0; } -/** Sets the color ramps on behalf of RandR */ -void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, - u16 blue, int regno) -{ - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - - intel_crtc->lut_r[regno] = red >> 8; - intel_crtc->lut_g[regno] = green >> 8; - intel_crtc->lut_b[regno] = blue >> 8; -} - -void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, int regno) -{ - struct intel_crtc *intel_crtc = to_intel_crtc(crtc); - - *red = intel_crtc->lut_r[regno] << 8; - *green = intel_crtc->lut_g[regno] << 8; - *blue = intel_crtc->lut_b[regno] << 8; -} - static void intel_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, uint32_t start, uint32_t size) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 0074d75..5b63cc6 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -638,10 +638,6 @@ extern bool intel_get_load_detect_pipe(struct drm_connector *connector, struct intel_load_detect_pipe *old); extern void intel_release_load_detect_pipe(struct drm_connector *connector, struct intel_load_detect_pipe *old); -extern void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, - u16 blue, int regno); -extern void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, - u16 *blue, int regno); extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, struct drm_i915_gem_object *obj, struct intel_ring_buffer *pipelined); diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 7ceb69b..d883b77 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -184,6 +184,27 @@ out: return ret; } +/** Sets the color ramps on behalf of RandR */ +static void intel_crtc_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green, + u16 blue, int regno) +{ + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + + intel_crtc->lut_r[regno] = red >> 8; + intel_crtc->lut_g[regno] = green >> 8; + intel_crtc->lut_b[regno] = blue >> 8; +} + +static void intel_crtc_fb_gamma_get(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, int regno) +{ + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + + *red = intel_crtc->lut_r[regno] << 8; + *green = intel_crtc->lut_g[regno] << 8; + *blue = intel_crtc->lut_b[regno] << 8; +} + static struct drm_fb_helper_funcs intel_fb_helper_funcs = { .gamma_set = intel_crtc_fb_gamma_set, .gamma_get = intel_crtc_fb_gamma_get, -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] drm/i915: make hsw_{disable, restore}_lcpll static 2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni ` (3 preceding siblings ...) 2013-09-24 16:52 ` [PATCH 4/5] drm/i915: make intel_crtc_fb_gamma_{set, get} static Paulo Zanoni @ 2013-09-24 16:52 ` Paulo Zanoni 2013-09-24 17:31 ` [PATCH 0/5] Organize intel_drv.h Daniel Vetter 5 siblings, 0 replies; 9+ messages in thread From: Paulo Zanoni @ 2013-09-24 16:52 UTC (permalink / raw) To: intel-gfx; +Cc: Paulo Zanoni From: Paulo Zanoni <paulo.r.zanoni@intel.com> These functions were added before the final PC8 implementation, and their callers moved to intel_display.c during the code review. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 6 +++--- drivers/gpu/drm/i915/intel_drv.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3d72b99..5fa58ad 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6157,8 +6157,8 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv) * register. Callers should take care of disabling all the display engine * functions, doing the mode unset, fixing interrupts, etc. */ -void hsw_disable_lcpll(struct drm_i915_private *dev_priv, - bool switch_to_fclk, bool allow_power_down) +static void hsw_disable_lcpll(struct drm_i915_private *dev_priv, + bool switch_to_fclk, bool allow_power_down) { uint32_t val; @@ -6208,7 +6208,7 @@ void hsw_disable_lcpll(struct drm_i915_private *dev_priv, * Fully restores LCPLL, disallowing power down and switching back to LCPLL * source. */ -void hsw_restore_lcpll(struct drm_i915_private *dev_priv) +static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) { uint32_t val; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5b63cc6..a92f481 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -675,9 +675,6 @@ extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, unsigned int bpp, unsigned int pitch); extern void intel_display_handle_reset(struct drm_device *dev); -extern void hsw_disable_lcpll(struct drm_i915_private *dev_priv, - bool switch_to_fclk, bool allow_power_down); -extern void hsw_restore_lcpll(struct drm_i915_private *dev_priv); extern void hsw_enable_pc8_work(struct work_struct *__work); extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/5] Organize intel_drv.h 2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni ` (4 preceding siblings ...) 2013-09-24 16:52 ` [PATCH 5/5] drm/i915: make hsw_{disable, restore}_lcpll static Paulo Zanoni @ 2013-09-24 17:31 ` Daniel Vetter 2013-09-24 18:48 ` [PATCH 6/5] drm/i915: remove "extern" keywords from intel_drv.h functions Paulo Zanoni 5 siblings, 1 reply; 9+ messages in thread From: Daniel Vetter @ 2013-09-24 17:31 UTC (permalink / raw) To: Paulo Zanoni; +Cc: intel-gfx, Paulo Zanoni On Tue, Sep 24, 2013 at 6:52 PM, Paulo Zanoni <przanoni@gmail.com> wrote: > > Also, feel free to suggest more changes on top of these, and flamewar about the > "extern" keywords. Can we just kill it? Imo it's redundant for functions, and now that we wreak havoc with intel_drv.h we might as well go full bore ... -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 6/5] drm/i915: remove "extern" keywords from intel_drv.h functions 2013-09-24 17:31 ` [PATCH 0/5] Organize intel_drv.h Daniel Vetter @ 2013-09-24 18:48 ` Paulo Zanoni 2013-09-24 19:09 ` Daniel Vetter 0 siblings, 1 reply; 9+ messages in thread From: Paulo Zanoni @ 2013-09-24 18:48 UTC (permalink / raw) To: intel-gfx; +Cc: Paulo Zanoni From: Paulo Zanoni <paulo.r.zanoni@intel.com> Since I already reorganized the header file, Daniel requested me to remove those keywords. It seems "checkpath.pl --strict" also doesn't like "extern" on header files. At least now we're consistent :) Requested-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_drv.h | 398 +++++++++++++++++++-------------------- 1 file changed, 192 insertions(+), 206 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index a92f481..8c3cb3e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -559,97 +559,91 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi) /* i915_irq.c */ -extern bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, - enum pipe pipe, - bool enable); -extern bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, - enum transcoder pch_transcoder, - bool enable); -extern void ilk_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); -extern void ilk_disable_gt_irq(struct drm_i915_private *dev_priv, - uint32_t mask); -extern void snb_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); -extern void snb_disable_pm_irq(struct drm_i915_private *dev_priv, - uint32_t mask); -extern void hsw_pc8_disable_interrupts(struct drm_device *dev); -extern void hsw_pc8_restore_interrupts(struct drm_device *dev); +bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, + enum pipe pipe, bool enable); +bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, + enum transcoder pch_transcoder, + bool enable); +void ilk_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); +void ilk_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); +void snb_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); +void snb_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); +void hsw_pc8_disable_interrupts(struct drm_device *dev); +void hsw_pc8_restore_interrupts(struct drm_device *dev); /* intel_crt.c */ -extern void intel_crt_init(struct drm_device *dev); +void intel_crt_init(struct drm_device *dev); /* intel_ddi.c */ -extern void intel_prepare_ddi(struct drm_device *dev); -extern void hsw_fdi_link_train(struct drm_crtc *crtc); -extern void intel_ddi_init(struct drm_device *dev, enum port port); -extern enum port -intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); -extern bool intel_ddi_get_hw_state(struct intel_encoder *encoder, - enum pipe *pipe); -extern int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); -extern void intel_ddi_pll_init(struct drm_device *dev); -extern void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); -extern void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, - enum transcoder cpu_transcoder); -extern void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc); -extern void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc); -extern void intel_ddi_setup_hw_pll_state(struct drm_device *dev); -extern bool intel_ddi_pll_mode_set(struct drm_crtc *crtc); -extern void intel_ddi_put_crtc_pll(struct drm_crtc *crtc); -extern void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); -extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder); -extern bool -intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); -extern void intel_ddi_fdi_disable(struct drm_crtc *crtc); -extern void intel_ddi_get_config(struct intel_encoder *encoder, - struct intel_crtc_config *pipe_config); +void intel_prepare_ddi(struct drm_device *dev); +void hsw_fdi_link_train(struct drm_crtc *crtc); +void intel_ddi_init(struct drm_device *dev, enum port port); +enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); +bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe); +int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); +void intel_ddi_pll_init(struct drm_device *dev); +void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); +void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, + enum transcoder cpu_transcoder); +void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc); +void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc); +void intel_ddi_setup_hw_pll_state(struct drm_device *dev); +bool intel_ddi_pll_mode_set(struct drm_crtc *crtc); +void intel_ddi_put_crtc_pll(struct drm_crtc *crtc); +void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); +void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder); +bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); +void intel_ddi_fdi_disable(struct drm_crtc *crtc); +void intel_ddi_get_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config); /* intel_display.c */ int intel_pch_rawclk(struct drm_device *dev); -extern void intel_mark_busy(struct drm_device *dev); -extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, - struct intel_ring_buffer *ring); -extern void intel_mark_idle(struct drm_device *dev); -extern void intel_crtc_restore_mode(struct drm_crtc *crtc); -extern void intel_crtc_update_dpms(struct drm_crtc *crtc); -extern void intel_encoder_destroy(struct drm_encoder *encoder); -extern void intel_connector_dpms(struct drm_connector *, int mode); -extern bool intel_connector_get_hw_state(struct intel_connector *connector); -extern void intel_modeset_check_state(struct drm_device *dev); +void intel_mark_busy(struct drm_device *dev); +void intel_mark_fb_busy(struct drm_i915_gem_object *obj, + struct intel_ring_buffer *ring); +void intel_mark_idle(struct drm_device *dev); +void intel_crtc_restore_mode(struct drm_crtc *crtc); +void intel_crtc_update_dpms(struct drm_crtc *crtc); +void intel_encoder_destroy(struct drm_encoder *encoder); +void intel_connector_dpms(struct drm_connector *, int mode); +bool intel_connector_get_hw_state(struct intel_connector *connector); +void intel_modeset_check_state(struct drm_device *dev); bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, struct intel_digital_port *port); -extern void intel_connector_attach_encoder(struct intel_connector *connector, - struct intel_encoder *encoder); -extern struct drm_encoder *intel_best_encoder(struct drm_connector *connector); -extern struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, - struct drm_crtc *crtc); +void intel_connector_attach_encoder(struct intel_connector *connector, + struct intel_encoder *encoder); +struct drm_encoder *intel_best_encoder(struct drm_connector *connector); +struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, + struct drm_crtc *crtc); int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, struct drm_file *file_priv); -extern enum transcoder -intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, enum pipe pipe); -extern void intel_wait_for_vblank(struct drm_device *dev, int pipe); -extern void intel_wait_for_pipe_off(struct drm_device *dev, int pipe); -extern int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp); -extern void vlv_wait_port_ready(struct drm_i915_private *dev_priv, int port); -extern bool intel_get_load_detect_pipe(struct drm_connector *connector, - struct drm_display_mode *mode, - struct intel_load_detect_pipe *old); -extern void intel_release_load_detect_pipe(struct drm_connector *connector, - struct intel_load_detect_pipe *old); -extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, - struct drm_i915_gem_object *obj, - struct intel_ring_buffer *pipelined); -extern void intel_unpin_fb_obj(struct drm_i915_gem_object *obj); -extern int intel_framebuffer_init(struct drm_device *dev, - struct intel_framebuffer *ifb, - struct drm_mode_fb_cmd2 *mode_cmd, - struct drm_i915_gem_object *obj); -extern void intel_framebuffer_fini(struct intel_framebuffer *fb); -extern void intel_prepare_page_flip(struct drm_device *dev, int plane); -extern void intel_finish_page_flip(struct drm_device *dev, int pipe); -extern void intel_finish_page_flip_plane(struct drm_device *dev, int plane); +enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, + enum pipe pipe); +void intel_wait_for_vblank(struct drm_device *dev, int pipe); +void intel_wait_for_pipe_off(struct drm_device *dev, int pipe); +int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp); +void vlv_wait_port_ready(struct drm_i915_private *dev_priv, int port); +bool intel_get_load_detect_pipe(struct drm_connector *connector, + struct drm_display_mode *mode, + struct intel_load_detect_pipe *old); +void intel_release_load_detect_pipe(struct drm_connector *connector, + struct intel_load_detect_pipe *old); +int intel_pin_and_fence_fb_obj(struct drm_device *dev, + struct drm_i915_gem_object *obj, + struct intel_ring_buffer *pipelined); +void intel_unpin_fb_obj(struct drm_i915_gem_object *obj); +int intel_framebuffer_init(struct drm_device *dev, + struct intel_framebuffer *ifb, + struct drm_mode_fb_cmd2 *mode_cmd, + struct drm_i915_gem_object *obj); +void intel_framebuffer_fini(struct intel_framebuffer *fb); +void intel_prepare_page_flip(struct drm_device *dev, int plane); +void intel_finish_page_flip(struct drm_device *dev, int pipe); +void intel_finish_page_flip_plane(struct drm_device *dev, int plane); struct intel_shared_dpll *intel_crtc_to_shared_dpll(struct intel_crtc *crtc); void assert_shared_dpll(struct drm_i915_private *dev_priv, struct intel_shared_dpll *pll, @@ -664,180 +658,172 @@ void assert_fdi_rx_pll(struct drm_i915_private *dev_priv, enum pipe pipe, bool state); #define assert_fdi_rx_pll_enabled(d, p) assert_fdi_rx_pll(d, p, true) #define assert_fdi_rx_pll_disabled(d, p) assert_fdi_rx_pll(d, p, false) -extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, - bool state); +void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, bool state); #define assert_pipe_enabled(d, p) assert_pipe(d, p, true) #define assert_pipe_disabled(d, p) assert_pipe(d, p, false) -extern void intel_write_eld(struct drm_encoder *encoder, - struct drm_display_mode *mode); -extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, - unsigned int tiling_mode, - unsigned int bpp, - unsigned int pitch); -extern void intel_display_handle_reset(struct drm_device *dev); -extern void hsw_enable_pc8_work(struct work_struct *__work); -extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); -extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); -extern void intel_dp_get_m_n(struct intel_crtc *crtc, - struct intel_crtc_config *pipe_config); -extern int intel_dotclock_calculate(int link_freq, - const struct intel_link_m_n *m_n); -extern void +void intel_write_eld(struct drm_encoder *encoder, + struct drm_display_mode *mode); +unsigned long intel_gen4_compute_page_offset(int *x, int *y, + unsigned int tiling_mode, + unsigned int bpp, + unsigned int pitch); +void intel_display_handle_reset(struct drm_device *dev); +void hsw_enable_pc8_work(struct work_struct *__work); +void hsw_enable_package_c8(struct drm_i915_private *dev_priv); +void hsw_disable_package_c8(struct drm_i915_private *dev_priv); +void intel_dp_get_m_n(struct intel_crtc *crtc, + struct intel_crtc_config *pipe_config); +int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); +void ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config, int dotclock); -extern bool intel_crtc_active(struct drm_crtc *crtc); -extern void i915_disable_vga_mem(struct drm_device *dev); +bool intel_crtc_active(struct drm_crtc *crtc); +void i915_disable_vga_mem(struct drm_device *dev); /* intel_dp.c */ -extern void intel_dp_init(struct drm_device *dev, int output_reg, - enum port port); -extern bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, - struct intel_connector *intel_connector); -extern void intel_dp_init_link_config(struct intel_dp *intel_dp); -extern void intel_dp_start_link_train(struct intel_dp *intel_dp); -extern void intel_dp_complete_link_train(struct intel_dp *intel_dp); -extern void intel_dp_stop_link_train(struct intel_dp *intel_dp); -extern void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); -extern void intel_dp_encoder_destroy(struct drm_encoder *encoder); -extern void intel_dp_check_link_status(struct intel_dp *intel_dp); -extern bool intel_dp_compute_config(struct intel_encoder *encoder, - struct intel_crtc_config *pipe_config); -extern bool intel_dpd_is_edp(struct drm_device *dev); -extern void ironlake_edp_backlight_on(struct intel_dp *intel_dp); -extern void ironlake_edp_backlight_off(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); -extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); -extern void intel_edp_psr_enable(struct intel_dp *intel_dp); -extern void intel_edp_psr_disable(struct intel_dp *intel_dp); -extern void intel_edp_psr_update(struct drm_device *dev); +void intel_dp_init(struct drm_device *dev, int output_reg, enum port port); +bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, + struct intel_connector *intel_connector); +void intel_dp_init_link_config(struct intel_dp *intel_dp); +void intel_dp_start_link_train(struct intel_dp *intel_dp); +void intel_dp_complete_link_train(struct intel_dp *intel_dp); +void intel_dp_stop_link_train(struct intel_dp *intel_dp); +void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); +void intel_dp_encoder_destroy(struct drm_encoder *encoder); +void intel_dp_check_link_status(struct intel_dp *intel_dp); +bool intel_dp_compute_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config); +bool intel_dpd_is_edp(struct drm_device *dev); +void ironlake_edp_backlight_on(struct intel_dp *intel_dp); +void ironlake_edp_backlight_off(struct intel_dp *intel_dp); +void ironlake_edp_panel_on(struct intel_dp *intel_dp); +void ironlake_edp_panel_off(struct intel_dp *intel_dp); +void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); +void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); +void intel_edp_psr_enable(struct intel_dp *intel_dp); +void intel_edp_psr_disable(struct intel_dp *intel_dp); +void intel_edp_psr_update(struct drm_device *dev); /* intel_dsi.c */ -extern bool intel_dsi_init(struct drm_device *dev); +bool intel_dsi_init(struct drm_device *dev); /* intel_dvo.c */ -extern void intel_dvo_init(struct drm_device *dev); +void intel_dvo_init(struct drm_device *dev); /* intel_fb.c */ -extern int intel_fbdev_init(struct drm_device *dev); -extern void intel_fbdev_initial_config(struct drm_device *dev); -extern void intel_fbdev_fini(struct drm_device *dev); -extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); -extern void intel_fb_output_poll_changed(struct drm_device *dev); -extern void intel_fb_restore_mode(struct drm_device *dev); +int intel_fbdev_init(struct drm_device *dev); +void intel_fbdev_initial_config(struct drm_device *dev); +void intel_fbdev_fini(struct drm_device *dev); +void intel_fbdev_set_suspend(struct drm_device *dev, int state); +void intel_fb_output_poll_changed(struct drm_device *dev); +void intel_fb_restore_mode(struct drm_device *dev); /* intel_hdmi.c */ -extern void intel_hdmi_init(struct drm_device *dev, - int hdmi_reg, enum port port); -extern void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, - struct intel_connector *intel_connector); -extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); -extern bool intel_hdmi_compute_config(struct intel_encoder *encoder, - struct intel_crtc_config *pipe_config); +void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port); +void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, + struct intel_connector *intel_connector); +struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); +bool intel_hdmi_compute_config(struct intel_encoder *encoder, + struct intel_crtc_config *pipe_config); /* intel_lvds.c */ -extern void intel_lvds_init(struct drm_device *dev); -extern bool intel_is_dual_link_lvds(struct drm_device *dev); +void intel_lvds_init(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); + struct edid *edid); int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); -extern void intel_attach_force_audio_property(struct drm_connector *connector); -extern void -intel_attach_broadcast_rgb_property(struct drm_connector *connector); +void intel_attach_force_audio_property(struct drm_connector *connector); +void intel_attach_broadcast_rgb_property(struct drm_connector *connector); /* intel_overlay.c */ -extern void intel_setup_overlay(struct drm_device *dev); -extern void intel_cleanup_overlay(struct drm_device *dev); -extern int intel_overlay_switch_off(struct intel_overlay *overlay); -extern int intel_overlay_put_image(struct drm_device *dev, void *data, - struct drm_file *file_priv); -extern int intel_overlay_attrs(struct drm_device *dev, void *data, - struct drm_file *file_priv); +void intel_setup_overlay(struct drm_device *dev); +void intel_cleanup_overlay(struct drm_device *dev); +int intel_overlay_switch_off(struct intel_overlay *overlay); +int intel_overlay_put_image(struct drm_device *dev, void *data, + struct drm_file *file_priv); +int intel_overlay_attrs(struct drm_device *dev, void *data, + struct drm_file *file_priv); /* intel_panel.c */ -extern int intel_panel_init(struct intel_panel *panel, - struct drm_display_mode *fixed_mode); -extern void intel_panel_fini(struct intel_panel *panel); -extern void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, - struct drm_display_mode *adjusted_mode); -extern void intel_pch_panel_fitting(struct intel_crtc *crtc, - struct intel_crtc_config *pipe_config, - int fitting_mode); -extern void intel_gmch_panel_fitting(struct intel_crtc *crtc, - struct intel_crtc_config *pipe_config, - int fitting_mode); -extern void intel_panel_set_backlight(struct drm_device *dev, - u32 level, u32 max); -extern int intel_panel_setup_backlight(struct drm_connector *connector); -extern void intel_panel_enable_backlight(struct drm_device *dev, - enum pipe pipe); -extern void intel_panel_disable_backlight(struct drm_device *dev); -extern void intel_panel_destroy_backlight(struct drm_device *dev); -extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); +int intel_panel_init(struct intel_panel *panel, + struct drm_display_mode *fixed_mode); +void intel_panel_fini(struct intel_panel *panel); +void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, + struct drm_display_mode *adjusted_mode); +void intel_pch_panel_fitting(struct intel_crtc *crtc, + struct intel_crtc_config *pipe_config, + int fitting_mode); +void intel_gmch_panel_fitting(struct intel_crtc *crtc, + struct intel_crtc_config *pipe_config, + int fitting_mode); +void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max); +int intel_panel_setup_backlight(struct drm_connector *connector); +void intel_panel_enable_backlight(struct drm_device *dev, enum pipe pipe); +void intel_panel_disable_backlight(struct drm_device *dev); +void intel_panel_destroy_backlight(struct drm_device *dev); +enum drm_connector_status intel_panel_detect(struct drm_device *dev); /* intel_pm.c */ -extern void intel_init_clock_gating(struct drm_device *dev); -extern void intel_suspend_hw(struct drm_device *dev); -extern void intel_update_watermarks(struct drm_crtc *crtc); -extern void intel_update_sprite_watermarks(struct drm_plane *plane, - struct drm_crtc *crtc, - uint32_t sprite_width, int pixel_size, - bool enabled, bool scaled); -extern void intel_init_pm(struct drm_device *dev); -extern bool intel_fbc_enabled(struct drm_device *dev); -extern void intel_update_fbc(struct drm_device *dev); -extern void intel_gpu_ips_init(struct drm_i915_private *dev_priv); -extern void intel_gpu_ips_teardown(void); -extern int i915_init_power_well(struct drm_device *dev); -extern void i915_remove_power_well(struct drm_device *dev); -extern bool intel_display_power_enabled(struct drm_device *dev, - enum intel_display_power_domain domain); -extern void intel_display_power_get(struct drm_device *dev, - enum intel_display_power_domain domain); -extern void intel_display_power_put(struct drm_device *dev, - enum intel_display_power_domain domain); -extern void intel_init_power_well(struct drm_device *dev); -extern void intel_set_power_well(struct drm_device *dev, bool enable); -extern void intel_resume_power_well(struct drm_device *dev); -extern void intel_enable_gt_powersave(struct drm_device *dev); -extern void intel_disable_gt_powersave(struct drm_device *dev); -extern void ironlake_teardown_rc6(struct drm_device *dev); +void intel_init_clock_gating(struct drm_device *dev); +void intel_suspend_hw(struct drm_device *dev); +void intel_update_watermarks(struct drm_crtc *crtc); +void intel_update_sprite_watermarks(struct drm_plane *plane, + struct drm_crtc *crtc, + uint32_t sprite_width, int pixel_size, + bool enabled, bool scaled); +void intel_init_pm(struct drm_device *dev); +bool intel_fbc_enabled(struct drm_device *dev); +void intel_update_fbc(struct drm_device *dev); +void intel_gpu_ips_init(struct drm_i915_private *dev_priv); +void intel_gpu_ips_teardown(void); +int i915_init_power_well(struct drm_device *dev); +void i915_remove_power_well(struct drm_device *dev); +bool intel_display_power_enabled(struct drm_device *dev, + enum intel_display_power_domain domain); +void intel_display_power_get(struct drm_device *dev, + enum intel_display_power_domain domain); +void intel_display_power_put(struct drm_device *dev, + enum intel_display_power_domain domain); +void intel_init_power_well(struct drm_device *dev); +void intel_set_power_well(struct drm_device *dev, bool enable); +void intel_resume_power_well(struct drm_device *dev); +void intel_enable_gt_powersave(struct drm_device *dev); +void intel_disable_gt_powersave(struct drm_device *dev); +void ironlake_teardown_rc6(struct drm_device *dev); void gen6_update_ring_freq(struct drm_device *dev); -extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); -extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); +void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); +void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); /* intel_sdvo.c */ -extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, - bool is_sdvob); +bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob); /* intel_sprite.c */ -extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); -extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, - enum plane plane); -extern void intel_plane_restore(struct drm_plane *plane); -extern void intel_plane_disable(struct drm_plane *plane); -extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data, - struct drm_file *file_priv); -extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data, - struct drm_file *file_priv); +int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); +void intel_flush_display_plane(struct drm_i915_private *dev_priv, + enum plane plane); +void intel_plane_restore(struct drm_plane *plane); +void intel_plane_disable(struct drm_plane *plane); +int intel_sprite_set_colorkey(struct drm_device *dev, void *data, + struct drm_file *file_priv); +int intel_sprite_get_colorkey(struct drm_device *dev, void *data, + struct drm_file *file_priv); /* intel_tv.c */ -extern void intel_tv_init(struct drm_device *dev); +void intel_tv_init(struct drm_device *dev); #endif /* __INTEL_DRV_H__ */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 6/5] drm/i915: remove "extern" keywords from intel_drv.h functions 2013-09-24 18:48 ` [PATCH 6/5] drm/i915: remove "extern" keywords from intel_drv.h functions Paulo Zanoni @ 2013-09-24 19:09 ` Daniel Vetter 0 siblings, 0 replies; 9+ messages in thread From: Daniel Vetter @ 2013-09-24 19:09 UTC (permalink / raw) To: Paulo Zanoni; +Cc: intel-gfx, Paulo Zanoni On Tue, Sep 24, 2013 at 03:48:31PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > Since I already reorganized the header file, Daniel requested me to > remove those keywords. It seems "checkpath.pl --strict" also doesn't > like "extern" on header files. > > At least now we're consistent :) > > Requested-by: Daniel Vetter <daniel.vetter@ffwll.ch> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Entire patch series merged, thanks. -Daniel > --- > drivers/gpu/drm/i915/intel_drv.h | 398 +++++++++++++++++++-------------------- > 1 file changed, 192 insertions(+), 206 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index a92f481..8c3cb3e 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -559,97 +559,91 @@ hdmi_to_dig_port(struct intel_hdmi *intel_hdmi) > > > /* i915_irq.c */ > -extern bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, > - enum pipe pipe, > - bool enable); > -extern bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, > - enum transcoder pch_transcoder, > - bool enable); > -extern void ilk_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); > -extern void ilk_disable_gt_irq(struct drm_i915_private *dev_priv, > - uint32_t mask); > -extern void snb_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); > -extern void snb_disable_pm_irq(struct drm_i915_private *dev_priv, > - uint32_t mask); > -extern void hsw_pc8_disable_interrupts(struct drm_device *dev); > -extern void hsw_pc8_restore_interrupts(struct drm_device *dev); > +bool intel_set_cpu_fifo_underrun_reporting(struct drm_device *dev, > + enum pipe pipe, bool enable); > +bool intel_set_pch_fifo_underrun_reporting(struct drm_device *dev, > + enum transcoder pch_transcoder, > + bool enable); > +void ilk_enable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); > +void ilk_disable_gt_irq(struct drm_i915_private *dev_priv, uint32_t mask); > +void snb_enable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); > +void snb_disable_pm_irq(struct drm_i915_private *dev_priv, uint32_t mask); > +void hsw_pc8_disable_interrupts(struct drm_device *dev); > +void hsw_pc8_restore_interrupts(struct drm_device *dev); > > > /* intel_crt.c */ > -extern void intel_crt_init(struct drm_device *dev); > +void intel_crt_init(struct drm_device *dev); > > > /* intel_ddi.c */ > -extern void intel_prepare_ddi(struct drm_device *dev); > -extern void hsw_fdi_link_train(struct drm_crtc *crtc); > -extern void intel_ddi_init(struct drm_device *dev, enum port port); > -extern enum port > -intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); > -extern bool intel_ddi_get_hw_state(struct intel_encoder *encoder, > - enum pipe *pipe); > -extern int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); > -extern void intel_ddi_pll_init(struct drm_device *dev); > -extern void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); > -extern void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, > - enum transcoder cpu_transcoder); > -extern void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc); > -extern void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc); > -extern void intel_ddi_setup_hw_pll_state(struct drm_device *dev); > -extern bool intel_ddi_pll_mode_set(struct drm_crtc *crtc); > -extern void intel_ddi_put_crtc_pll(struct drm_crtc *crtc); > -extern void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); > -extern void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder); > -extern bool > -intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); > -extern void intel_ddi_fdi_disable(struct drm_crtc *crtc); > -extern void intel_ddi_get_config(struct intel_encoder *encoder, > - struct intel_crtc_config *pipe_config); > +void intel_prepare_ddi(struct drm_device *dev); > +void hsw_fdi_link_train(struct drm_crtc *crtc); > +void intel_ddi_init(struct drm_device *dev, enum port port); > +enum port intel_ddi_get_encoder_port(struct intel_encoder *intel_encoder); > +bool intel_ddi_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe); > +int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv); > +void intel_ddi_pll_init(struct drm_device *dev); > +void intel_ddi_enable_transcoder_func(struct drm_crtc *crtc); > +void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv, > + enum transcoder cpu_transcoder); > +void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc); > +void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc); > +void intel_ddi_setup_hw_pll_state(struct drm_device *dev); > +bool intel_ddi_pll_mode_set(struct drm_crtc *crtc); > +void intel_ddi_put_crtc_pll(struct drm_crtc *crtc); > +void intel_ddi_set_pipe_settings(struct drm_crtc *crtc); > +void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder); > +bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector); > +void intel_ddi_fdi_disable(struct drm_crtc *crtc); > +void intel_ddi_get_config(struct intel_encoder *encoder, > + struct intel_crtc_config *pipe_config); > > > /* intel_display.c */ > int intel_pch_rawclk(struct drm_device *dev); > -extern void intel_mark_busy(struct drm_device *dev); > -extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, > - struct intel_ring_buffer *ring); > -extern void intel_mark_idle(struct drm_device *dev); > -extern void intel_crtc_restore_mode(struct drm_crtc *crtc); > -extern void intel_crtc_update_dpms(struct drm_crtc *crtc); > -extern void intel_encoder_destroy(struct drm_encoder *encoder); > -extern void intel_connector_dpms(struct drm_connector *, int mode); > -extern bool intel_connector_get_hw_state(struct intel_connector *connector); > -extern void intel_modeset_check_state(struct drm_device *dev); > +void intel_mark_busy(struct drm_device *dev); > +void intel_mark_fb_busy(struct drm_i915_gem_object *obj, > + struct intel_ring_buffer *ring); > +void intel_mark_idle(struct drm_device *dev); > +void intel_crtc_restore_mode(struct drm_crtc *crtc); > +void intel_crtc_update_dpms(struct drm_crtc *crtc); > +void intel_encoder_destroy(struct drm_encoder *encoder); > +void intel_connector_dpms(struct drm_connector *, int mode); > +bool intel_connector_get_hw_state(struct intel_connector *connector); > +void intel_modeset_check_state(struct drm_device *dev); > bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, > struct intel_digital_port *port); > -extern void intel_connector_attach_encoder(struct intel_connector *connector, > - struct intel_encoder *encoder); > -extern struct drm_encoder *intel_best_encoder(struct drm_connector *connector); > -extern struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, > - struct drm_crtc *crtc); > +void intel_connector_attach_encoder(struct intel_connector *connector, > + struct intel_encoder *encoder); > +struct drm_encoder *intel_best_encoder(struct drm_connector *connector); > +struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev, > + struct drm_crtc *crtc); > int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, > struct drm_file *file_priv); > -extern enum transcoder > -intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, enum pipe pipe); > -extern void intel_wait_for_vblank(struct drm_device *dev, int pipe); > -extern void intel_wait_for_pipe_off(struct drm_device *dev, int pipe); > -extern int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp); > -extern void vlv_wait_port_ready(struct drm_i915_private *dev_priv, int port); > -extern bool intel_get_load_detect_pipe(struct drm_connector *connector, > - struct drm_display_mode *mode, > - struct intel_load_detect_pipe *old); > -extern void intel_release_load_detect_pipe(struct drm_connector *connector, > - struct intel_load_detect_pipe *old); > -extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, > - struct drm_i915_gem_object *obj, > - struct intel_ring_buffer *pipelined); > -extern void intel_unpin_fb_obj(struct drm_i915_gem_object *obj); > -extern int intel_framebuffer_init(struct drm_device *dev, > - struct intel_framebuffer *ifb, > - struct drm_mode_fb_cmd2 *mode_cmd, > - struct drm_i915_gem_object *obj); > -extern void intel_framebuffer_fini(struct intel_framebuffer *fb); > -extern void intel_prepare_page_flip(struct drm_device *dev, int plane); > -extern void intel_finish_page_flip(struct drm_device *dev, int pipe); > -extern void intel_finish_page_flip_plane(struct drm_device *dev, int plane); > +enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, > + enum pipe pipe); > +void intel_wait_for_vblank(struct drm_device *dev, int pipe); > +void intel_wait_for_pipe_off(struct drm_device *dev, int pipe); > +int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp); > +void vlv_wait_port_ready(struct drm_i915_private *dev_priv, int port); > +bool intel_get_load_detect_pipe(struct drm_connector *connector, > + struct drm_display_mode *mode, > + struct intel_load_detect_pipe *old); > +void intel_release_load_detect_pipe(struct drm_connector *connector, > + struct intel_load_detect_pipe *old); > +int intel_pin_and_fence_fb_obj(struct drm_device *dev, > + struct drm_i915_gem_object *obj, > + struct intel_ring_buffer *pipelined); > +void intel_unpin_fb_obj(struct drm_i915_gem_object *obj); > +int intel_framebuffer_init(struct drm_device *dev, > + struct intel_framebuffer *ifb, > + struct drm_mode_fb_cmd2 *mode_cmd, > + struct drm_i915_gem_object *obj); > +void intel_framebuffer_fini(struct intel_framebuffer *fb); > +void intel_prepare_page_flip(struct drm_device *dev, int plane); > +void intel_finish_page_flip(struct drm_device *dev, int pipe); > +void intel_finish_page_flip_plane(struct drm_device *dev, int plane); > struct intel_shared_dpll *intel_crtc_to_shared_dpll(struct intel_crtc *crtc); > void assert_shared_dpll(struct drm_i915_private *dev_priv, > struct intel_shared_dpll *pll, > @@ -664,180 +658,172 @@ void assert_fdi_rx_pll(struct drm_i915_private *dev_priv, > enum pipe pipe, bool state); > #define assert_fdi_rx_pll_enabled(d, p) assert_fdi_rx_pll(d, p, true) > #define assert_fdi_rx_pll_disabled(d, p) assert_fdi_rx_pll(d, p, false) > -extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, > - bool state); > +void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, bool state); > #define assert_pipe_enabled(d, p) assert_pipe(d, p, true) > #define assert_pipe_disabled(d, p) assert_pipe(d, p, false) > -extern void intel_write_eld(struct drm_encoder *encoder, > - struct drm_display_mode *mode); > -extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, > - unsigned int tiling_mode, > - unsigned int bpp, > - unsigned int pitch); > -extern void intel_display_handle_reset(struct drm_device *dev); > -extern void hsw_enable_pc8_work(struct work_struct *__work); > -extern void hsw_enable_package_c8(struct drm_i915_private *dev_priv); > -extern void hsw_disable_package_c8(struct drm_i915_private *dev_priv); > -extern void intel_dp_get_m_n(struct intel_crtc *crtc, > - struct intel_crtc_config *pipe_config); > -extern int intel_dotclock_calculate(int link_freq, > - const struct intel_link_m_n *m_n); > -extern void > +void intel_write_eld(struct drm_encoder *encoder, > + struct drm_display_mode *mode); > +unsigned long intel_gen4_compute_page_offset(int *x, int *y, > + unsigned int tiling_mode, > + unsigned int bpp, > + unsigned int pitch); > +void intel_display_handle_reset(struct drm_device *dev); > +void hsw_enable_pc8_work(struct work_struct *__work); > +void hsw_enable_package_c8(struct drm_i915_private *dev_priv); > +void hsw_disable_package_c8(struct drm_i915_private *dev_priv); > +void intel_dp_get_m_n(struct intel_crtc *crtc, > + struct intel_crtc_config *pipe_config); > +int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n); > +void > ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config, > int dotclock); > -extern bool intel_crtc_active(struct drm_crtc *crtc); > -extern void i915_disable_vga_mem(struct drm_device *dev); > +bool intel_crtc_active(struct drm_crtc *crtc); > +void i915_disable_vga_mem(struct drm_device *dev); > > > /* intel_dp.c */ > -extern void intel_dp_init(struct drm_device *dev, int output_reg, > - enum port port); > -extern bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > - struct intel_connector *intel_connector); > -extern void intel_dp_init_link_config(struct intel_dp *intel_dp); > -extern void intel_dp_start_link_train(struct intel_dp *intel_dp); > -extern void intel_dp_complete_link_train(struct intel_dp *intel_dp); > -extern void intel_dp_stop_link_train(struct intel_dp *intel_dp); > -extern void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); > -extern void intel_dp_encoder_destroy(struct drm_encoder *encoder); > -extern void intel_dp_check_link_status(struct intel_dp *intel_dp); > -extern bool intel_dp_compute_config(struct intel_encoder *encoder, > - struct intel_crtc_config *pipe_config); > -extern bool intel_dpd_is_edp(struct drm_device *dev); > -extern void ironlake_edp_backlight_on(struct intel_dp *intel_dp); > -extern void ironlake_edp_backlight_off(struct intel_dp *intel_dp); > -extern void ironlake_edp_panel_on(struct intel_dp *intel_dp); > -extern void ironlake_edp_panel_off(struct intel_dp *intel_dp); > -extern void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); > -extern void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); > -extern void intel_edp_psr_enable(struct intel_dp *intel_dp); > -extern void intel_edp_psr_disable(struct intel_dp *intel_dp); > -extern void intel_edp_psr_update(struct drm_device *dev); > +void intel_dp_init(struct drm_device *dev, int output_reg, enum port port); > +bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port, > + struct intel_connector *intel_connector); > +void intel_dp_init_link_config(struct intel_dp *intel_dp); > +void intel_dp_start_link_train(struct intel_dp *intel_dp); > +void intel_dp_complete_link_train(struct intel_dp *intel_dp); > +void intel_dp_stop_link_train(struct intel_dp *intel_dp); > +void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode); > +void intel_dp_encoder_destroy(struct drm_encoder *encoder); > +void intel_dp_check_link_status(struct intel_dp *intel_dp); > +bool intel_dp_compute_config(struct intel_encoder *encoder, > + struct intel_crtc_config *pipe_config); > +bool intel_dpd_is_edp(struct drm_device *dev); > +void ironlake_edp_backlight_on(struct intel_dp *intel_dp); > +void ironlake_edp_backlight_off(struct intel_dp *intel_dp); > +void ironlake_edp_panel_on(struct intel_dp *intel_dp); > +void ironlake_edp_panel_off(struct intel_dp *intel_dp); > +void ironlake_edp_panel_vdd_on(struct intel_dp *intel_dp); > +void ironlake_edp_panel_vdd_off(struct intel_dp *intel_dp, bool sync); > +void intel_edp_psr_enable(struct intel_dp *intel_dp); > +void intel_edp_psr_disable(struct intel_dp *intel_dp); > +void intel_edp_psr_update(struct drm_device *dev); > > > /* intel_dsi.c */ > -extern bool intel_dsi_init(struct drm_device *dev); > +bool intel_dsi_init(struct drm_device *dev); > > > /* intel_dvo.c */ > -extern void intel_dvo_init(struct drm_device *dev); > +void intel_dvo_init(struct drm_device *dev); > > > /* intel_fb.c */ > -extern int intel_fbdev_init(struct drm_device *dev); > -extern void intel_fbdev_initial_config(struct drm_device *dev); > -extern void intel_fbdev_fini(struct drm_device *dev); > -extern void intel_fbdev_set_suspend(struct drm_device *dev, int state); > -extern void intel_fb_output_poll_changed(struct drm_device *dev); > -extern void intel_fb_restore_mode(struct drm_device *dev); > +int intel_fbdev_init(struct drm_device *dev); > +void intel_fbdev_initial_config(struct drm_device *dev); > +void intel_fbdev_fini(struct drm_device *dev); > +void intel_fbdev_set_suspend(struct drm_device *dev, int state); > +void intel_fb_output_poll_changed(struct drm_device *dev); > +void intel_fb_restore_mode(struct drm_device *dev); > > > /* intel_hdmi.c */ > -extern void intel_hdmi_init(struct drm_device *dev, > - int hdmi_reg, enum port port); > -extern void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > - struct intel_connector *intel_connector); > -extern struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); > -extern bool intel_hdmi_compute_config(struct intel_encoder *encoder, > - struct intel_crtc_config *pipe_config); > +void intel_hdmi_init(struct drm_device *dev, int hdmi_reg, enum port port); > +void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, > + struct intel_connector *intel_connector); > +struct intel_hdmi *enc_to_intel_hdmi(struct drm_encoder *encoder); > +bool intel_hdmi_compute_config(struct intel_encoder *encoder, > + struct intel_crtc_config *pipe_config); > > > /* intel_lvds.c */ > -extern void intel_lvds_init(struct drm_device *dev); > -extern bool intel_is_dual_link_lvds(struct drm_device *dev); > +void intel_lvds_init(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); > + struct edid *edid); > int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); > -extern void intel_attach_force_audio_property(struct drm_connector *connector); > -extern void > -intel_attach_broadcast_rgb_property(struct drm_connector *connector); > +void intel_attach_force_audio_property(struct drm_connector *connector); > +void intel_attach_broadcast_rgb_property(struct drm_connector *connector); > > > /* intel_overlay.c */ > -extern void intel_setup_overlay(struct drm_device *dev); > -extern void intel_cleanup_overlay(struct drm_device *dev); > -extern int intel_overlay_switch_off(struct intel_overlay *overlay); > -extern int intel_overlay_put_image(struct drm_device *dev, void *data, > - struct drm_file *file_priv); > -extern int intel_overlay_attrs(struct drm_device *dev, void *data, > - struct drm_file *file_priv); > +void intel_setup_overlay(struct drm_device *dev); > +void intel_cleanup_overlay(struct drm_device *dev); > +int intel_overlay_switch_off(struct intel_overlay *overlay); > +int intel_overlay_put_image(struct drm_device *dev, void *data, > + struct drm_file *file_priv); > +int intel_overlay_attrs(struct drm_device *dev, void *data, > + struct drm_file *file_priv); > > > /* intel_panel.c */ > -extern int intel_panel_init(struct intel_panel *panel, > - struct drm_display_mode *fixed_mode); > -extern void intel_panel_fini(struct intel_panel *panel); > -extern void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, > - struct drm_display_mode *adjusted_mode); > -extern void intel_pch_panel_fitting(struct intel_crtc *crtc, > - struct intel_crtc_config *pipe_config, > - int fitting_mode); > -extern void intel_gmch_panel_fitting(struct intel_crtc *crtc, > - struct intel_crtc_config *pipe_config, > - int fitting_mode); > -extern void intel_panel_set_backlight(struct drm_device *dev, > - u32 level, u32 max); > -extern int intel_panel_setup_backlight(struct drm_connector *connector); > -extern void intel_panel_enable_backlight(struct drm_device *dev, > - enum pipe pipe); > -extern void intel_panel_disable_backlight(struct drm_device *dev); > -extern void intel_panel_destroy_backlight(struct drm_device *dev); > -extern enum drm_connector_status intel_panel_detect(struct drm_device *dev); > +int intel_panel_init(struct intel_panel *panel, > + struct drm_display_mode *fixed_mode); > +void intel_panel_fini(struct intel_panel *panel); > +void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode, > + struct drm_display_mode *adjusted_mode); > +void intel_pch_panel_fitting(struct intel_crtc *crtc, > + struct intel_crtc_config *pipe_config, > + int fitting_mode); > +void intel_gmch_panel_fitting(struct intel_crtc *crtc, > + struct intel_crtc_config *pipe_config, > + int fitting_mode); > +void intel_panel_set_backlight(struct drm_device *dev, u32 level, u32 max); > +int intel_panel_setup_backlight(struct drm_connector *connector); > +void intel_panel_enable_backlight(struct drm_device *dev, enum pipe pipe); > +void intel_panel_disable_backlight(struct drm_device *dev); > +void intel_panel_destroy_backlight(struct drm_device *dev); > +enum drm_connector_status intel_panel_detect(struct drm_device *dev); > > > /* intel_pm.c */ > -extern void intel_init_clock_gating(struct drm_device *dev); > -extern void intel_suspend_hw(struct drm_device *dev); > -extern void intel_update_watermarks(struct drm_crtc *crtc); > -extern void intel_update_sprite_watermarks(struct drm_plane *plane, > - struct drm_crtc *crtc, > - uint32_t sprite_width, int pixel_size, > - bool enabled, bool scaled); > -extern void intel_init_pm(struct drm_device *dev); > -extern bool intel_fbc_enabled(struct drm_device *dev); > -extern void intel_update_fbc(struct drm_device *dev); > -extern void intel_gpu_ips_init(struct drm_i915_private *dev_priv); > -extern void intel_gpu_ips_teardown(void); > -extern int i915_init_power_well(struct drm_device *dev); > -extern void i915_remove_power_well(struct drm_device *dev); > -extern bool intel_display_power_enabled(struct drm_device *dev, > - enum intel_display_power_domain domain); > -extern void intel_display_power_get(struct drm_device *dev, > - enum intel_display_power_domain domain); > -extern void intel_display_power_put(struct drm_device *dev, > - enum intel_display_power_domain domain); > -extern void intel_init_power_well(struct drm_device *dev); > -extern void intel_set_power_well(struct drm_device *dev, bool enable); > -extern void intel_resume_power_well(struct drm_device *dev); > -extern void intel_enable_gt_powersave(struct drm_device *dev); > -extern void intel_disable_gt_powersave(struct drm_device *dev); > -extern void ironlake_teardown_rc6(struct drm_device *dev); > +void intel_init_clock_gating(struct drm_device *dev); > +void intel_suspend_hw(struct drm_device *dev); > +void intel_update_watermarks(struct drm_crtc *crtc); > +void intel_update_sprite_watermarks(struct drm_plane *plane, > + struct drm_crtc *crtc, > + uint32_t sprite_width, int pixel_size, > + bool enabled, bool scaled); > +void intel_init_pm(struct drm_device *dev); > +bool intel_fbc_enabled(struct drm_device *dev); > +void intel_update_fbc(struct drm_device *dev); > +void intel_gpu_ips_init(struct drm_i915_private *dev_priv); > +void intel_gpu_ips_teardown(void); > +int i915_init_power_well(struct drm_device *dev); > +void i915_remove_power_well(struct drm_device *dev); > +bool intel_display_power_enabled(struct drm_device *dev, > + enum intel_display_power_domain domain); > +void intel_display_power_get(struct drm_device *dev, > + enum intel_display_power_domain domain); > +void intel_display_power_put(struct drm_device *dev, > + enum intel_display_power_domain domain); > +void intel_init_power_well(struct drm_device *dev); > +void intel_set_power_well(struct drm_device *dev, bool enable); > +void intel_resume_power_well(struct drm_device *dev); > +void intel_enable_gt_powersave(struct drm_device *dev); > +void intel_disable_gt_powersave(struct drm_device *dev); > +void ironlake_teardown_rc6(struct drm_device *dev); > void gen6_update_ring_freq(struct drm_device *dev); > -extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); > -extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); > +void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv); > +void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv); > > > /* intel_sdvo.c */ > -extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, > - bool is_sdvob); > +bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob); > > > /* intel_sprite.c */ > -extern int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); > -extern void intel_flush_display_plane(struct drm_i915_private *dev_priv, > - enum plane plane); > -extern void intel_plane_restore(struct drm_plane *plane); > -extern void intel_plane_disable(struct drm_plane *plane); > -extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data, > - struct drm_file *file_priv); > -extern int intel_sprite_get_colorkey(struct drm_device *dev, void *data, > - struct drm_file *file_priv); > +int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane); > +void intel_flush_display_plane(struct drm_i915_private *dev_priv, > + enum plane plane); > +void intel_plane_restore(struct drm_plane *plane); > +void intel_plane_disable(struct drm_plane *plane); > +int intel_sprite_set_colorkey(struct drm_device *dev, void *data, > + struct drm_file *file_priv); > +int intel_sprite_get_colorkey(struct drm_device *dev, void *data, > + struct drm_file *file_priv); > > > /* intel_tv.c */ > -extern void intel_tv_init(struct drm_device *dev); > +void intel_tv_init(struct drm_device *dev); > > #endif /* __INTEL_DRV_H__ */ > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-09-24 19:08 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-24 16:52 [PATCH 0/5] Organize intel_drv.h Paulo Zanoni
2013-09-24 16:52 ` [PATCH 1/5] drm/i915: reorganize intel_drv.h Paulo Zanoni
2013-09-24 16:52 ` [PATCH 2/5] drm/i915: make intel_pipe_has_type static Paulo Zanoni
2013-09-24 16:52 ` [PATCH 3/5] drm/i915: make intel_crtc_load_lut static Paulo Zanoni
2013-09-24 16:52 ` [PATCH 4/5] drm/i915: make intel_crtc_fb_gamma_{set, get} static Paulo Zanoni
2013-09-24 16:52 ` [PATCH 5/5] drm/i915: make hsw_{disable, restore}_lcpll static Paulo Zanoni
2013-09-24 17:31 ` [PATCH 0/5] Organize intel_drv.h Daniel Vetter
2013-09-24 18:48 ` [PATCH 6/5] drm/i915: remove "extern" keywords from intel_drv.h functions Paulo Zanoni
2013-09-24 19:09 ` Daniel Vetter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox