| Message ID | 1457537506-12455-5-git-send-email-imre.deak@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Imre, [auto build test WARNING on drm-intel/for-linux-next] [also build test WARNING on next-20160309] [cannot apply to v4.5-rc7] [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] url: https://github.com/0day-ci/linux/commits/Imre-Deak/drm-i915-Move-some-load-time-init-steps-earlier/20160309-233629 base: git://anongit.freedesktop.org/drm-intel for-linux-next reproduce: make htmldocs All warnings (new ones prefixed by >>): include/drm/drm_crtc.h:2144: warning: No description found for parameter 'allow_fb_modifiers' include/drm/drm_dp_helper.h:749: warning: No description found for parameter 'i2c_nack_count' include/drm/drm_dp_helper.h:749: warning: No description found for parameter 'i2c_defer_count' drivers/gpu/drm/drm_dp_mst_topology.c:2364: warning: No description found for parameter 'connector' include/drm/drm_dp_mst_helper.h:92: warning: No description found for parameter 'cached_edid' include/drm/drm_dp_mst_helper.h:92: warning: No description found for parameter 'has_audio' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'max_dpcd_transaction_bytes' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'sink_count' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'total_slots' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'avail_slots' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'total_pbn' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'qlock' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_msg_downq' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_down_in_progress' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'payload_lock' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'proposed_vcpis' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'payloads' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'payload_mask' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'vcpi_mask' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_waitq' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'work' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'tx_work' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'destroy_connector_list' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'destroy_connector_lock' include/drm/drm_dp_mst_helper.h:466: warning: No description found for parameter 'destroy_connector_work' drivers/gpu/drm/drm_dp_mst_topology.c:2364: warning: No description found for parameter 'connector' drivers/gpu/drm/drm_irq.c:176: warning: No description found for parameter 'flags' include/drm/drmP.h:168: warning: No description found for parameter 'fmt' include/drm/drmP.h:184: warning: No description found for parameter 'fmt' include/drm/drmP.h:202: warning: No description found for parameter 'fmt' include/drm/drmP.h:247: warning: No description found for parameter 'dev' include/drm/drmP.h:247: warning: No description found for parameter 'data' include/drm/drmP.h:247: warning: No description found for parameter 'file_priv' include/drm/drmP.h:280: warning: No description found for parameter 'ioctl' include/drm/drmP.h:280: warning: No description found for parameter '_func' include/drm/drmP.h:280: warning: No description found for parameter '_flags' include/drm/drmP.h:362: warning: cannot understand function prototype: 'struct drm_lock_data ' include/drm/drmP.h:415: warning: cannot understand function prototype: 'struct drm_driver ' include/drm/drmP.h:672: warning: cannot understand function prototype: 'struct drm_info_list ' include/drm/drmP.h:682: warning: cannot understand function prototype: 'struct drm_info_node ' include/drm/drmP.h:692: warning: cannot understand function prototype: 'struct drm_minor ' include/drm/drmP.h:740: warning: cannot understand function prototype: 'struct drm_device ' drivers/gpu/drm/i915/intel_runtime_pm.c:2269: warning: No description found for parameter 'resume' drivers/gpu/drm/i915/intel_runtime_pm.c:2269: warning: No description found for parameter 'resume' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'wedged' drivers/gpu/drm/i915/i915_irq.c:2665: warning: No description found for parameter 'fmt' drivers/gpu/drm/i915/i915_gem.c:421: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:421: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:421: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:686: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:686: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:686: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'args' drivers/gpu/drm/i915/i915_gem.c:767: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1029: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1029: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1029: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1245: warning: No description found for parameter 'rps' drivers/gpu/drm/i915/i915_gem.c:1461: warning: No description found for parameter 'req' drivers/gpu/drm/i915/i915_gem.c:1496: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:1496: warning: No description found for parameter 'readonly' drivers/gpu/drm/i915/i915_gem.c:1619: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1619: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1619: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1682: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1682: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1682: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:1727: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:1727: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:1727: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'size' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'tiling_mode' drivers/gpu/drm/i915/i915_gem.c:2015: warning: No description found for parameter 'fenced' drivers/gpu/drm/i915/i915_gem.c:2015: warning: Excess function parameter 'obj' description in 'i915_gem_get_gtt_alignment' drivers/gpu/drm/i915/i915_gem.c:2914: warning: No description found for parameter 'ring' drivers/gpu/drm/i915/i915_gem.c:3045: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3095: warning: No description found for parameter 'dev' drivers/gpu/drm/i915/i915_gem.c:3095: warning: No description found for parameter 'data' drivers/gpu/drm/i915/i915_gem.c:3095: warning: No description found for parameter 'file' drivers/gpu/drm/i915/i915_gem.c:3095: warning: Excess function parameter 'DRM_IOCTL_ARGS' description in 'i915_gem_wait_ioctl' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'vm' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'ggtt_view' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'alignment' drivers/gpu/drm/i915/i915_gem.c:3467: warning: No description found for parameter 'flags' drivers/gpu/drm/i915/i915_gem.c:3722: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3722: warning: No description found for parameter 'write' drivers/gpu/drm/i915/i915_gem.c:3797: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:3797: warning: No description found for parameter 'cache_level' drivers/gpu/drm/i915/i915_gem.c:4071: warning: No description found for parameter 'obj' drivers/gpu/drm/i915/i915_gem.c:4071: warning: No description found for parameter 'write' >> drivers/gpu/drm/i915/intel_audio.c:571: warning: No description found for parameter 'dev_priv' >> drivers/gpu/drm/i915/intel_audio.c:571: warning: Excess function parameter 'dev' description in 'intel_init_audio_callbacks' >> drivers/gpu/drm/i915/intel_audio.c:571: warning: No description found for parameter 'dev_priv' >> drivers/gpu/drm/i915/intel_audio.c:571: warning: Excess function parameter 'dev' description in 'intel_init_audio_callbacks' drivers/gpu/drm/i915/intel_lrc.c:948: warning: No description found for parameter 'params' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'dev' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'file' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'ring' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'ctx' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'batch_obj' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'exec_start' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'dispatch_flags' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: No description found for parameter 'params' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'dev' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'file' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'ring' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'ctx' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'batch_obj' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'exec_start' description in 'intel_execlists_submission' drivers/gpu/drm/i915/intel_lrc.c:948: warning: Excess function parameter 'dispatch_flags' description in 'intel_execlists_submission' Warning: didn't use docs for i915_hotplug_interrupt_update Warning: didn't use docs for ilk_update_display_irq Warning: didn't use docs for ilk_update_gt_irq Warning: didn't use docs for snb_update_pm_irq Warning: didn't use docs for bdw_update_port_irq Warning: didn't use docs for bdw_update_pipe_irq Warning: didn't use docs for ibx_display_interrupt_update Warning: didn't use docs for i915_enable_asle_pipestat Warning: didn't use docs for ivybridge_parity_work Warning: didn't use docs for i915_reset_and_wakeup Warning: didn't use docs for i915_handle_error Warning: didn't use docs for intel_irq_install Warning: didn't use docs for intel_irq_uninstall vim +/dev_priv +571 drivers/gpu/drm/i915/intel_audio.c 51e1d83c David Henningsson 2015-08-19 555 dev_priv->display.audio_codec_disable(intel_encoder); 51e1d83c David Henningsson 2015-08-19 556 cae666ce Takashi Iwai 2015-11-12 557 mutex_lock(&dev_priv->av_mutex); cae666ce Takashi Iwai 2015-11-12 558 intel_dig_port->audio_connector = NULL; 9dfbffcf Takashi Iwai 2016-02-24 559 dev_priv->dig_port_map[port] = NULL; cae666ce Takashi Iwai 2015-11-12 560 mutex_unlock(&dev_priv->av_mutex); cae666ce Takashi Iwai 2015-11-12 561 51e1d83c David Henningsson 2015-08-19 562 if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) f0675d4a David Henningsson 2015-09-03 563 acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, (int) port); 7c10a2b5 Jani Nikula 2014-10-27 564 } 7c10a2b5 Jani Nikula 2014-10-27 565 7c10a2b5 Jani Nikula 2014-10-27 566 /** 7c10a2b5 Jani Nikula 2014-10-27 567 * intel_init_audio - Set up chip specific audio functions 7c10a2b5 Jani Nikula 2014-10-27 568 * @dev: drm device 7c10a2b5 Jani Nikula 2014-10-27 569 */ 576177de Imre Deak 2016-03-09 570 void intel_init_audio_callbacks(struct drm_i915_private *dev_priv) 7c10a2b5 Jani Nikula 2014-10-27 @571 { 576177de Imre Deak 2016-03-09 572 if (IS_G4X(dev_priv)) { 69bfe1a9 Jani Nikula 2014-10-27 573 dev_priv->display.audio_codec_enable = g4x_audio_codec_enable; 76d8d3e5 Jani Nikula 2014-10-27 574 dev_priv->display.audio_codec_disable = g4x_audio_codec_disable; 576177de Imre Deak 2016-03-09 575 } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { 69bfe1a9 Jani Nikula 2014-10-27 576 dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; 495a5bb8 Jani Nikula 2014-10-27 577 dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; 576177de Imre Deak 2016-03-09 578 } else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8) { 69bfe1a9 Jani Nikula 2014-10-27 579 dev_priv->display.audio_codec_enable = hsw_audio_codec_enable; :::::: The code at line 571 was first introduced by commit :::::: 7c10a2b5876e014b3986d7e20b2a2894a757b138 drm/i915: add new intel audio file to group DP/HDMI audio :::::: TO: Jani Nikula <jani.nikula@intel.com> :::::: CC: Daniel Vetter <daniel.vetter@ffwll.ch> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Wed, 2016-03-09 at 17:31 +0200, Imre Deak wrote: > All of this is SW only initialization so we can move them earlier. Move > the mutex init where the rest of the locks are inited. While at it also > convert dev to dev_priv. > > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/i915_dma.c | 3 ++ > drivers/gpu/drm/i915/intel_audio.c | 12 +++--- > drivers/gpu/drm/i915/intel_display.c | 77 ++++++++++++++++------------------- > - > drivers/gpu/drm/i915/intel_drv.h | 3 +- > 4 files changed, 45 insertions(+), 50 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 9b3ed00..55b0c62 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1016,6 +1016,7 @@ int i915_driver_load(struct drm_device *dev, unsigned > long flags) > mutex_init(&dev_priv->modeset_restore_lock); > mutex_init(&dev_priv->av_mutex); > mutex_init(&dev_priv->wm.wm_mutex); > + mutex_init(&dev_priv->pps_mutex); > > ret = i915_workqueues_init(dev_priv); > if (ret < 0) > @@ -1028,6 +1029,8 @@ int i915_driver_load(struct drm_device *dev, unsigned > long flags) > intel_init_dpio(dev_priv); > intel_power_domains_init(dev_priv); > intel_irq_init(dev_priv); > + intel_init_display_callbacks(dev_priv); > + intel_init_audio_callbacks(dev_priv); > > intel_runtime_pm_get(dev_priv); > > diff --git a/drivers/gpu/drm/i915/intel_audio.c > b/drivers/gpu/drm/i915/intel_audio.c > index 30f9214..1936752 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -567,20 +567,18 @@ void intel_audio_codec_disable(struct intel_encoder > *intel_encoder) > * intel_init_audio - Set up chip specific audio functions > * @dev: drm device > */ > -void intel_init_audio(struct drm_device *dev) > +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > - > - if (IS_G4X(dev)) { > + if (IS_G4X(dev_priv)) { > dev_priv->display.audio_codec_enable = > g4x_audio_codec_enable; > dev_priv->display.audio_codec_disable = > g4x_audio_codec_disable; > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.audio_codec_enable = > ilk_audio_codec_enable; > dev_priv->display.audio_codec_disable = > ilk_audio_codec_disable; > - } else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) { > + } else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8) { > dev_priv->display.audio_codec_enable = > hsw_audio_codec_enable; > dev_priv->display.audio_codec_disable = > hsw_audio_codec_disable; > - } else if (HAS_PCH_SPLIT(dev)) { > + } else if (HAS_PCH_SPLIT(dev_priv)) { > dev_priv->display.audio_codec_enable = > ilk_audio_codec_enable; > dev_priv->display.audio_codec_disable = > ilk_audio_codec_disable; > } > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 62d36a7..5170718 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15095,22 +15095,20 @@ static const struct drm_mode_config_funcs > intel_mode_funcs = { > }; > > /* Set up chip specific display functions */ > -static void intel_init_display(struct drm_device *dev) > +void intel_init_display_callbacks(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > - > - if (HAS_PCH_SPLIT(dev) || IS_G4X(dev)) > + if (HAS_PCH_SPLIT(dev_priv) || IS_G4X(dev_priv)) > dev_priv->display.find_dpll = g4x_find_best_dpll; > - else if (IS_CHERRYVIEW(dev)) > + else if (IS_CHERRYVIEW(dev_priv)) > dev_priv->display.find_dpll = chv_find_best_dpll; > - else if (IS_VALLEYVIEW(dev)) > + else if (IS_VALLEYVIEW(dev_priv)) > dev_priv->display.find_dpll = vlv_find_best_dpll; > - else if (IS_PINEVIEW(dev)) > + else if (IS_PINEVIEW(dev_priv)) > dev_priv->display.find_dpll = pnv_find_best_dpll; > else > dev_priv->display.find_dpll = i9xx_find_best_dpll; > > - if (INTEL_INFO(dev)->gen >= 9) { > + if (INTEL_INFO(dev_priv)->gen >= 9) { > dev_priv->display.get_pipe_config = haswell_get_pipe_config; > dev_priv->display.get_initial_plane_config = > skylake_get_initial_plane_config; > @@ -15118,7 +15116,7 @@ static void intel_init_display(struct drm_device *dev) > haswell_crtc_compute_clock; > dev_priv->display.crtc_enable = haswell_crtc_enable; > dev_priv->display.crtc_disable = haswell_crtc_disable; > - } else if (HAS_DDI(dev)) { > + } else if (HAS_DDI(dev_priv)) { > dev_priv->display.get_pipe_config = haswell_get_pipe_config; > dev_priv->display.get_initial_plane_config = > ironlake_get_initial_plane_config; > @@ -15126,7 +15124,7 @@ static void intel_init_display(struct drm_device *dev) > haswell_crtc_compute_clock; > dev_priv->display.crtc_enable = haswell_crtc_enable; > dev_priv->display.crtc_disable = haswell_crtc_disable; > - } else if (HAS_PCH_SPLIT(dev)) { > + } else if (HAS_PCH_SPLIT(dev_priv)) { > dev_priv->display.get_pipe_config = ironlake_get_pipe_config; > dev_priv->display.get_initial_plane_config = > ironlake_get_initial_plane_config; > @@ -15134,7 +15132,7 @@ static void intel_init_display(struct drm_device *dev) > ironlake_crtc_compute_clock; > dev_priv->display.crtc_enable = ironlake_crtc_enable; > dev_priv->display.crtc_disable = ironlake_crtc_disable; > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.get_pipe_config = i9xx_get_pipe_config; > dev_priv->display.get_initial_plane_config = > i9xx_get_initial_plane_config; > @@ -15151,89 +15149,89 @@ static void intel_init_display(struct drm_device > *dev) > } > > /* Returns the core display clock speed */ > - if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) > + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) > dev_priv->display.get_display_clock_speed = > skylake_get_display_clock_speed; > - else if (IS_BROXTON(dev)) > + else if (IS_BROXTON(dev_priv)) > dev_priv->display.get_display_clock_speed = > broxton_get_display_clock_speed; > - else if (IS_BROADWELL(dev)) > + else if (IS_BROADWELL(dev_priv)) > dev_priv->display.get_display_clock_speed = > broadwell_get_display_clock_speed; > - else if (IS_HASWELL(dev)) > + else if (IS_HASWELL(dev_priv)) > dev_priv->display.get_display_clock_speed = > haswell_get_display_clock_speed; > - else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) > + else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > dev_priv->display.get_display_clock_speed = > valleyview_get_display_clock_speed; > - else if (IS_GEN5(dev)) > + else if (IS_GEN5(dev_priv)) > dev_priv->display.get_display_clock_speed = > ilk_get_display_clock_speed; > - else if (IS_I945G(dev) || IS_BROADWATER(dev) || > - IS_GEN6(dev) || IS_IVYBRIDGE(dev)) > + else if (IS_I945G(dev_priv) || IS_BROADWATER(dev_priv) || > + IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) > dev_priv->display.get_display_clock_speed = > i945_get_display_clock_speed; > - else if (IS_GM45(dev)) > + else if (IS_GM45(dev_priv)) > dev_priv->display.get_display_clock_speed = > gm45_get_display_clock_speed; > - else if (IS_CRESTLINE(dev)) > + else if (IS_CRESTLINE(dev_priv)) > dev_priv->display.get_display_clock_speed = > i965gm_get_display_clock_speed; > - else if (IS_PINEVIEW(dev)) > + else if (IS_PINEVIEW(dev_priv)) > dev_priv->display.get_display_clock_speed = > pnv_get_display_clock_speed; > - else if (IS_G33(dev) || IS_G4X(dev)) > + else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) > dev_priv->display.get_display_clock_speed = > g33_get_display_clock_speed; > - else if (IS_I915G(dev)) > + else if (IS_I915G(dev_priv)) > dev_priv->display.get_display_clock_speed = > i915_get_display_clock_speed; > - else if (IS_I945GM(dev) || IS_845G(dev)) > + else if (IS_I945GM(dev_priv) || IS_845G(dev_priv)) > dev_priv->display.get_display_clock_speed = > i9xx_misc_get_display_clock_speed; > - else if (IS_I915GM(dev)) > + else if (IS_I915GM(dev_priv)) > dev_priv->display.get_display_clock_speed = > i915gm_get_display_clock_speed; > - else if (IS_I865G(dev)) > + else if (IS_I865G(dev_priv)) > dev_priv->display.get_display_clock_speed = > i865_get_display_clock_speed; > - else if (IS_I85X(dev)) > + else if (IS_I85X(dev_priv)) > dev_priv->display.get_display_clock_speed = > i85x_get_display_clock_speed; > else { /* 830 */ > - WARN(!IS_I830(dev), "Unknown platform. Assuming 133 MHz > CDCLK\n"); > + WARN(!IS_I830(dev_priv), "Unknown platform. Assuming 133 MHz > CDCLK\n"); > dev_priv->display.get_display_clock_speed = > i830_get_display_clock_speed; > } > > - if (IS_GEN5(dev)) { > + if (IS_GEN5(dev_priv)) { > dev_priv->display.fdi_link_train = ironlake_fdi_link_train; > - } else if (IS_GEN6(dev)) { > + } else if (IS_GEN6(dev_priv)) { > dev_priv->display.fdi_link_train = gen6_fdi_link_train; > - } else if (IS_IVYBRIDGE(dev)) { > + } else if (IS_IVYBRIDGE(dev_priv)) { > /* FIXME: detect B0+ stepping and use auto training */ > dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; > - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > + } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > dev_priv->display.fdi_link_train = hsw_fdi_link_train; > - if (IS_BROADWELL(dev)) { > + if (IS_BROADWELL(dev_priv)) { > dev_priv->display.modeset_commit_cdclk = > broadwell_modeset_commit_cdclk; > dev_priv->display.modeset_calc_cdclk = > broadwell_modeset_calc_cdclk; > } > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.modeset_commit_cdclk = > valleyview_modeset_commit_cdclk; > dev_priv->display.modeset_calc_cdclk = > valleyview_modeset_calc_cdclk; > - } else if (IS_BROXTON(dev)) { > + } else if (IS_BROXTON(dev_priv)) { > dev_priv->display.modeset_commit_cdclk = > broxton_modeset_commit_cdclk; > dev_priv->display.modeset_calc_cdclk = > broxton_modeset_calc_cdclk; > } Would it make sense to change these if ladders into a structs of function pointers and point to those from struct intel_device_info? The HAS_PCH_SPLIT() check could be a bit tricky, but those usually go as if (HAS_DDI()) ... else if (HAS_PCH_SPLIT()) ..., so they usually mean ILK, SNB and IVB. I'm not saying this should be part of this series, but just wanted to throw the idea out there. Ander > > - switch (INTEL_INFO(dev)->gen) { > + switch (INTEL_INFO(dev_priv)->gen) { > case 2: > dev_priv->display.queue_flip = intel_gen2_queue_flip; > break; > @@ -15260,8 +15258,6 @@ static void intel_init_display(struct drm_device *dev) > /* Default just returns -ENODEV to indicate unsupported */ > dev_priv->display.queue_flip = intel_default_queue_flip; > } > - > - mutex_init(&dev_priv->pps_mutex); > } > > /* > @@ -15588,9 +15584,6 @@ void intel_modeset_init(struct drm_device *dev) > } > } > > - intel_init_display(dev); > - intel_init_audio(dev); > - > if (IS_GEN2(dev)) { > dev->mode_config.max_width = 2048; > dev->mode_config.max_height = 2048; > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index 7b2d66d..5264901 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1110,7 +1110,7 @@ u32 intel_fb_stride_alignment(const struct > drm_i915_private *dev_priv, > uint64_t fb_modifier, uint32_t pixel_format); > > /* intel_audio.c */ > -void intel_init_audio(struct drm_device *dev); > +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv); > void intel_audio_codec_enable(struct intel_encoder *encoder); > void intel_audio_codec_disable(struct intel_encoder *encoder); > void i915_audio_component_init(struct drm_i915_private *dev_priv); > @@ -1118,6 +1118,7 @@ void i915_audio_component_cleanup(struct > drm_i915_private *dev_priv); > > /* intel_display.c */ > extern const struct drm_plane_funcs intel_plane_funcs; > +void intel_init_display_callbacks(struct drm_i915_private *dev_priv); > unsigned int intel_rotation_info_size(const struct intel_rotation_info > *rot_info); > bool intel_has_pending_fb_unpin(struct drm_device *dev); > void intel_mark_busy(struct drm_device *dev);
On to, 2016-03-10 at 10:58 +0200, Ander Conselvan De Oliveira wrote: > On Wed, 2016-03-09 at 17:31 +0200, Imre Deak wrote: > > All of this is SW only initialization so we can move them earlier. > > Move > > the mutex init where the rest of the locks are inited. While at it > > also > > convert dev to dev_priv. > > > > Signed-off-by: Imre Deak <imre.deak@intel.com> > > --- > > drivers/gpu/drm/i915/i915_dma.c | 3 ++ > > drivers/gpu/drm/i915/intel_audio.c | 12 +++--- > > drivers/gpu/drm/i915/intel_display.c | 77 ++++++++++++++++------ > > ------------- > > - > > drivers/gpu/drm/i915/intel_drv.h | 3 +- > > 4 files changed, 45 insertions(+), 50 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c > > b/drivers/gpu/drm/i915/i915_dma.c > > index 9b3ed00..55b0c62 100644 > > --- a/drivers/gpu/drm/i915/i915_dma.c > > +++ b/drivers/gpu/drm/i915/i915_dma.c > > @@ -1016,6 +1016,7 @@ int i915_driver_load(struct drm_device *dev, > > unsigned > > long flags) > > mutex_init(&dev_priv->modeset_restore_lock); > > mutex_init(&dev_priv->av_mutex); > > mutex_init(&dev_priv->wm.wm_mutex); > > + mutex_init(&dev_priv->pps_mutex); > > > > ret = i915_workqueues_init(dev_priv); > > if (ret < 0) > > @@ -1028,6 +1029,8 @@ int i915_driver_load(struct drm_device *dev, > > unsigned > > long flags) > > intel_init_dpio(dev_priv); > > intel_power_domains_init(dev_priv); > > intel_irq_init(dev_priv); > > + intel_init_display_callbacks(dev_priv); > > + intel_init_audio_callbacks(dev_priv); > > > > intel_runtime_pm_get(dev_priv); > > > > diff --git a/drivers/gpu/drm/i915/intel_audio.c > > b/drivers/gpu/drm/i915/intel_audio.c > > index 30f9214..1936752 100644 > > --- a/drivers/gpu/drm/i915/intel_audio.c > > +++ b/drivers/gpu/drm/i915/intel_audio.c > > @@ -567,20 +567,18 @@ void intel_audio_codec_disable(struct > > intel_encoder > > *intel_encoder) > > * intel_init_audio - Set up chip specific audio functions > > * @dev: drm device > > */ > > -void intel_init_audio(struct drm_device *dev) > > +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv) > > { > > - struct drm_i915_private *dev_priv = dev->dev_private; > > - > > - if (IS_G4X(dev)) { > > + if (IS_G4X(dev_priv)) { > > dev_priv->display.audio_codec_enable = > > g4x_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > g4x_audio_codec_disable; > > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > + } else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.audio_codec_enable = > > ilk_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > ilk_audio_codec_disable; > > - } else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) { > > + } else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)- > > >gen >= 8) { > > dev_priv->display.audio_codec_enable = > > hsw_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > hsw_audio_codec_disable; > > - } else if (HAS_PCH_SPLIT(dev)) { > > + } else if (HAS_PCH_SPLIT(dev_priv)) { > > dev_priv->display.audio_codec_enable = > > ilk_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > ilk_audio_codec_disable; > > } > > diff --git a/drivers/gpu/drm/i915/intel_display.c > > b/drivers/gpu/drm/i915/intel_display.c > > index 62d36a7..5170718 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -15095,22 +15095,20 @@ static const struct drm_mode_config_funcs > > intel_mode_funcs = { > > }; > > > > /* Set up chip specific display functions */ > > -static void intel_init_display(struct drm_device *dev) > > +void intel_init_display_callbacks(struct drm_i915_private > > *dev_priv) > > { > > - struct drm_i915_private *dev_priv = dev->dev_private; > > - > > - if (HAS_PCH_SPLIT(dev) || IS_G4X(dev)) > > + if (HAS_PCH_SPLIT(dev_priv) || IS_G4X(dev_priv)) > > dev_priv->display.find_dpll = g4x_find_best_dpll; > > - else if (IS_CHERRYVIEW(dev)) > > + else if (IS_CHERRYVIEW(dev_priv)) > > dev_priv->display.find_dpll = chv_find_best_dpll; > > - else if (IS_VALLEYVIEW(dev)) > > + else if (IS_VALLEYVIEW(dev_priv)) > > dev_priv->display.find_dpll = vlv_find_best_dpll; > > - else if (IS_PINEVIEW(dev)) > > + else if (IS_PINEVIEW(dev_priv)) > > dev_priv->display.find_dpll = pnv_find_best_dpll; > > else > > dev_priv->display.find_dpll = i9xx_find_best_dpll; > > > > - if (INTEL_INFO(dev)->gen >= 9) { > > + if (INTEL_INFO(dev_priv)->gen >= 9) { > > dev_priv->display.get_pipe_config = > > haswell_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > skylake_get_initial_plane_config; > > @@ -15118,7 +15116,7 @@ static void intel_init_display(struct > > drm_device *dev) > > haswell_crtc_compute_clock; > > dev_priv->display.crtc_enable = > > haswell_crtc_enable; > > dev_priv->display.crtc_disable = > > haswell_crtc_disable; > > - } else if (HAS_DDI(dev)) { > > + } else if (HAS_DDI(dev_priv)) { > > dev_priv->display.get_pipe_config = > > haswell_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > ironlake_get_initial_plane_config; > > @@ -15126,7 +15124,7 @@ static void intel_init_display(struct > > drm_device *dev) > > haswell_crtc_compute_clock; > > dev_priv->display.crtc_enable = > > haswell_crtc_enable; > > dev_priv->display.crtc_disable = > > haswell_crtc_disable; > > - } else if (HAS_PCH_SPLIT(dev)) { > > + } else if (HAS_PCH_SPLIT(dev_priv)) { > > dev_priv->display.get_pipe_config = > > ironlake_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > ironlake_get_initial_plane_config; > > @@ -15134,7 +15132,7 @@ static void intel_init_display(struct > > drm_device *dev) > > ironlake_crtc_compute_clock; > > dev_priv->display.crtc_enable = > > ironlake_crtc_enable; > > dev_priv->display.crtc_disable = > > ironlake_crtc_disable; > > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > + } else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.get_pipe_config = > > i9xx_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > i9xx_get_initial_plane_config; > > @@ -15151,89 +15149,89 @@ static void intel_init_display(struct > > drm_device > > *dev) > > } > > > > /* Returns the core display clock speed */ > > - if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) > > + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > skylake_get_display_clock_speed; > > - else if (IS_BROXTON(dev)) > > + else if (IS_BROXTON(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > broxton_get_display_clock_speed; > > - else if (IS_BROADWELL(dev)) > > + else if (IS_BROADWELL(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > broadwell_get_display_clock_speed; > > - else if (IS_HASWELL(dev)) > > + else if (IS_HASWELL(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > haswell_get_display_clock_speed; > > - else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) > > + else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > valleyview_get_display_clock_speed; > > - else if (IS_GEN5(dev)) > > + else if (IS_GEN5(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > ilk_get_display_clock_speed; > > - else if (IS_I945G(dev) || IS_BROADWATER(dev) || > > - IS_GEN6(dev) || IS_IVYBRIDGE(dev)) > > + else if (IS_I945G(dev_priv) || IS_BROADWATER(dev_priv) || > > + IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i945_get_display_clock_speed; > > - else if (IS_GM45(dev)) > > + else if (IS_GM45(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > gm45_get_display_clock_speed; > > - else if (IS_CRESTLINE(dev)) > > + else if (IS_CRESTLINE(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i965gm_get_display_clock_speed; > > - else if (IS_PINEVIEW(dev)) > > + else if (IS_PINEVIEW(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > pnv_get_display_clock_speed; > > - else if (IS_G33(dev) || IS_G4X(dev)) > > + else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > g33_get_display_clock_speed; > > - else if (IS_I915G(dev)) > > + else if (IS_I915G(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i915_get_display_clock_speed; > > - else if (IS_I945GM(dev) || IS_845G(dev)) > > + else if (IS_I945GM(dev_priv) || IS_845G(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i9xx_misc_get_display_clock_speed; > > - else if (IS_I915GM(dev)) > > + else if (IS_I915GM(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i915gm_get_display_clock_speed; > > - else if (IS_I865G(dev)) > > + else if (IS_I865G(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i865_get_display_clock_speed; > > - else if (IS_I85X(dev)) > > + else if (IS_I85X(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i85x_get_display_clock_speed; > > else { /* 830 */ > > - WARN(!IS_I830(dev), "Unknown platform. Assuming > > 133 MHz > > CDCLK\n"); > > + WARN(!IS_I830(dev_priv), "Unknown platform. > > Assuming 133 MHz > > CDCLK\n"); > > dev_priv->display.get_display_clock_speed = > > i830_get_display_clock_speed; > > } > > > > - if (IS_GEN5(dev)) { > > + if (IS_GEN5(dev_priv)) { > > dev_priv->display.fdi_link_train = > > ironlake_fdi_link_train; > > - } else if (IS_GEN6(dev)) { > > + } else if (IS_GEN6(dev_priv)) { > > dev_priv->display.fdi_link_train = > > gen6_fdi_link_train; > > - } else if (IS_IVYBRIDGE(dev)) { > > + } else if (IS_IVYBRIDGE(dev_priv)) { > > /* FIXME: detect B0+ stepping and use auto > > training */ > > dev_priv->display.fdi_link_train = > > ivb_manual_fdi_link_train; > > - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > > + } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > > { > > dev_priv->display.fdi_link_train = > > hsw_fdi_link_train; > > - if (IS_BROADWELL(dev)) { > > + if (IS_BROADWELL(dev_priv)) { > > dev_priv->display.modeset_commit_cdclk = > > broadwell_modeset_commit_cdclk; > > dev_priv->display.modeset_calc_cdclk = > > broadwell_modeset_calc_cdclk; > > } > > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > + } else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.modeset_commit_cdclk = > > valleyview_modeset_commit_cdclk; > > dev_priv->display.modeset_calc_cdclk = > > valleyview_modeset_calc_cdclk; > > - } else if (IS_BROXTON(dev)) { > > + } else if (IS_BROXTON(dev_priv)) { > > dev_priv->display.modeset_commit_cdclk = > > broxton_modeset_commit_cdclk; > > dev_priv->display.modeset_calc_cdclk = > > broxton_modeset_calc_cdclk; > > } > > Would it make sense to change these if ladders into a structs of function > pointers and point to those from struct intel_device_info? The HAS_PCH_SPLIT() > check could be a bit tricky, but those usually go as > > if (HAS_DDI()) > ... > else if (HAS_PCH_SPLIT()) > ..., > > so they usually mean ILK, SNB and IVB. Yes, a good idea, would clarify things. > I'm not saying this should be part of this series, but just wanted to throw the > idea out there. I'm not sure yet how many variations of new function structs we need to spawn depending on platform differences that you also mention (AFAICS there are similar ones for older platforms too). We would also need to remove first the conditional assignments to callbacks (see the next patch). But I think after having all callback initializations collected to one place, we'd have a better overview and could go for what you suggested. --Imre
On Wed, 09 Mar 2016, Imre Deak <imre.deak@intel.com> wrote: > All of this is SW only initialization so we can move them earlier. Move > the mutex init where the rest of the locks are inited. While at it also > convert dev to dev_priv. Bikeshedding on this patch and the next: I don't think the function pointers are *callbacks* in any way. There's no "call back". Maybe "hooks"? BR, Jani. > > Signed-off-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/i915_dma.c | 3 ++ > drivers/gpu/drm/i915/intel_audio.c | 12 +++--- > drivers/gpu/drm/i915/intel_display.c | 77 ++++++++++++++++-------------------- > drivers/gpu/drm/i915/intel_drv.h | 3 +- > 4 files changed, 45 insertions(+), 50 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c > index 9b3ed00..55b0c62 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1016,6 +1016,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) > mutex_init(&dev_priv->modeset_restore_lock); > mutex_init(&dev_priv->av_mutex); > mutex_init(&dev_priv->wm.wm_mutex); > + mutex_init(&dev_priv->pps_mutex); > > ret = i915_workqueues_init(dev_priv); > if (ret < 0) > @@ -1028,6 +1029,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) > intel_init_dpio(dev_priv); > intel_power_domains_init(dev_priv); > intel_irq_init(dev_priv); > + intel_init_display_callbacks(dev_priv); > + intel_init_audio_callbacks(dev_priv); > > intel_runtime_pm_get(dev_priv); > > diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c > index 30f9214..1936752 100644 > --- a/drivers/gpu/drm/i915/intel_audio.c > +++ b/drivers/gpu/drm/i915/intel_audio.c > @@ -567,20 +567,18 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) > * intel_init_audio - Set up chip specific audio functions > * @dev: drm device > */ > -void intel_init_audio(struct drm_device *dev) > +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > - > - if (IS_G4X(dev)) { > + if (IS_G4X(dev_priv)) { > dev_priv->display.audio_codec_enable = g4x_audio_codec_enable; > dev_priv->display.audio_codec_disable = g4x_audio_codec_disable; > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; > dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; > - } else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) { > + } else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8) { > dev_priv->display.audio_codec_enable = hsw_audio_codec_enable; > dev_priv->display.audio_codec_disable = hsw_audio_codec_disable; > - } else if (HAS_PCH_SPLIT(dev)) { > + } else if (HAS_PCH_SPLIT(dev_priv)) { > dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; > dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; > } > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 62d36a7..5170718 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -15095,22 +15095,20 @@ static const struct drm_mode_config_funcs intel_mode_funcs = { > }; > > /* Set up chip specific display functions */ > -static void intel_init_display(struct drm_device *dev) > +void intel_init_display_callbacks(struct drm_i915_private *dev_priv) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > - > - if (HAS_PCH_SPLIT(dev) || IS_G4X(dev)) > + if (HAS_PCH_SPLIT(dev_priv) || IS_G4X(dev_priv)) > dev_priv->display.find_dpll = g4x_find_best_dpll; > - else if (IS_CHERRYVIEW(dev)) > + else if (IS_CHERRYVIEW(dev_priv)) > dev_priv->display.find_dpll = chv_find_best_dpll; > - else if (IS_VALLEYVIEW(dev)) > + else if (IS_VALLEYVIEW(dev_priv)) > dev_priv->display.find_dpll = vlv_find_best_dpll; > - else if (IS_PINEVIEW(dev)) > + else if (IS_PINEVIEW(dev_priv)) > dev_priv->display.find_dpll = pnv_find_best_dpll; > else > dev_priv->display.find_dpll = i9xx_find_best_dpll; > > - if (INTEL_INFO(dev)->gen >= 9) { > + if (INTEL_INFO(dev_priv)->gen >= 9) { > dev_priv->display.get_pipe_config = haswell_get_pipe_config; > dev_priv->display.get_initial_plane_config = > skylake_get_initial_plane_config; > @@ -15118,7 +15116,7 @@ static void intel_init_display(struct drm_device *dev) > haswell_crtc_compute_clock; > dev_priv->display.crtc_enable = haswell_crtc_enable; > dev_priv->display.crtc_disable = haswell_crtc_disable; > - } else if (HAS_DDI(dev)) { > + } else if (HAS_DDI(dev_priv)) { > dev_priv->display.get_pipe_config = haswell_get_pipe_config; > dev_priv->display.get_initial_plane_config = > ironlake_get_initial_plane_config; > @@ -15126,7 +15124,7 @@ static void intel_init_display(struct drm_device *dev) > haswell_crtc_compute_clock; > dev_priv->display.crtc_enable = haswell_crtc_enable; > dev_priv->display.crtc_disable = haswell_crtc_disable; > - } else if (HAS_PCH_SPLIT(dev)) { > + } else if (HAS_PCH_SPLIT(dev_priv)) { > dev_priv->display.get_pipe_config = ironlake_get_pipe_config; > dev_priv->display.get_initial_plane_config = > ironlake_get_initial_plane_config; > @@ -15134,7 +15132,7 @@ static void intel_init_display(struct drm_device *dev) > ironlake_crtc_compute_clock; > dev_priv->display.crtc_enable = ironlake_crtc_enable; > dev_priv->display.crtc_disable = ironlake_crtc_disable; > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.get_pipe_config = i9xx_get_pipe_config; > dev_priv->display.get_initial_plane_config = > i9xx_get_initial_plane_config; > @@ -15151,89 +15149,89 @@ static void intel_init_display(struct drm_device *dev) > } > > /* Returns the core display clock speed */ > - if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) > + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) > dev_priv->display.get_display_clock_speed = > skylake_get_display_clock_speed; > - else if (IS_BROXTON(dev)) > + else if (IS_BROXTON(dev_priv)) > dev_priv->display.get_display_clock_speed = > broxton_get_display_clock_speed; > - else if (IS_BROADWELL(dev)) > + else if (IS_BROADWELL(dev_priv)) > dev_priv->display.get_display_clock_speed = > broadwell_get_display_clock_speed; > - else if (IS_HASWELL(dev)) > + else if (IS_HASWELL(dev_priv)) > dev_priv->display.get_display_clock_speed = > haswell_get_display_clock_speed; > - else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) > + else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > dev_priv->display.get_display_clock_speed = > valleyview_get_display_clock_speed; > - else if (IS_GEN5(dev)) > + else if (IS_GEN5(dev_priv)) > dev_priv->display.get_display_clock_speed = > ilk_get_display_clock_speed; > - else if (IS_I945G(dev) || IS_BROADWATER(dev) || > - IS_GEN6(dev) || IS_IVYBRIDGE(dev)) > + else if (IS_I945G(dev_priv) || IS_BROADWATER(dev_priv) || > + IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) > dev_priv->display.get_display_clock_speed = > i945_get_display_clock_speed; > - else if (IS_GM45(dev)) > + else if (IS_GM45(dev_priv)) > dev_priv->display.get_display_clock_speed = > gm45_get_display_clock_speed; > - else if (IS_CRESTLINE(dev)) > + else if (IS_CRESTLINE(dev_priv)) > dev_priv->display.get_display_clock_speed = > i965gm_get_display_clock_speed; > - else if (IS_PINEVIEW(dev)) > + else if (IS_PINEVIEW(dev_priv)) > dev_priv->display.get_display_clock_speed = > pnv_get_display_clock_speed; > - else if (IS_G33(dev) || IS_G4X(dev)) > + else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) > dev_priv->display.get_display_clock_speed = > g33_get_display_clock_speed; > - else if (IS_I915G(dev)) > + else if (IS_I915G(dev_priv)) > dev_priv->display.get_display_clock_speed = > i915_get_display_clock_speed; > - else if (IS_I945GM(dev) || IS_845G(dev)) > + else if (IS_I945GM(dev_priv) || IS_845G(dev_priv)) > dev_priv->display.get_display_clock_speed = > i9xx_misc_get_display_clock_speed; > - else if (IS_I915GM(dev)) > + else if (IS_I915GM(dev_priv)) > dev_priv->display.get_display_clock_speed = > i915gm_get_display_clock_speed; > - else if (IS_I865G(dev)) > + else if (IS_I865G(dev_priv)) > dev_priv->display.get_display_clock_speed = > i865_get_display_clock_speed; > - else if (IS_I85X(dev)) > + else if (IS_I85X(dev_priv)) > dev_priv->display.get_display_clock_speed = > i85x_get_display_clock_speed; > else { /* 830 */ > - WARN(!IS_I830(dev), "Unknown platform. Assuming 133 MHz CDCLK\n"); > + WARN(!IS_I830(dev_priv), "Unknown platform. Assuming 133 MHz CDCLK\n"); > dev_priv->display.get_display_clock_speed = > i830_get_display_clock_speed; > } > > - if (IS_GEN5(dev)) { > + if (IS_GEN5(dev_priv)) { > dev_priv->display.fdi_link_train = ironlake_fdi_link_train; > - } else if (IS_GEN6(dev)) { > + } else if (IS_GEN6(dev_priv)) { > dev_priv->display.fdi_link_train = gen6_fdi_link_train; > - } else if (IS_IVYBRIDGE(dev)) { > + } else if (IS_IVYBRIDGE(dev_priv)) { > /* FIXME: detect B0+ stepping and use auto training */ > dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; > - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > + } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { > dev_priv->display.fdi_link_train = hsw_fdi_link_train; > - if (IS_BROADWELL(dev)) { > + if (IS_BROADWELL(dev_priv)) { > dev_priv->display.modeset_commit_cdclk = > broadwell_modeset_commit_cdclk; > dev_priv->display.modeset_calc_cdclk = > broadwell_modeset_calc_cdclk; > } > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { > dev_priv->display.modeset_commit_cdclk = > valleyview_modeset_commit_cdclk; > dev_priv->display.modeset_calc_cdclk = > valleyview_modeset_calc_cdclk; > - } else if (IS_BROXTON(dev)) { > + } else if (IS_BROXTON(dev_priv)) { > dev_priv->display.modeset_commit_cdclk = > broxton_modeset_commit_cdclk; > dev_priv->display.modeset_calc_cdclk = > broxton_modeset_calc_cdclk; > } > > - switch (INTEL_INFO(dev)->gen) { > + switch (INTEL_INFO(dev_priv)->gen) { > case 2: > dev_priv->display.queue_flip = intel_gen2_queue_flip; > break; > @@ -15260,8 +15258,6 @@ static void intel_init_display(struct drm_device *dev) > /* Default just returns -ENODEV to indicate unsupported */ > dev_priv->display.queue_flip = intel_default_queue_flip; > } > - > - mutex_init(&dev_priv->pps_mutex); > } > > /* > @@ -15588,9 +15584,6 @@ void intel_modeset_init(struct drm_device *dev) > } > } > > - intel_init_display(dev); > - intel_init_audio(dev); > - > if (IS_GEN2(dev)) { > dev->mode_config.max_width = 2048; > dev->mode_config.max_height = 2048; > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 7b2d66d..5264901 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1110,7 +1110,7 @@ u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv, > uint64_t fb_modifier, uint32_t pixel_format); > > /* intel_audio.c */ > -void intel_init_audio(struct drm_device *dev); > +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv); > void intel_audio_codec_enable(struct intel_encoder *encoder); > void intel_audio_codec_disable(struct intel_encoder *encoder); > void i915_audio_component_init(struct drm_i915_private *dev_priv); > @@ -1118,6 +1118,7 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); > > /* intel_display.c */ > extern const struct drm_plane_funcs intel_plane_funcs; > +void intel_init_display_callbacks(struct drm_i915_private *dev_priv); > unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_info); > bool intel_has_pending_fb_unpin(struct drm_device *dev); > void intel_mark_busy(struct drm_device *dev);
On pe, 2016-03-11 at 16:00 +0200, Jani Nikula wrote: > On Wed, 09 Mar 2016, Imre Deak <imre.deak@intel.com> wrote: > > All of this is SW only initialization so we can move them earlier. > > Move > > the mutex init where the rest of the locks are inited. While at it > > also > > convert dev to dev_priv. > > Bikeshedding on this patch and the next: I don't think the function > pointers are *callbacks* in any way. There's no "call back". Maybe > "hooks"? Yea, callback isn't a correct term here. I have no preference for an alternative, I can rename it to hooks both here and the next patch. --Imre > > BR, > Jani. > > > > > > Signed-off-by: Imre Deak <imre.deak@intel.com> > > --- > > drivers/gpu/drm/i915/i915_dma.c | 3 ++ > > drivers/gpu/drm/i915/intel_audio.c | 12 +++--- > > drivers/gpu/drm/i915/intel_display.c | 77 ++++++++++++++++------ > > -------------- > > drivers/gpu/drm/i915/intel_drv.h | 3 +- > > 4 files changed, 45 insertions(+), 50 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_dma.c > > b/drivers/gpu/drm/i915/i915_dma.c > > index 9b3ed00..55b0c62 100644 > > --- a/drivers/gpu/drm/i915/i915_dma.c > > +++ b/drivers/gpu/drm/i915/i915_dma.c > > @@ -1016,6 +1016,7 @@ int i915_driver_load(struct drm_device *dev, > > unsigned long flags) > > mutex_init(&dev_priv->modeset_restore_lock); > > mutex_init(&dev_priv->av_mutex); > > mutex_init(&dev_priv->wm.wm_mutex); > > + mutex_init(&dev_priv->pps_mutex); > > > > ret = i915_workqueues_init(dev_priv); > > if (ret < 0) > > @@ -1028,6 +1029,8 @@ int i915_driver_load(struct drm_device *dev, > > unsigned long flags) > > intel_init_dpio(dev_priv); > > intel_power_domains_init(dev_priv); > > intel_irq_init(dev_priv); > > + intel_init_display_callbacks(dev_priv); > > + intel_init_audio_callbacks(dev_priv); > > > > intel_runtime_pm_get(dev_priv); > > > > diff --git a/drivers/gpu/drm/i915/intel_audio.c > > b/drivers/gpu/drm/i915/intel_audio.c > > index 30f9214..1936752 100644 > > --- a/drivers/gpu/drm/i915/intel_audio.c > > +++ b/drivers/gpu/drm/i915/intel_audio.c > > @@ -567,20 +567,18 @@ void intel_audio_codec_disable(struct > > intel_encoder *intel_encoder) > > * intel_init_audio - Set up chip specific audio functions > > * @dev: drm device > > */ > > -void intel_init_audio(struct drm_device *dev) > > +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv) > > { > > - struct drm_i915_private *dev_priv = dev->dev_private; > > - > > - if (IS_G4X(dev)) { > > + if (IS_G4X(dev_priv)) { > > dev_priv->display.audio_codec_enable = > > g4x_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > g4x_audio_codec_disable; > > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > + } else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.audio_codec_enable = > > ilk_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > ilk_audio_codec_disable; > > - } else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) { > > + } else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)- > > >gen >= 8) { > > dev_priv->display.audio_codec_enable = > > hsw_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > hsw_audio_codec_disable; > > - } else if (HAS_PCH_SPLIT(dev)) { > > + } else if (HAS_PCH_SPLIT(dev_priv)) { > > dev_priv->display.audio_codec_enable = > > ilk_audio_codec_enable; > > dev_priv->display.audio_codec_disable = > > ilk_audio_codec_disable; > > } > > diff --git a/drivers/gpu/drm/i915/intel_display.c > > b/drivers/gpu/drm/i915/intel_display.c > > index 62d36a7..5170718 100644 > > --- a/drivers/gpu/drm/i915/intel_display.c > > +++ b/drivers/gpu/drm/i915/intel_display.c > > @@ -15095,22 +15095,20 @@ static const struct drm_mode_config_funcs > > intel_mode_funcs = { > > }; > > > > /* Set up chip specific display functions */ > > -static void intel_init_display(struct drm_device *dev) > > +void intel_init_display_callbacks(struct drm_i915_private > > *dev_priv) > > { > > - struct drm_i915_private *dev_priv = dev->dev_private; > > - > > - if (HAS_PCH_SPLIT(dev) || IS_G4X(dev)) > > + if (HAS_PCH_SPLIT(dev_priv) || IS_G4X(dev_priv)) > > dev_priv->display.find_dpll = g4x_find_best_dpll; > > - else if (IS_CHERRYVIEW(dev)) > > + else if (IS_CHERRYVIEW(dev_priv)) > > dev_priv->display.find_dpll = chv_find_best_dpll; > > - else if (IS_VALLEYVIEW(dev)) > > + else if (IS_VALLEYVIEW(dev_priv)) > > dev_priv->display.find_dpll = vlv_find_best_dpll; > > - else if (IS_PINEVIEW(dev)) > > + else if (IS_PINEVIEW(dev_priv)) > > dev_priv->display.find_dpll = pnv_find_best_dpll; > > else > > dev_priv->display.find_dpll = i9xx_find_best_dpll; > > > > - if (INTEL_INFO(dev)->gen >= 9) { > > + if (INTEL_INFO(dev_priv)->gen >= 9) { > > dev_priv->display.get_pipe_config = > > haswell_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > skylake_get_initial_plane_config; > > @@ -15118,7 +15116,7 @@ static void intel_init_display(struct > > drm_device *dev) > > haswell_crtc_compute_clock; > > dev_priv->display.crtc_enable = > > haswell_crtc_enable; > > dev_priv->display.crtc_disable = > > haswell_crtc_disable; > > - } else if (HAS_DDI(dev)) { > > + } else if (HAS_DDI(dev_priv)) { > > dev_priv->display.get_pipe_config = > > haswell_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > ironlake_get_initial_plane_config; > > @@ -15126,7 +15124,7 @@ static void intel_init_display(struct > > drm_device *dev) > > haswell_crtc_compute_clock; > > dev_priv->display.crtc_enable = > > haswell_crtc_enable; > > dev_priv->display.crtc_disable = > > haswell_crtc_disable; > > - } else if (HAS_PCH_SPLIT(dev)) { > > + } else if (HAS_PCH_SPLIT(dev_priv)) { > > dev_priv->display.get_pipe_config = > > ironlake_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > ironlake_get_initial_plane_config; > > @@ -15134,7 +15132,7 @@ static void intel_init_display(struct > > drm_device *dev) > > ironlake_crtc_compute_clock; > > dev_priv->display.crtc_enable = > > ironlake_crtc_enable; > > dev_priv->display.crtc_disable = > > ironlake_crtc_disable; > > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > + } else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.get_pipe_config = > > i9xx_get_pipe_config; > > dev_priv->display.get_initial_plane_config = > > i9xx_get_initial_plane_config; > > @@ -15151,89 +15149,89 @@ static void intel_init_display(struct > > drm_device *dev) > > } > > > > /* Returns the core display clock speed */ > > - if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) > > + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > skylake_get_display_clock_speed; > > - else if (IS_BROXTON(dev)) > > + else if (IS_BROXTON(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > broxton_get_display_clock_speed; > > - else if (IS_BROADWELL(dev)) > > + else if (IS_BROADWELL(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > broadwell_get_display_clock_speed; > > - else if (IS_HASWELL(dev)) > > + else if (IS_HASWELL(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > haswell_get_display_clock_speed; > > - else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) > > + else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > valleyview_get_display_clock_speed; > > - else if (IS_GEN5(dev)) > > + else if (IS_GEN5(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > ilk_get_display_clock_speed; > > - else if (IS_I945G(dev) || IS_BROADWATER(dev) || > > - IS_GEN6(dev) || IS_IVYBRIDGE(dev)) > > + else if (IS_I945G(dev_priv) || IS_BROADWATER(dev_priv) || > > + IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i945_get_display_clock_speed; > > - else if (IS_GM45(dev)) > > + else if (IS_GM45(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > gm45_get_display_clock_speed; > > - else if (IS_CRESTLINE(dev)) > > + else if (IS_CRESTLINE(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i965gm_get_display_clock_speed; > > - else if (IS_PINEVIEW(dev)) > > + else if (IS_PINEVIEW(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > pnv_get_display_clock_speed; > > - else if (IS_G33(dev) || IS_G4X(dev)) > > + else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > g33_get_display_clock_speed; > > - else if (IS_I915G(dev)) > > + else if (IS_I915G(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i915_get_display_clock_speed; > > - else if (IS_I945GM(dev) || IS_845G(dev)) > > + else if (IS_I945GM(dev_priv) || IS_845G(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i9xx_misc_get_display_clock_speed; > > - else if (IS_I915GM(dev)) > > + else if (IS_I915GM(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i915gm_get_display_clock_speed; > > - else if (IS_I865G(dev)) > > + else if (IS_I865G(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i865_get_display_clock_speed; > > - else if (IS_I85X(dev)) > > + else if (IS_I85X(dev_priv)) > > dev_priv->display.get_display_clock_speed = > > i85x_get_display_clock_speed; > > else { /* 830 */ > > - WARN(!IS_I830(dev), "Unknown platform. Assuming > > 133 MHz CDCLK\n"); > > + WARN(!IS_I830(dev_priv), "Unknown platform. > > Assuming 133 MHz CDCLK\n"); > > dev_priv->display.get_display_clock_speed = > > i830_get_display_clock_speed; > > } > > > > - if (IS_GEN5(dev)) { > > + if (IS_GEN5(dev_priv)) { > > dev_priv->display.fdi_link_train = > > ironlake_fdi_link_train; > > - } else if (IS_GEN6(dev)) { > > + } else if (IS_GEN6(dev_priv)) { > > dev_priv->display.fdi_link_train = > > gen6_fdi_link_train; > > - } else if (IS_IVYBRIDGE(dev)) { > > + } else if (IS_IVYBRIDGE(dev_priv)) { > > /* FIXME: detect B0+ stepping and use auto > > training */ > > dev_priv->display.fdi_link_train = > > ivb_manual_fdi_link_train; > > - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { > > + } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) > > { > > dev_priv->display.fdi_link_train = > > hsw_fdi_link_train; > > - if (IS_BROADWELL(dev)) { > > + if (IS_BROADWELL(dev_priv)) { > > dev_priv->display.modeset_commit_cdclk = > > broadwell_modeset_commit_cdclk; > > dev_priv->display.modeset_calc_cdclk = > > broadwell_modeset_calc_cdclk; > > } > > - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { > > + } else if (IS_VALLEYVIEW(dev_priv) || > > IS_CHERRYVIEW(dev_priv)) { > > dev_priv->display.modeset_commit_cdclk = > > valleyview_modeset_commit_cdclk; > > dev_priv->display.modeset_calc_cdclk = > > valleyview_modeset_calc_cdclk; > > - } else if (IS_BROXTON(dev)) { > > + } else if (IS_BROXTON(dev_priv)) { > > dev_priv->display.modeset_commit_cdclk = > > broxton_modeset_commit_cdclk; > > dev_priv->display.modeset_calc_cdclk = > > broxton_modeset_calc_cdclk; > > } > > > > - switch (INTEL_INFO(dev)->gen) { > > + switch (INTEL_INFO(dev_priv)->gen) { > > case 2: > > dev_priv->display.queue_flip = > > intel_gen2_queue_flip; > > break; > > @@ -15260,8 +15258,6 @@ static void intel_init_display(struct > > drm_device *dev) > > /* Default just returns -ENODEV to indicate > > unsupported */ > > dev_priv->display.queue_flip = > > intel_default_queue_flip; > > } > > - > > - mutex_init(&dev_priv->pps_mutex); > > } > > > > /* > > @@ -15588,9 +15584,6 @@ void intel_modeset_init(struct drm_device > > *dev) > > } > > } > > > > - intel_init_display(dev); > > - intel_init_audio(dev); > > - > > if (IS_GEN2(dev)) { > > dev->mode_config.max_width = 2048; > > dev->mode_config.max_height = 2048; > > diff --git a/drivers/gpu/drm/i915/intel_drv.h > > b/drivers/gpu/drm/i915/intel_drv.h > > index 7b2d66d..5264901 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -1110,7 +1110,7 @@ u32 intel_fb_stride_alignment(const struct > > drm_i915_private *dev_priv, > > uint64_t fb_modifier, uint32_t > > pixel_format); > > > > /* intel_audio.c */ > > -void intel_init_audio(struct drm_device *dev); > > +void intel_init_audio_callbacks(struct drm_i915_private > > *dev_priv); > > void intel_audio_codec_enable(struct intel_encoder *encoder); > > void intel_audio_codec_disable(struct intel_encoder *encoder); > > void i915_audio_component_init(struct drm_i915_private *dev_priv); > > @@ -1118,6 +1118,7 @@ void i915_audio_component_cleanup(struct > > drm_i915_private *dev_priv); > > > > /* intel_display.c */ > > extern const struct drm_plane_funcs intel_plane_funcs; > > +void intel_init_display_callbacks(struct drm_i915_private > > *dev_priv); > > unsigned int intel_rotation_info_size(const struct > > intel_rotation_info *rot_info); > > bool intel_has_pending_fb_unpin(struct drm_device *dev); > > void intel_mark_busy(struct drm_device *dev); >
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 9b3ed00..55b0c62 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1016,6 +1016,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) mutex_init(&dev_priv->modeset_restore_lock); mutex_init(&dev_priv->av_mutex); mutex_init(&dev_priv->wm.wm_mutex); + mutex_init(&dev_priv->pps_mutex); ret = i915_workqueues_init(dev_priv); if (ret < 0) @@ -1028,6 +1029,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) intel_init_dpio(dev_priv); intel_power_domains_init(dev_priv); intel_irq_init(dev_priv); + intel_init_display_callbacks(dev_priv); + intel_init_audio_callbacks(dev_priv); intel_runtime_pm_get(dev_priv); diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 30f9214..1936752 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -567,20 +567,18 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder) * intel_init_audio - Set up chip specific audio functions * @dev: drm device */ -void intel_init_audio(struct drm_device *dev) +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = dev->dev_private; - - if (IS_G4X(dev)) { + if (IS_G4X(dev_priv)) { dev_priv->display.audio_codec_enable = g4x_audio_codec_enable; dev_priv->display.audio_codec_disable = g4x_audio_codec_disable; - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; - } else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) { + } else if (IS_HASWELL(dev_priv) || INTEL_INFO(dev_priv)->gen >= 8) { dev_priv->display.audio_codec_enable = hsw_audio_codec_enable; dev_priv->display.audio_codec_disable = hsw_audio_codec_disable; - } else if (HAS_PCH_SPLIT(dev)) { + } else if (HAS_PCH_SPLIT(dev_priv)) { dev_priv->display.audio_codec_enable = ilk_audio_codec_enable; dev_priv->display.audio_codec_disable = ilk_audio_codec_disable; } diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 62d36a7..5170718 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -15095,22 +15095,20 @@ static const struct drm_mode_config_funcs intel_mode_funcs = { }; /* Set up chip specific display functions */ -static void intel_init_display(struct drm_device *dev) +void intel_init_display_callbacks(struct drm_i915_private *dev_priv) { - struct drm_i915_private *dev_priv = dev->dev_private; - - if (HAS_PCH_SPLIT(dev) || IS_G4X(dev)) + if (HAS_PCH_SPLIT(dev_priv) || IS_G4X(dev_priv)) dev_priv->display.find_dpll = g4x_find_best_dpll; - else if (IS_CHERRYVIEW(dev)) + else if (IS_CHERRYVIEW(dev_priv)) dev_priv->display.find_dpll = chv_find_best_dpll; - else if (IS_VALLEYVIEW(dev)) + else if (IS_VALLEYVIEW(dev_priv)) dev_priv->display.find_dpll = vlv_find_best_dpll; - else if (IS_PINEVIEW(dev)) + else if (IS_PINEVIEW(dev_priv)) dev_priv->display.find_dpll = pnv_find_best_dpll; else dev_priv->display.find_dpll = i9xx_find_best_dpll; - if (INTEL_INFO(dev)->gen >= 9) { + if (INTEL_INFO(dev_priv)->gen >= 9) { dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_initial_plane_config = skylake_get_initial_plane_config; @@ -15118,7 +15116,7 @@ static void intel_init_display(struct drm_device *dev) haswell_crtc_compute_clock; dev_priv->display.crtc_enable = haswell_crtc_enable; dev_priv->display.crtc_disable = haswell_crtc_disable; - } else if (HAS_DDI(dev)) { + } else if (HAS_DDI(dev_priv)) { dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_initial_plane_config = ironlake_get_initial_plane_config; @@ -15126,7 +15124,7 @@ static void intel_init_display(struct drm_device *dev) haswell_crtc_compute_clock; dev_priv->display.crtc_enable = haswell_crtc_enable; dev_priv->display.crtc_disable = haswell_crtc_disable; - } else if (HAS_PCH_SPLIT(dev)) { + } else if (HAS_PCH_SPLIT(dev_priv)) { dev_priv->display.get_pipe_config = ironlake_get_pipe_config; dev_priv->display.get_initial_plane_config = ironlake_get_initial_plane_config; @@ -15134,7 +15132,7 @@ static void intel_init_display(struct drm_device *dev) ironlake_crtc_compute_clock; dev_priv->display.crtc_enable = ironlake_crtc_enable; dev_priv->display.crtc_disable = ironlake_crtc_disable; - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { dev_priv->display.get_pipe_config = i9xx_get_pipe_config; dev_priv->display.get_initial_plane_config = i9xx_get_initial_plane_config; @@ -15151,89 +15149,89 @@ static void intel_init_display(struct drm_device *dev) } /* Returns the core display clock speed */ - if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) + if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) dev_priv->display.get_display_clock_speed = skylake_get_display_clock_speed; - else if (IS_BROXTON(dev)) + else if (IS_BROXTON(dev_priv)) dev_priv->display.get_display_clock_speed = broxton_get_display_clock_speed; - else if (IS_BROADWELL(dev)) + else if (IS_BROADWELL(dev_priv)) dev_priv->display.get_display_clock_speed = broadwell_get_display_clock_speed; - else if (IS_HASWELL(dev)) + else if (IS_HASWELL(dev_priv)) dev_priv->display.get_display_clock_speed = haswell_get_display_clock_speed; - else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) + else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) dev_priv->display.get_display_clock_speed = valleyview_get_display_clock_speed; - else if (IS_GEN5(dev)) + else if (IS_GEN5(dev_priv)) dev_priv->display.get_display_clock_speed = ilk_get_display_clock_speed; - else if (IS_I945G(dev) || IS_BROADWATER(dev) || - IS_GEN6(dev) || IS_IVYBRIDGE(dev)) + else if (IS_I945G(dev_priv) || IS_BROADWATER(dev_priv) || + IS_GEN6(dev_priv) || IS_IVYBRIDGE(dev_priv)) dev_priv->display.get_display_clock_speed = i945_get_display_clock_speed; - else if (IS_GM45(dev)) + else if (IS_GM45(dev_priv)) dev_priv->display.get_display_clock_speed = gm45_get_display_clock_speed; - else if (IS_CRESTLINE(dev)) + else if (IS_CRESTLINE(dev_priv)) dev_priv->display.get_display_clock_speed = i965gm_get_display_clock_speed; - else if (IS_PINEVIEW(dev)) + else if (IS_PINEVIEW(dev_priv)) dev_priv->display.get_display_clock_speed = pnv_get_display_clock_speed; - else if (IS_G33(dev) || IS_G4X(dev)) + else if (IS_G33(dev_priv) || IS_G4X(dev_priv)) dev_priv->display.get_display_clock_speed = g33_get_display_clock_speed; - else if (IS_I915G(dev)) + else if (IS_I915G(dev_priv)) dev_priv->display.get_display_clock_speed = i915_get_display_clock_speed; - else if (IS_I945GM(dev) || IS_845G(dev)) + else if (IS_I945GM(dev_priv) || IS_845G(dev_priv)) dev_priv->display.get_display_clock_speed = i9xx_misc_get_display_clock_speed; - else if (IS_I915GM(dev)) + else if (IS_I915GM(dev_priv)) dev_priv->display.get_display_clock_speed = i915gm_get_display_clock_speed; - else if (IS_I865G(dev)) + else if (IS_I865G(dev_priv)) dev_priv->display.get_display_clock_speed = i865_get_display_clock_speed; - else if (IS_I85X(dev)) + else if (IS_I85X(dev_priv)) dev_priv->display.get_display_clock_speed = i85x_get_display_clock_speed; else { /* 830 */ - WARN(!IS_I830(dev), "Unknown platform. Assuming 133 MHz CDCLK\n"); + WARN(!IS_I830(dev_priv), "Unknown platform. Assuming 133 MHz CDCLK\n"); dev_priv->display.get_display_clock_speed = i830_get_display_clock_speed; } - if (IS_GEN5(dev)) { + if (IS_GEN5(dev_priv)) { dev_priv->display.fdi_link_train = ironlake_fdi_link_train; - } else if (IS_GEN6(dev)) { + } else if (IS_GEN6(dev_priv)) { dev_priv->display.fdi_link_train = gen6_fdi_link_train; - } else if (IS_IVYBRIDGE(dev)) { + } else if (IS_IVYBRIDGE(dev_priv)) { /* FIXME: detect B0+ stepping and use auto training */ dev_priv->display.fdi_link_train = ivb_manual_fdi_link_train; - } else if (IS_HASWELL(dev) || IS_BROADWELL(dev)) { + } else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv)) { dev_priv->display.fdi_link_train = hsw_fdi_link_train; - if (IS_BROADWELL(dev)) { + if (IS_BROADWELL(dev_priv)) { dev_priv->display.modeset_commit_cdclk = broadwell_modeset_commit_cdclk; dev_priv->display.modeset_calc_cdclk = broadwell_modeset_calc_cdclk; } - } else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) { + } else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { dev_priv->display.modeset_commit_cdclk = valleyview_modeset_commit_cdclk; dev_priv->display.modeset_calc_cdclk = valleyview_modeset_calc_cdclk; - } else if (IS_BROXTON(dev)) { + } else if (IS_BROXTON(dev_priv)) { dev_priv->display.modeset_commit_cdclk = broxton_modeset_commit_cdclk; dev_priv->display.modeset_calc_cdclk = broxton_modeset_calc_cdclk; } - switch (INTEL_INFO(dev)->gen) { + switch (INTEL_INFO(dev_priv)->gen) { case 2: dev_priv->display.queue_flip = intel_gen2_queue_flip; break; @@ -15260,8 +15258,6 @@ static void intel_init_display(struct drm_device *dev) /* Default just returns -ENODEV to indicate unsupported */ dev_priv->display.queue_flip = intel_default_queue_flip; } - - mutex_init(&dev_priv->pps_mutex); } /* @@ -15588,9 +15584,6 @@ void intel_modeset_init(struct drm_device *dev) } } - intel_init_display(dev); - intel_init_audio(dev); - if (IS_GEN2(dev)) { dev->mode_config.max_width = 2048; dev->mode_config.max_height = 2048; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 7b2d66d..5264901 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1110,7 +1110,7 @@ u32 intel_fb_stride_alignment(const struct drm_i915_private *dev_priv, uint64_t fb_modifier, uint32_t pixel_format); /* intel_audio.c */ -void intel_init_audio(struct drm_device *dev); +void intel_init_audio_callbacks(struct drm_i915_private *dev_priv); void intel_audio_codec_enable(struct intel_encoder *encoder); void intel_audio_codec_disable(struct intel_encoder *encoder); void i915_audio_component_init(struct drm_i915_private *dev_priv); @@ -1118,6 +1118,7 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); /* intel_display.c */ extern const struct drm_plane_funcs intel_plane_funcs; +void intel_init_display_callbacks(struct drm_i915_private *dev_priv); unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_info); bool intel_has_pending_fb_unpin(struct drm_device *dev); void intel_mark_busy(struct drm_device *dev);
All of this is SW only initialization so we can move them earlier. Move the mutex init where the rest of the locks are inited. While at it also convert dev to dev_priv. Signed-off-by: Imre Deak <imre.deak@intel.com> --- drivers/gpu/drm/i915/i915_dma.c | 3 ++ drivers/gpu/drm/i915/intel_audio.c | 12 +++--- drivers/gpu/drm/i915/intel_display.c | 77 ++++++++++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 3 +- 4 files changed, 45 insertions(+), 50 deletions(-)