mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
drm/i915: Introduce intel_master_crtc()
Add a helper to determine the master crtc for bigjoiner usage. Also name the variables consistently. Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211022103304.24164-5-ville.syrjala@linux.intel.com
This commit is contained in:
parent
3991999732
commit
f2e19b5866
2 changed files with 33 additions and 30 deletions
|
@ -2825,12 +2825,10 @@ static void intel_ddi_post_disable(struct intel_atomic_state *state,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (old_crtc_state->bigjoiner_linked_crtc) {
|
if (old_crtc_state->bigjoiner_linked_crtc) {
|
||||||
struct intel_atomic_state *state =
|
struct intel_crtc *slave_crtc =
|
||||||
to_intel_atomic_state(old_crtc_state->uapi.state);
|
|
||||||
struct intel_crtc *slave =
|
|
||||||
old_crtc_state->bigjoiner_linked_crtc;
|
old_crtc_state->bigjoiner_linked_crtc;
|
||||||
const struct intel_crtc_state *old_slave_crtc_state =
|
const struct intel_crtc_state *old_slave_crtc_state =
|
||||||
intel_atomic_get_old_crtc_state(state, slave);
|
intel_atomic_get_old_crtc_state(state, slave_crtc);
|
||||||
|
|
||||||
intel_crtc_vblank_off(old_slave_crtc_state);
|
intel_crtc_vblank_off(old_slave_crtc_state);
|
||||||
|
|
||||||
|
|
|
@ -335,6 +335,14 @@ is_trans_port_sync_mode(const struct intel_crtc_state *crtc_state)
|
||||||
is_trans_port_sync_slave(crtc_state);
|
is_trans_port_sync_slave(crtc_state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct intel_crtc *intel_master_crtc(const struct intel_crtc_state *crtc_state)
|
||||||
|
{
|
||||||
|
if (crtc_state->bigjoiner_slave)
|
||||||
|
return crtc_state->bigjoiner_linked_crtc;
|
||||||
|
else
|
||||||
|
return to_intel_crtc(crtc_state->uapi.crtc);
|
||||||
|
}
|
||||||
|
|
||||||
static bool pipe_scanline_is_moving(struct drm_i915_private *dev_priv,
|
static bool pipe_scanline_is_moving(struct drm_i915_private *dev_priv,
|
||||||
enum pipe pipe)
|
enum pipe pipe)
|
||||||
{
|
{
|
||||||
|
@ -1947,21 +1955,19 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state)
|
||||||
static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,
|
static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,
|
||||||
const struct intel_crtc_state *crtc_state)
|
const struct intel_crtc_state *crtc_state)
|
||||||
{
|
{
|
||||||
struct intel_crtc *master = to_intel_crtc(crtc_state->uapi.crtc);
|
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
|
||||||
struct drm_i915_private *dev_priv = to_i915(master->base.dev);
|
|
||||||
struct intel_crtc_state *master_crtc_state;
|
struct intel_crtc_state *master_crtc_state;
|
||||||
|
struct intel_crtc *master_crtc;
|
||||||
struct drm_connector_state *conn_state;
|
struct drm_connector_state *conn_state;
|
||||||
struct drm_connector *conn;
|
struct drm_connector *conn;
|
||||||
struct intel_encoder *encoder = NULL;
|
struct intel_encoder *encoder = NULL;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (crtc_state->bigjoiner_slave)
|
master_crtc = intel_master_crtc(crtc_state);
|
||||||
master = crtc_state->bigjoiner_linked_crtc;
|
master_crtc_state = intel_atomic_get_new_crtc_state(state, master_crtc);
|
||||||
|
|
||||||
master_crtc_state = intel_atomic_get_new_crtc_state(state, master);
|
|
||||||
|
|
||||||
for_each_new_connector_in_state(&state->base, conn, conn_state, i) {
|
for_each_new_connector_in_state(&state->base, conn, conn_state, i) {
|
||||||
if (conn_state->crtc != &master->base)
|
if (conn_state->crtc != &master_crtc->base)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
encoder = to_intel_encoder(conn_state->best_encoder);
|
encoder = to_intel_encoder(conn_state->best_encoder);
|
||||||
|
@ -1975,10 +1981,10 @@ static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,
|
||||||
/*
|
/*
|
||||||
* Enable sequence steps 1-7 on bigjoiner master
|
* Enable sequence steps 1-7 on bigjoiner master
|
||||||
*/
|
*/
|
||||||
intel_encoders_pre_pll_enable(state, master);
|
intel_encoders_pre_pll_enable(state, master_crtc);
|
||||||
if (master_crtc_state->shared_dpll)
|
if (master_crtc_state->shared_dpll)
|
||||||
intel_enable_shared_dpll(master_crtc_state);
|
intel_enable_shared_dpll(master_crtc_state);
|
||||||
intel_encoders_pre_enable(state, master);
|
intel_encoders_pre_enable(state, master_crtc);
|
||||||
|
|
||||||
/* and DSC on slave */
|
/* and DSC on slave */
|
||||||
intel_dsc_enable(NULL, crtc_state);
|
intel_dsc_enable(NULL, crtc_state);
|
||||||
|
@ -6877,7 +6883,7 @@ verify_crtc_state(struct intel_crtc *crtc,
|
||||||
struct intel_encoder *encoder;
|
struct intel_encoder *encoder;
|
||||||
struct intel_crtc_state *pipe_config = old_crtc_state;
|
struct intel_crtc_state *pipe_config = old_crtc_state;
|
||||||
struct drm_atomic_state *state = old_crtc_state->uapi.state;
|
struct drm_atomic_state *state = old_crtc_state->uapi.state;
|
||||||
struct intel_crtc *master = crtc;
|
struct intel_crtc *master_crtc;
|
||||||
|
|
||||||
__drm_atomic_helper_crtc_destroy_state(&old_crtc_state->uapi);
|
__drm_atomic_helper_crtc_destroy_state(&old_crtc_state->uapi);
|
||||||
intel_crtc_free_hw_state(old_crtc_state);
|
intel_crtc_free_hw_state(old_crtc_state);
|
||||||
|
@ -6905,10 +6911,9 @@ verify_crtc_state(struct intel_crtc *crtc,
|
||||||
"(expected %i, found %i)\n",
|
"(expected %i, found %i)\n",
|
||||||
new_crtc_state->hw.active, crtc->active);
|
new_crtc_state->hw.active, crtc->active);
|
||||||
|
|
||||||
if (new_crtc_state->bigjoiner_slave)
|
master_crtc = intel_master_crtc(new_crtc_state);
|
||||||
master = new_crtc_state->bigjoiner_linked_crtc;
|
|
||||||
|
|
||||||
for_each_encoder_on_crtc(dev, &master->base, encoder) {
|
for_each_encoder_on_crtc(dev, &master_crtc->base, encoder) {
|
||||||
enum pipe pipe;
|
enum pipe pipe;
|
||||||
bool active;
|
bool active;
|
||||||
|
|
||||||
|
@ -6918,7 +6923,7 @@ verify_crtc_state(struct intel_crtc *crtc,
|
||||||
encoder->base.base.id, active,
|
encoder->base.base.id, active,
|
||||||
new_crtc_state->hw.active);
|
new_crtc_state->hw.active);
|
||||||
|
|
||||||
I915_STATE_WARN(active && master->pipe != pipe,
|
I915_STATE_WARN(active && master_crtc->pipe != pipe,
|
||||||
"Encoder connected to wrong pipe %c\n",
|
"Encoder connected to wrong pipe %c\n",
|
||||||
pipe_name(pipe));
|
pipe_name(pipe));
|
||||||
|
|
||||||
|
@ -7590,13 +7595,13 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
|
||||||
struct intel_crtc_state *new_crtc_state)
|
struct intel_crtc_state *new_crtc_state)
|
||||||
{
|
{
|
||||||
struct intel_crtc_state *slave_crtc_state, *master_crtc_state;
|
struct intel_crtc_state *slave_crtc_state, *master_crtc_state;
|
||||||
struct intel_crtc *slave, *master;
|
struct intel_crtc *slave_crtc, *master_crtc;
|
||||||
|
|
||||||
/* slave being enabled, is master is still claiming this crtc? */
|
/* slave being enabled, is master is still claiming this crtc? */
|
||||||
if (old_crtc_state->bigjoiner_slave) {
|
if (old_crtc_state->bigjoiner_slave) {
|
||||||
slave = crtc;
|
slave_crtc = crtc;
|
||||||
master = old_crtc_state->bigjoiner_linked_crtc;
|
master_crtc = old_crtc_state->bigjoiner_linked_crtc;
|
||||||
master_crtc_state = intel_atomic_get_new_crtc_state(state, master);
|
master_crtc_state = intel_atomic_get_new_crtc_state(state, master_crtc);
|
||||||
if (!master_crtc_state || !intel_crtc_needs_modeset(master_crtc_state))
|
if (!master_crtc_state || !intel_crtc_needs_modeset(master_crtc_state))
|
||||||
goto claimed;
|
goto claimed;
|
||||||
}
|
}
|
||||||
|
@ -7604,17 +7609,17 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
|
||||||
if (!new_crtc_state->bigjoiner)
|
if (!new_crtc_state->bigjoiner)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
slave = intel_dsc_get_bigjoiner_secondary(crtc);
|
slave_crtc = intel_dsc_get_bigjoiner_secondary(crtc);
|
||||||
if (!slave) {
|
if (!slave_crtc) {
|
||||||
DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires "
|
DRM_DEBUG_KMS("[CRTC:%d:%s] Big joiner configuration requires "
|
||||||
"CRTC + 1 to be used, doesn't exist\n",
|
"CRTC + 1 to be used, doesn't exist\n",
|
||||||
crtc->base.base.id, crtc->base.name);
|
crtc->base.base.id, crtc->base.name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
new_crtc_state->bigjoiner_linked_crtc = slave;
|
new_crtc_state->bigjoiner_linked_crtc = slave_crtc;
|
||||||
slave_crtc_state = intel_atomic_get_crtc_state(&state->base, slave);
|
slave_crtc_state = intel_atomic_get_crtc_state(&state->base, slave_crtc);
|
||||||
master = crtc;
|
master_crtc = crtc;
|
||||||
if (IS_ERR(slave_crtc_state))
|
if (IS_ERR(slave_crtc_state))
|
||||||
return PTR_ERR(slave_crtc_state);
|
return PTR_ERR(slave_crtc_state);
|
||||||
|
|
||||||
|
@ -7623,15 +7628,15 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
|
||||||
goto claimed;
|
goto claimed;
|
||||||
|
|
||||||
DRM_DEBUG_KMS("[CRTC:%d:%s] Used as slave for big joiner\n",
|
DRM_DEBUG_KMS("[CRTC:%d:%s] Used as slave for big joiner\n",
|
||||||
slave->base.base.id, slave->base.name);
|
slave_crtc->base.base.id, slave_crtc->base.name);
|
||||||
|
|
||||||
return copy_bigjoiner_crtc_state(slave_crtc_state, new_crtc_state);
|
return copy_bigjoiner_crtc_state(slave_crtc_state, new_crtc_state);
|
||||||
|
|
||||||
claimed:
|
claimed:
|
||||||
DRM_DEBUG_KMS("[CRTC:%d:%s] Slave is enabled as normal CRTC, but "
|
DRM_DEBUG_KMS("[CRTC:%d:%s] Slave is enabled as normal CRTC, but "
|
||||||
"[CRTC:%d:%s] claiming this CRTC for bigjoiner.\n",
|
"[CRTC:%d:%s] claiming this CRTC for bigjoiner.\n",
|
||||||
slave->base.base.id, slave->base.name,
|
slave_crtc->base.base.id, slave_crtc->base.name,
|
||||||
master->base.base.id, master->base.name);
|
master_crtc->base.base.id, master_crtc->base.name);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue