niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915: Track logically enabled planes for hw state

Browse source 
Currently crtc_state->uapi.plane_mask only tracks logically
enabled planes on the uapi level. For bigjoiner purposes
we want to do the same for the hw state. Let's follow the
pattern established by active_planes & co. here.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201124201156.17095-1-ville.syrjala@linux.intel.com
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
This commit is contained in:
Ville Syrjälä 2020-11-24 22:11:53 +02:00
parent 97ffcd0d1e
commit ee42ec19ca
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/i915/display/intel_atomic_plane.c
View file

@ -312,10 +312,13 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
int ret; int ret;
intel_plane_set_invisible(new_crtc_state, new_plane_state); intel_plane_set_invisible(new_crtc_state, new_plane_state);
new_crtc_state->enabled_planes &= ~BIT(plane->id);
if (!new_plane_state->hw.crtc && !old_plane_state->hw.crtc) if (!new_plane_state->hw.crtc && !old_plane_state->hw.crtc)
return 0; return 0;
new_crtc_state->enabled_planes |= BIT(plane->id);
ret = plane->check_plane(new_crtc_state, new_plane_state); ret = plane->check_plane(new_crtc_state, new_plane_state);
if (ret) if (ret)
return ret; return ret;

13
drivers/gpu/drm/i915/display/intel_display.c
View file

@ -3552,7 +3552,7 @@ intel_set_plane_visible(struct intel_crtc_state *crtc_state,
crtc_state->uapi.plane_mask &= ~drm_plane_mask(&plane->base); crtc_state->uapi.plane_mask &= ~drm_plane_mask(&plane->base);
} }
static void fixup_active_planes(struct intel_crtc_state *crtc_state) static void fixup_plane_bitmasks(struct intel_crtc_state *crtc_state)
{ {
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev); struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
struct drm_plane *plane; struct drm_plane *plane;
@ -3562,11 +3562,14 @@ static void fixup_active_planes(struct intel_crtc_state *crtc_state)
* have been used on the same (or wrong) pipe. plane_mask uses * have been used on the same (or wrong) pipe. plane_mask uses
* unique ids, hence we can use that to reconstruct active_planes. * unique ids, hence we can use that to reconstruct active_planes.
*/ */
crtc_state->enabled_planes = 0;
crtc_state->active_planes = 0; crtc_state->active_planes = 0;
drm_for_each_plane_mask(plane, &dev_priv->drm, drm_for_each_plane_mask(plane, &dev_priv->drm,
crtc_state->uapi.plane_mask) crtc_state->uapi.plane_mask) {
crtc_state->enabled_planes |= BIT(to_intel_plane(plane)->id);
crtc_state->active_planes |= BIT(to_intel_plane(plane)->id); crtc_state->active_planes |= BIT(to_intel_plane(plane)->id);
}
} }
static void intel_plane_disable_noatomic(struct intel_crtc *crtc, static void intel_plane_disable_noatomic(struct intel_crtc *crtc,
@ -3584,7 +3587,7 @@ static void intel_plane_disable_noatomic(struct intel_crtc *crtc,
crtc->base.base.id, crtc->base.name); crtc->base.base.id, crtc->base.name);
intel_set_plane_visible(crtc_state, plane_state, false); intel_set_plane_visible(crtc_state, plane_state, false);
fixup_active_planes(crtc_state); fixup_plane_bitmasks(crtc_state);
crtc_state->data_rate[plane->id] = 0; crtc_state->data_rate[plane->id] = 0;
crtc_state->min_cdclk[plane->id] = 0; crtc_state->min_cdclk[plane->id] = 0;
@ -12804,6 +12807,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
plane_state->planar_linked_plane = NULL; plane_state->planar_linked_plane = NULL;
if (plane_state->planar_slave && !plane_state->uapi.visible) { if (plane_state->planar_slave && !plane_state->uapi.visible) {
crtc_state->enabled_planes &= ~BIT(plane->id);
crtc_state->active_planes &= ~BIT(plane->id); crtc_state->active_planes &= ~BIT(plane->id);
crtc_state->update_planes |= BIT(plane->id); crtc_state->update_planes |= BIT(plane->id);
} }
@ -12847,6 +12851,7 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
linked_state->planar_slave = true; linked_state->planar_slave = true;
linked_state->planar_linked_plane = plane; linked_state->planar_linked_plane = plane;
crtc_state->enabled_planes |= BIT(linked->id);
crtc_state->active_planes |= BIT(linked->id); crtc_state->active_planes |= BIT(linked->id);
crtc_state->update_planes |= BIT(linked->id); crtc_state->update_planes |= BIT(linked->id);
drm_dbg_kms(&dev_priv->drm, "Using %s as Y plane for %s\n", drm_dbg_kms(&dev_priv->drm, "Using %s as Y plane for %s\n",
@ -19133,7 +19138,7 @@ static void readout_plane_state(struct drm_i915_private *dev_priv)
struct intel_crtc_state *crtc_state = struct intel_crtc_state *crtc_state =
to_intel_crtc_state(crtc->base.state); to_intel_crtc_state(crtc->base.state);
fixup_active_planes(crtc_state); fixup_plane_bitmasks(crtc_state);
} }
} }

5
drivers/gpu/drm/i915/display/intel_display_types.h
View file

@ -1053,7 +1053,10 @@ struct intel_crtc_state {
u32 cgm_mode; u32 cgm_mode;
}; };
/* bitmask of visible planes (enum plane_id) */ /* bitmask of logically enabled planes (enum plane_id) */
u8 enabled_planes;
/* bitmask of actually visible planes (enum plane_id) */
u8 active_planes; u8 active_planes;
u8 nv12_planes; u8 nv12_planes;
u8 c8_planes; u8 c8_planes;