cb1824bb1e
We only consider crtc_state->enable when initially calculating plane visibility. Later on we try to override the plane's state to invisible if the crtc is in DPMS off state (crtc_state->active==false). Unfortunately the code doing that only updates the plane_state.visible flag and the crtc_state.active_planes bimask, but forgets to update some of the other plane bitmasks stored in the crtc_state. Namely crtc_state.nv12_planes is left set up based on the original visibility check which makes icl_check_nv12_planes() pick a slave plane for the flagged plane in the bitmask. Later on we hit the watermark code which sees a plane with a slave assigned and it then makes the logical assumption that the master plane must itself be visible. Since the master's plane_state.visible flag was already cleared we get a WARN. Fix the problem by clearing all the plane bitmasks for DPMS off. This is more or less the wrong approach and instead we should calculate all the plane related state purely based crtc_state->enable (to guarantee that the subsequent DPMS on can't fail). However in the past we definitely had some roadblocks to making that happen. Not sure how many are left these days, but let's stick to the current approach since it's a much simpler fix to the immediate problem (the WARN). v2: Keep the visible=false, it's important (Rodrigo) Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200318174515.31637-1-ville.syrjala@linux.intel.com Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
59 lines
2.3 KiB
C
59 lines
2.3 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
/*
|
|
* Copyright © 2019 Intel Corporation
|
|
*/
|
|
|
|
#ifndef __INTEL_ATOMIC_PLANE_H__
|
|
#define __INTEL_ATOMIC_PLANE_H__
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct drm_plane;
|
|
struct drm_property;
|
|
struct intel_atomic_state;
|
|
struct intel_crtc;
|
|
struct intel_crtc_state;
|
|
struct intel_plane;
|
|
struct intel_plane_state;
|
|
|
|
extern const struct drm_plane_helper_funcs intel_plane_helper_funcs;
|
|
|
|
unsigned int intel_plane_pixel_rate(const struct intel_crtc_state *crtc_state,
|
|
const struct intel_plane_state *plane_state);
|
|
|
|
unsigned int intel_plane_data_rate(const struct intel_crtc_state *crtc_state,
|
|
const struct intel_plane_state *plane_state);
|
|
void intel_plane_copy_uapi_to_hw_state(struct intel_plane_state *plane_state,
|
|
const struct intel_plane_state *from_plane_state);
|
|
void intel_update_plane(struct intel_plane *plane,
|
|
const struct intel_crtc_state *crtc_state,
|
|
const struct intel_plane_state *plane_state);
|
|
void intel_disable_plane(struct intel_plane *plane,
|
|
const struct intel_crtc_state *crtc_state);
|
|
struct intel_plane *intel_plane_alloc(void);
|
|
void intel_plane_free(struct intel_plane *plane);
|
|
struct drm_plane_state *intel_plane_duplicate_state(struct drm_plane *plane);
|
|
void intel_plane_destroy_state(struct drm_plane *plane,
|
|
struct drm_plane_state *state);
|
|
void skl_update_planes_on_crtc(struct intel_atomic_state *state,
|
|
struct intel_crtc *crtc);
|
|
void i9xx_update_planes_on_crtc(struct intel_atomic_state *state,
|
|
struct intel_crtc *crtc);
|
|
int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
|
|
struct intel_crtc_state *crtc_state,
|
|
const struct intel_plane_state *old_plane_state,
|
|
struct intel_plane_state *intel_state);
|
|
int intel_plane_atomic_check(struct intel_atomic_state *state,
|
|
struct intel_plane *plane);
|
|
int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_state,
|
|
struct intel_crtc_state *crtc_state,
|
|
const struct intel_plane_state *old_plane_state,
|
|
struct intel_plane_state *plane_state);
|
|
int intel_plane_calc_min_cdclk(struct intel_atomic_state *state,
|
|
struct intel_plane *plane,
|
|
bool *need_cdclk_calc);
|
|
void intel_plane_set_invisible(struct intel_crtc_state *crtc_state,
|
|
struct intel_plane_state *plane_state);
|
|
|
|
#endif /* __INTEL_ATOMIC_PLANE_H__ */
|