Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: Plumb the full atomic state into icl_check_nv12_planes()
icl_check_nv12_planes() needs the full atomic state. Instead of
digging that out from dubious sources plumb it in explicitly.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240528184945.24083-2-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
+6
-5
+6
-5
drivers/gpu/drm/i915/display/intel_display.c
+6
-5
drivers/gpu/drm/i915/display/intel_display.c
···
4034
4034
return 0;
4035
4035
}
4036
4036
4037
-
static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
4037
+
static int icl_check_nv12_planes(struct intel_atomic_state *state,
4038
+
struct intel_crtc *crtc)
4038
4039
{
4039
-
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
4040
-
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
4041
-
struct intel_atomic_state *state = to_intel_atomic_state(crtc_state->uapi.state);
4040
+
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
4041
+
struct intel_crtc_state *crtc_state =
4042
+
intel_atomic_get_new_crtc_state(state, crtc);
4042
4043
struct intel_plane *plane, *linked;
4043
4044
struct intel_plane_state *plane_state;
4044
4045
int i;
···
5820
5819
new_crtc_state, i) {
5821
5820
u8 old_active_planes, new_active_planes;
5822
5821
5823
-
ret = icl_check_nv12_planes(new_crtc_state);
5822
+
ret = icl_check_nv12_planes(state, crtc);
5824
5823
if (ret)
5825
5824
return ret;
5826
5825