summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_atomic_plane.c
diff options
context:
space:
mode:
authorVille Syrjälä2018-11-14 22:07:20 +0100
committerVille Syrjälä2018-11-28 20:51:50 +0100
commit0dd14be30d4c8401be9cd129df3b3ee238ea6f78 (patch)
tree2d71cc6974ca22022a9c1eeb7305bfff3d350537 /drivers/gpu/drm/i915/intel_atomic_plane.c
parentdrm/i915: Introduce crtc_state->update_planes bitmask (diff)
downloadkernel-qcow2-linux-0dd14be30d4c8401be9cd129df3b3ee238ea6f78.tar.gz
kernel-qcow2-linux-0dd14be30d4c8401be9cd129df3b3ee238ea6f78.tar.xz
kernel-qcow2-linux-0dd14be30d4c8401be9cd129df3b3ee238ea6f78.zip
drm/i915: Pass the new crtc_state to ->disable_plane()
We're going to need access to the new crtc state in ->disable_plane() for SKL+ wm/ddb programming and pre-skl pipe gamma/csc control. Pass the crtc state down. We'll also try to make intel_crtc_disable_planes() do the right thing as much as it's possible. The fact that we don't have a separate crtc state for the disabled state when we're going to re-enable the crtc later means we might end up poking at a few extra planes in there. But that's harmless. I suppose one might argue that we wouldn't have to care about proper ddb/wm/csc/gamma if the pipe is going to permanently disable anyway, but the state checker probably cares so we should try our best to make sure everything is programmed correctly even in that case. v2: Fix the commit message a bit (Matt) Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181114210729.16185-5-ville.syrjala@linux.intel.com Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
-rw-r--r--drivers/gpu/drm/i915/intel_atomic_plane.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 026a11511941..ad3d135bdc15 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -212,7 +212,7 @@ void intel_update_planes_on_crtc(struct intel_atomic_state *old_state,
} else {
trace_intel_disable_plane(&plane->base, crtc);
- plane->disable_plane(plane, crtc);
+ plane->disable_plane(plane, new_crtc_state);
}
}
}