Skip to content

Commit

Permalink
drm/i915: Don't clobber plane state on internal disables
Browse files Browse the repository at this point in the history
We need to disable all sprite planes when disabling the CRTC.  We had
been using the top-level atomic 'disable' entrypoint to accomplish this,
which was wrong.  Not only can this lead to various locking issues, it
also modifies the actual plane state, making it impossible to restore
the plane properly later.  For example, a DPMS off followed by a DPMS on
will result in any sprite planes in use not being restored properly.

The proper solution here is to call directly into our 'commit plane'
hook with a copy of the plane's current state that has 'visible' set to
false.  Committing this dummy state will turn off the plane, but will
not touch the actual plane->state pointer, allowing us to properly
restore the plane state later.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Matt Roper authored and Daniel Vetter committed Mar 17, 2015
1 parent 2934368 commit 0d703d4
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -4204,6 +4204,24 @@ static void intel_enable_sprite_planes(struct drm_crtc *crtc)
}
}

/*
* Disable a plane internally without actually modifying the plane's state.
* This will allow us to easily restore the plane later by just reprogramming
* its state.
*/
static void disable_plane_internal(struct drm_plane *plane)
{
struct intel_plane *intel_plane = to_intel_plane(plane);
struct drm_plane_state *state =
plane->funcs->atomic_duplicate_state(plane);
struct intel_plane_state *intel_state = to_intel_plane_state(state);

intel_state->visible = false;
intel_plane->commit_plane(plane, intel_state);

intel_plane_destroy_state(plane, state);
}

static void intel_disable_sprite_planes(struct drm_crtc *crtc)
{
struct drm_device *dev = crtc->dev;
Expand All @@ -4213,8 +4231,8 @@ static void intel_disable_sprite_planes(struct drm_crtc *crtc)

drm_for_each_legacy_plane(plane, &dev->mode_config.plane_list) {
intel_plane = to_intel_plane(plane);
if (intel_plane->pipe == pipe)
plane->funcs->disable_plane(plane);
if (plane->fb && intel_plane->pipe == pipe)
disable_plane_internal(plane);
}
}

Expand Down

0 comments on commit 0d703d4

Please sign in to comment.