diff options
| author | Matt Roper <matthew.d.roper@intel.com> | 2015-01-21 16:35:48 -0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-27 09:57:25 +0100 |
| commit | c196e1d66c36b0731cffc39fe28922b17c2901d9 (patch) | |
| tree | d8b995b22e2c307b1228f0b9837885a2e5c5af56 /drivers/gpu/drm/i915/intel_atomic_plane.c | |
| parent | 1356837e55e273c9178c13f5fbddf086da285283 (diff) | |
| download | linux-c196e1d66c36b0731cffc39fe28922b17c2901d9.tar.gz | |
drm/i915: Switch plane properties to full atomic helper.
This will exercise our atomic pipeline for legacy property updates. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic_plane.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 4a3914f1cdee..9e6f727dfd19 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -118,6 +118,15 @@ static int intel_plane_atomic_check(struct drm_plane *plane, intel_crtc = to_intel_crtc(crtc); /* + * Both crtc and plane->crtc could be NULL if we're updating a + * property while the plane is disabled. We don't actually have + * anything driver-specific we need to test in that case, so + * just return success. + */ + if (!crtc) + return 0; + + /* * The original src/dest coordinates are stored in state->base, but * we want to keep another copy internal to our driver that we can * clip/modify ourselves. |