diff options
| author | Ander Conselvan de Oliveira | 2014-10-29 10:32:34 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-07 18:41:44 +0100 |
| commit | 797d02592304b15359f407bd0e52fa5143cb4c9f (patch) | |
| tree | 08fe800e440cd509995a094de67ff9e6e4509770 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Add infrastructure for choosing DPLLs before disabling crtcs (diff) | |
| download | kernel-qcow2-linux-797d02592304b15359f407bd0e52fa5143cb4c9f.tar.gz kernel-qcow2-linux-797d02592304b15359f407bd0e52fa5143cb4c9f.tar.xz kernel-qcow2-linux-797d02592304b15359f407bd0e52fa5143cb4c9f.zip | |
drm/i915: Covert HSW+ to choose DPLLS before disabling CRTCs
Use the infrastructure added in a previous patch to choose shared DPLLs
and calculate clocks before touching the hardware.
v2: Don't set mode_set hooks since dev_priv is kzalloc()'d (Ville)
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4253f1288e73..e4bff0b8740f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7975,9 +7975,7 @@ static void haswell_modeset_global_resources(struct drm_device *dev) modeset_update_crtc_power_domains(dev); } -static int haswell_crtc_mode_set(struct intel_crtc *crtc, - int x, int y, - struct drm_framebuffer *fb) +static int haswell_crtc_compute_clock(struct intel_crtc *crtc) { if (!intel_ddi_pll_select(crtc)) return -EINVAL; @@ -12468,7 +12466,8 @@ static void intel_init_display(struct drm_device *dev) if (HAS_DDI(dev)) { dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_plane_config = ironlake_get_plane_config; - dev_priv->display.crtc_mode_set = haswell_crtc_mode_set; + dev_priv->display.crtc_compute_clock = + haswell_crtc_compute_clock; dev_priv->display.crtc_enable = haswell_crtc_enable; dev_priv->display.crtc_disable = haswell_crtc_disable; dev_priv->display.off = ironlake_crtc_off; |