diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-11-27 09:39:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-11-27 09:39:51 +1000 |
| commit | 9595930db4bb91433607441a5f26d90e9c6e34eb (patch) | |
| tree | 5a1a8dcff300bfa47062ccaaa0a2b1e3e141e614 /drivers/gpu/drm/vc4/vc4_hdmi.h | |
| parent | d45618c28521ba99ba1e5610ac4a5ca693c37c1e (diff) | |
| parent | 2be65641642ef423f82162c3a5f28c754d1637d2 (diff) | |
Merge tag 'drm-misc-fixes-2020-11-26' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixesdrm-fixes-2020-11-27-1drm-fixes-2020-11-27
A bunch of fixes for vc4 fixing some coexistence issue between wifi and
HDMI, unsupported modes, and vblank timeouts, a fix for ast to reload
the gamma LUT after changing the plane format and a double-free fix for
nouveau
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201126085450.r3i7wvj7pizsa4l6@gilmour
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_hdmi.h')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_hdmi.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h index 63c6f8bddf1d..0526a9cf608a 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -62,6 +62,9 @@ struct vc4_hdmi_variant { */ enum vc4_hdmi_phy_channel phy_lane_mapping[4]; + /* The BCM2711 cannot deal with odd horizontal pixel timings */ + bool unsupported_odd_h_timings; + /* Callback to get the resources (memory region, interrupts, * clocks, etc) for that variant. */ @@ -139,6 +142,14 @@ struct vc4_hdmi { int hpd_gpio; bool hpd_active_low; + /* + * On some systems (like the RPi4), some modes are in the same + * frequency range than the WiFi channels (1440p@60Hz for + * example). Should we take evasive actions because that system + * has a wifi adapter? + */ + bool disable_wifi_frequencies; + struct cec_adapter *cec_adap; struct cec_msg cec_rx_msg; bool cec_tx_ok; |