Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.

i915_dma.c is just adjacent lines changed, nothing nefarious there.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_drv.h

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc drivers/gpu/drm/drm_crtc_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
index f221631,637b695..b3873c9
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -1333,11 -1330,9 +1333,11 @@@ static int i915_load_modeset_init(struc
  
        /* Always safe in the mode setting case. */
        /* FIXME: do pre/post-mode set stuff in core KMS code */
-       dev->vblank_disable_allowed = 1;
+       dev->vblank_disable_allowed = true;
 -      if (INTEL_INFO(dev)->num_pipes == 0)
 +      if (INTEL_INFO(dev)->num_pipes == 0) {
 +              intel_display_power_put(dev, POWER_DOMAIN_VGA);
                return 0;
 +      }
  
        ret = intel_fbdev_init(dev);
        if (ret)
@@@ -1480,14 -1473,7 +1480,7 @@@ int i915_driver_load(struct drm_device 
        if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET))
                return -ENODEV;
  
-       /* i915 has 4 more counters */
-       dev->counters += 4;
-       dev->types[6] = _DRM_STAT_IRQ;
-       dev->types[7] = _DRM_STAT_PRIMARY;
-       dev->types[8] = _DRM_STAT_SECONDARY;
-       dev->types[9] = _DRM_STAT_DMA;
- 
 -      dev_priv = kzalloc(sizeof(drm_i915_private_t), GFP_KERNEL);
 +      dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
        if (dev_priv == NULL)
                return -ENOMEM;
  

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gpu_error.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ddi.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
index 922c5d7,287bbef..eaf0003
--- 1/drivers/gpu/drm/i915/intel_drv.h
--- 2/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -658,174 -714,117 +656,173 @@@ void assert_fdi_rx_pll(struct drm_i915_
                       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)
- void intel_dp_init_link_config(struct intel_dp *intel_dp);
 +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);
 +bool intel_crtc_active(struct drm_crtc *crtc);
 +void i915_disable_vga_mem(struct drm_device *dev);
 +
 +
 +/* intel_dp.c */
 +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_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 */
 +bool intel_dsi_init(struct drm_device *dev);
 +
 +
 +/* intel_dvo.c */
 +void intel_dvo_init(struct drm_device *dev);
 +
 +
 +/* intel_fb.c */
 +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);
  
 -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 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 */
 -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,
 -                                  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);
 +
 +/* intel_hdmi.c */
 +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 */
 +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);
 +int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);
 +void intel_attach_force_audio_property(struct drm_connector *connector);
 +void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
 +
 +
 +/* intel_overlay.c */
 +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 */
 +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 */
 +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_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);
 +void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv);
 +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);
 -
 -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);
 +/* intel_sdvo.c */
 +bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob);
 +
 +
 +/* intel_sprite.c */
 +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 */
 +void intel_tv_init(struct drm_device *dev);
 +
 +void gen6_rps_idle(struct drm_i915_private *dev_priv);
 +void gen6_rps_boost(struct drm_i915_private *dev_priv);
  
  #endif /* __INTEL_DRV_H__ */

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_tv.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc include/drm/drm_crtc.h
Simple merge