On Mon, Dec 02, 2024 at 12:19:39PM -0600, Derek Foreman wrote: > Our infoframe setting code currently lacks the ability to clear > infoframes. For some of the infoframes, we only need to replace them, > so if an error occurred when generating a new infoframe we would leave > a stale frame instead of clearing the frame. > > However, the Dynamic Range and Mastering (DRM) infoframe should only > be present when displaying HDR content (ie: the HDR_OUTPUT_METADATA blob > is set). If we can't clear infoframes, the stale DRM infoframe will > remain and we can never set the display back to SDR mode. > > With this change, we clear infoframes when they can not, or should not, > be generated. This fixes switching to an SDR mode from an HDR one. > > Fixes: f378b77227bc4 ("drm/connector: hdmi: Add Infoframes generation") > Signed-off-by: Derek Foreman <derek.foreman@xxxxxxxxxxxxx> > --- > drivers/gpu/drm/display/drm_hdmi_state_helper.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> -- With best wishes Dmitry