diff options
| author | Ander Conselvan de Oliveira | 2015-04-21 16:13:24 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-05-08 13:04:11 +0200 |
| commit | 550acefd229dc3ef1be00c3355ecccca8fe8bf2b (patch) | |
| tree | ed84b6e6d98c36c9c0263d00b9a6a54c96ff08e8 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Swap atomic state in legacy modeset (diff) | |
| download | kernel-qcow2-linux-550acefd229dc3ef1be00c3355ecccca8fe8bf2b.tar.gz kernel-qcow2-linux-550acefd229dc3ef1be00c3355ecccca8fe8bf2b.tar.xz kernel-qcow2-linux-550acefd229dc3ef1be00c3355ecccca8fe8bf2b.zip | |
drm/i915: Get rid of intel_crtc_set_state()
Now that we do proper state swaps, we don't depend on this function
anymore to keep the state in sync.
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.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 | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e4983c19829e..b5806400d40e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10256,14 +10256,6 @@ void intel_mark_idle(struct drm_device *dev) intel_runtime_pm_put(dev_priv); } -static void intel_crtc_set_state(struct intel_crtc *crtc, - struct intel_crtc_state *crtc_state) -{ - kfree(crtc->config); - crtc->config = crtc_state; - crtc->base.state = &crtc_state->base; -} - static void intel_crtc_destroy(struct drm_crtc *crtc) { struct intel_crtc *intel_crtc = to_intel_crtc(crtc); @@ -10280,7 +10272,6 @@ static void intel_crtc_destroy(struct drm_crtc *crtc) kfree(work); } - intel_crtc_set_state(intel_crtc, NULL); drm_crtc_cleanup(crtc); kfree(intel_crtc); @@ -13502,7 +13493,8 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) crtc_state = kzalloc(sizeof(*crtc_state), GFP_KERNEL); if (!crtc_state) goto fail; - intel_crtc_set_state(intel_crtc, crtc_state); + intel_crtc->config = crtc_state; + intel_crtc->base.state = &crtc_state->base; crtc_state->base.crtc = &intel_crtc->base; /* initialize shared scalers */ |