drm/vc4: hdmi: Fix build break caused by merge issue
Subsystems (3)
PATCH 1/1 drm/vc4: hdmi: Fix build break caused by merge issue
Commit 6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod") was reverted partially by
Commit 0600a948942d ("Merge tag 'v5.13' into amd-staging-drm-next") which caused build break when compiling 'make allmodconfig'
Original Patch: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Signed-off-by Anson Jacob <[email protected]>
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +3 -4
@@ -168,10 +168,9 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)WARN_ON (pm_runtime_resume_and_get (&vc4_hdmi->pdev->dev)); -if (vc4_hdmi->hpd_gpio) { -if (gpio_get_value_cansleep (vc4_hdmi->hpd_gpio) ^ - vc4_hdmi->hpd_active_low) - connected = true; +if (vc4_hdmi->hpd_gpio && +gpiod_get_value_cansleep (vc4_hdmi->hpd_gpio)) { + connected = true; }else if (drm_probe_ddc (vc4_hdmi->ddc)) { connected = true; }else if (HDMI_READ (HDMI_HOTPLUG ) &VC4_HDMI_HOTPLUG_CONNECTED ) {
Signature · 1 line
2.25.1