drm/vc4: hvs: Pull the state of all the CRTCs prior to PV muxing
Subsystems (3)
PATCH 1/1 drm/vc4: hvs: Pull the state of all the CRTCs prior to PV muxing
The vc4 display engine has a first controller called the HVS that will perform the composition of the planes. That HVS has 3 FIFOs and can therefore compose planes for up to three outputs. The timings part is generated through a component called the Pixel Valve, and the BCM2711 has 6 of them.
Thus, the HVS has some bits to control which FIFO gets output to which Pixel Valve. The current code supports that muxing by looking at all the CRTCs in a new DRM atomic state in atomic_check, and given the set of contraints that we have, assigns FIFOs to CRTCs or reject the mode entirely. The actual muxing will occur during atomic_commit.
However, that doesn't work if only a fraction of the CRTCs' state is updated in that state, since it will ignore the CRTCs that are kept running unmodified, and will thus unassign its associated FIFO, and later disable it.
In order to make the code work as expected, let's pull the CRTC state of all the enabled CRTC in our atomic_check so that we can operate on all the running CRTCs, no matter whether they are affected by the new state or not.
--- drivers/gpu/drm/vc4/vc4_kms.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/gpu/drm/vc4/vc4_kms.c +17 -0
@@ -620,6 +620,23 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)struct drm_crtc *crtc;int i, ret; +/* +* Since the HVS FIFOs are shared across all the pixelvalves and +* the TXP (and thus all the CRTCs), we need to pull the current +* state of all the enabled CRTCs so that an update to a single +* CRTC still keeps the previous FIFOs enabled and assigned to +* the same CRTCs, instead of evaluating only the CRTC being +* modified. +*/ +list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +if (!crtc->state->enable) +continue ; + + crtc_state =drm_atomic_get_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) +return PTR_ERR (crtc_state); + } +for_each_new_crtc_in_state (state, crtc, crtc_state, i) {struct vc4_crtc_state *vc4_crtc_state =to_vc4_crtc_state (crtc_state);
Signature · 7 lines
2.26.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Maxime,
Quoted 17 lines · Maxime Ripard
The vc4 display engine has a first controller called the HVS that will perform the composition of the planes. That HVS has 3 FIFOs and can therefore compose planes for up to three outputs. The timings part is generated through a component called the Pixel Valve, and the BCM2711 has 6 of them.
Thus, the HVS has some bits to control which FIFO gets output to which Pixel Valve. The current code supports that muxing by looking at all the CRTCs in a new DRM atomic state in
atomic_check, and given the set of contraints that we have, assigns FIFOs to CRTCs or reject the mode entirely. The actual muxing will occur duringatomic_commit.However, that doesn't work if only a fraction of the CRTCs' state is updated in that state, since it will ignore the CRTCs that are kept running unmodified, and will thus unassign its associated FIFO, and later disable it.
Quoted 7 lines
In order to make the code work as expected, let's pull the CRTC state of all the enabled CRTC in our
atomic_checkso that we can operate on all the running CRTCs, no matter whether they are affected by the new state or not.Cc Hoegeun Kwon <[email protected]>Fixes 87ebcd42fb7b ("drm/vc4: crtc: Assign output to channel automatically")Signed-off-by Maxime Ripard <[email protected]>
Thanks for the quick patch and detailed explanation.
Best regards,
Hoegeun
Quoted 22 lines
--- drivers/gpu/drm/vc4/vc4_kms.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/gpu/drm/vc4/vc4_kms.c +10
-0@@ -620,6 +620,23 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)struct drm_crtc *crtc;int i, ret; +/* +* Since the HVS FIFOs are shared across all the pixelvalves and +* the TXP (and thus all the CRTCs), we need to pull the current +* state of all the enabled CRTCs so that an update to a single +* CRTC still keeps the previous FIFOs enabled and assigned to +* the same CRTCs, instead of evaluating only the CRTC being +* modified. +*/ +list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +if (!crtc->state->enable)
drivers/gpu/drm/vc4/vc4_kms.c vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state) · line 642
Quoted 10 lines
drivers/gpu/drm/vc4/vc4_kms.c +7
-0+continue ; + + crtc_state =drm_atomic_get_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) +return PTR_ERR (crtc_state); + } +for_each_new_crtc_in_state (state, crtc, crtc_state, i) {struct vc4_crtc_state *vc4_crtc_state =to_vc4_crtc_state (crtc_state);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Maxime
Quoted 11 lines · Maxime Ripard
The vc4 display engine has a first controller called the HVS that will perform the composition of the planes. That HVS has 3 FIFOs and can therefore compose planes for up to three outputs. The timings part is generated through a component called the Pixel Valve, and the BCM2711 has 6 of them.
Thus, the HVS has some bits to control which FIFO gets output to which Pixel Valve. The current code supports that muxing by looking at all the CRTCs in a new DRM atomic state in
atomic_check, and given the set of contraints that we have, assigns FIFOs to CRTCs or reject the mode
s/contraints/constraints
Quoted 6 lines
entirely. The actual muxing will occur during
atomic_commit.However, that doesn't work if only a fraction of the CRTCs' state is updated in that state, since it will ignore the CRTCs that are kept running unmodified, and will thus unassign its associated FIFO, and later disable it.
Yup, that would surely mess things up :)
Quoted 7 lines
In order to make the code work as expected, let's pull the CRTC state of all the enabled CRTC in our
atomic_checkso that we can operate on all the running CRTCs, no matter whether they are affected by the new state or not.Cc Hoegeun Kwon <[email protected]>Fixes 87ebcd42fb7b ("drm/vc4: crtc: Assign output to channel automatically")Signed-off-by Maxime Ripard <[email protected]>
Thanks
Dave
Quoted 33 lines
--- drivers/gpu/drm/vc4/vc4_kms.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/gpu/drm/vc4/vc4_kms.c +17
-1@@ -620,6 +620,23 @@ vc4_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)struct drm_crtc *crtc;int i, ret; +/* +* Since the HVS FIFOs are shared across all the pixelvalves and +* the TXP (and thus all the CRTCs), we need to pull the current +* state of all the enabled CRTCs so that an update to a single +* CRTC still keeps the previous FIFOs enabled and assigned to +* the same CRTCs, instead of evaluating only the CRTC being +* modified. +*/ +list_for_each_entry (crtc, &dev->mode_config.crtc_list, head) { +if (!crtc->state->enable) +continue ; + + crtc_state =drm_atomic_get_crtc_state (state, crtc); +if (IS_ERR (crtc_state)) +return PTR_ERR (crtc_state); + } +for_each_new_crtc_in_state (state, crtc, crtc_state, i) {struct vc4_crtc_state *vc4_crtc_state =to_vc4_crtc_state (crtc_state); --
Quoted 2 lines
2.26.2
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · Dave Stevenson
Hi Maxime
Quoted 7 lines · Maxime Ripard
The vc4 display engine has a first controller called the HVS that will perform the composition of the planes. That HVS has 3 FIFOs and can therefore compose planes for up to three outputs. The timings part is generated through a component called the Pixel Valve, and the BCM2711 has 6 of them.
Quoted 6 lines
Quoted 4 lines
Thus, the HVS has some bits to control which FIFO gets output to which Pixel Valve. The current code supports that muxing by looking at all the CRTCs in a new DRM atomic state in
atomic_check, and given the set of contraints that we have, assigns FIFOs to CRTCs or reject the modes/contraints/constraints
Oops, thanks
I've fixed it while applying it
Maxime
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel