diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-05-25 14:50:40 -0400 |
---|---|---|
committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2018-06-11 13:22:44 -0400 |
commit | cd30fbca9713d225bc61ff9a2d5f1fbaff9df2f2 (patch) | |
tree | 1346e24f33a683c9201ffe558cd78f86c1ba8a63 /drivers/gpu/drm/i915/intel_atomic_plane.c | |
parent | 9e5c947cb7c11211bb5ca55bf209730c684fe43b (diff) |
drm/i915: Stop updating plane->fb/crtc
We want to get rid of plane->fb/crtc on atomic drivers. Stop setting
them.
v2: Fix up the comment in intel_crtc_active() and
nuke the rest of the stale comments (Daniel)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> #v1
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20180525185045.29689-9-ville.syrjala@linux.intel.com
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_atomic_plane.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index 7481ce85746b..eb0579fb5e54 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c | |||
@@ -120,12 +120,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_ | |||
120 | &crtc_state->base.adjusted_mode; | 120 | &crtc_state->base.adjusted_mode; |
121 | int ret; | 121 | int ret; |
122 | 122 | ||
123 | /* | ||
124 | * Both crtc and plane->crtc could be NULL if we're updating a | ||
125 | * property while the plane is disabled. We don't actually have | ||
126 | * anything driver-specific we need to test in that case, so | ||
127 | * just return success. | ||
128 | */ | ||
129 | if (!intel_state->base.crtc && !old_plane_state->base.crtc) | 123 | if (!intel_state->base.crtc && !old_plane_state->base.crtc) |
130 | return 0; | 124 | return 0; |
131 | 125 | ||
@@ -204,12 +198,6 @@ static int intel_plane_atomic_check(struct drm_plane *plane, | |||
204 | const struct drm_crtc_state *old_crtc_state; | 198 | const struct drm_crtc_state *old_crtc_state; |
205 | struct drm_crtc_state *new_crtc_state; | 199 | struct drm_crtc_state *new_crtc_state; |
206 | 200 | ||
207 | /* | ||
208 | * Both crtc and plane->crtc could be NULL if we're updating a | ||
209 | * property while the plane is disabled. We don't actually have | ||
210 | * anything driver-specific we need to test in that case, so | ||
211 | * just return success. | ||
212 | */ | ||
213 | if (!crtc) | 201 | if (!crtc) |
214 | return 0; | 202 | return 0; |
215 | 203 | ||