diff options
| author | Matt Roper | 2015-02-25 20:43:26 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2015-02-26 00:14:17 +0100 |
| commit | 07878248a8dd50355482995f86e756952b979def (patch) | |
| tree | 63a713256d2b73042fe8ceb0f7267d660fd5c7b8 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Use enabled value from crtc_state rather than crtc (v2) (diff) | |
| download | kernel-qcow2-linux-07878248a8dd50355482995f86e756952b979def.tar.gz kernel-qcow2-linux-07878248a8dd50355482995f86e756952b979def.tar.xz kernel-qcow2-linux-07878248a8dd50355482995f86e756952b979def.zip | |
drm/i915: Ensure crtc_state backpointer is always initialized
As we transition to full atomic modesetting, we want to be able to pass
intel_crtc_state around in various places that we pass intel_crtc
directly today. Ensure that the ->crtc backpointer is properly
initialized in case we need to get back to the associated CRTC.
Signed-off-by: Matt Roper <matthew.d.roper@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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 25ee6fa8fc45..3e13ee187e4d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10225,6 +10225,7 @@ intel_modeset_pipe_config(struct drm_crtc *crtc, if (!pipe_config) return ERR_PTR(-ENOMEM); + pipe_config->base.crtc = crtc; drm_mode_copy(&pipe_config->base.adjusted_mode, mode); drm_mode_copy(&pipe_config->base.mode, mode); @@ -12315,6 +12316,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) if (!crtc_state) goto fail; intel_crtc_set_state(intel_crtc, crtc_state); + crtc_state->base.crtc = &intel_crtc->base; primary = intel_primary_plane_create(dev, pipe); if (!primary) |