leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/display: Use external dependency loop for port sync

Browse Source 
This loop was added directly to intel_atomic_check() to be used by
all other features that have external pipe dependencies, so using it
and removing intel_atomic_check_synced_crtcs().

After this changes is_trans_port_sync_master() it not used anywhere,
so removing it.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200106142823.145260-1-jose.souza@intel.com
This commit is contained in:
José Roberto de Souza 2020-01-06 06:28:23 -08:00
parent 953cac3ec5
commit 05a8e45136
1 changed files with 17 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/gpu/drm/i915/display/intel_display.c
View File

@ -553,13 +553,6 @@ is_trans_port_sync_mode(const struct intel_crtc_state *crtc_state)
crtc_state->sync_mode_slaves_mask); crtc_state->sync_mode_slaves_mask);
} }
static bool
is_trans_port_sync_master(const struct intel_crtc_state *crtc_state)
{
return (crtc_state->master_transcoder == INVALID_TRANSCODER &&
crtc_state->sync_mode_slaves_mask);
}
static bool static bool
is_trans_port_sync_slave(const struct intel_crtc_state *crtc_state) is_trans_port_sync_slave(const struct intel_crtc_state *crtc_state)
{ {
@ -14514,31 +14507,6 @@ intel_modeset_synced_crtcs(struct intel_atomic_state *state,
} }
} }
static void
intel_atomic_check_synced_crtcs(struct intel_atomic_state *state)
{
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
struct intel_crtc_state *new_crtc_state;
struct intel_crtc *crtc;
int i;
if (INTEL_GEN(dev_priv) < 11)
return;
for_each_new_intel_crtc_in_state(state, crtc,
new_crtc_state, i) {
if (is_trans_port_sync_master(new_crtc_state) &&
needs_modeset(new_crtc_state)) {
intel_modeset_synced_crtcs(state,
new_crtc_state->sync_mode_slaves_mask);
} else if (is_trans_port_sync_slave(new_crtc_state) &&
needs_modeset(new_crtc_state)) {
intel_modeset_synced_crtcs(state,
BIT(new_crtc_state->master_transcoder));
}
}
}
static int static int
intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id) intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp_id)
{ {
@ -14682,33 +14650,30 @@ static int intel_atomic_check(struct drm_device *dev,
* *
* Right now it only forces a fullmodeset when the MST master * Right now it only forces a fullmodeset when the MST master
* transcoder did not changed but the pipe of the master transcoder * transcoder did not changed but the pipe of the master transcoder
* needs a fullmodeset so all slaves also needs to do a fullmodeset. * needs a fullmodeset so all slaves also needs to do a fullmodeset or
* in case of port synced crtcs, if one of the synced crtcs
* needs a full modeset, all other synced crtcs should be
* forced a full modeset.
*/ */
for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) { for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, i) {
enum transcoder master = new_crtc_state->mst_master_transcoder; if (!new_crtc_state->hw.enable || needs_modeset(new_crtc_state))
if (!new_crtc_state->hw.enable ||
needs_modeset(new_crtc_state) ||
!intel_dp_mst_is_slave_trans(new_crtc_state))
continue; continue;
if (intel_cpu_transcoder_needs_modeset(state, master)) { if (intel_dp_mst_is_slave_trans(new_crtc_state)) {
new_crtc_state->uapi.mode_changed = true; enum transcoder master = new_crtc_state->mst_master_transcoder;
new_crtc_state->update_pipe = false;
if (intel_cpu_transcoder_needs_modeset(state, master)) {
new_crtc_state->uapi.mode_changed = true;
new_crtc_state->update_pipe = false;
}
} else if (is_trans_port_sync_mode(new_crtc_state)) {
u8 trans = new_crtc_state->sync_mode_slaves_mask |
BIT(new_crtc_state->master_transcoder);
intel_modeset_synced_crtcs(state, trans);
} }
} }
/**
* In case of port synced crtcs, if one of the synced crtcs
* needs a full modeset, all other synced crtcs should be
* forced a full modeset. This checks if fastset is allowed
* by other dependencies like the synced crtcs.
* Here we set the mode_changed to true directly to force full
* modeset hence we do not explicitly call the function
* drm_atomic_helper_check_modeset().
*/
intel_atomic_check_synced_crtcs(state);
for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
new_crtc_state, i) { new_crtc_state, i) {
if (needs_modeset(new_crtc_state)) { if (needs_modeset(new_crtc_state)) {