From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A1E0C433EA for ; Mon, 27 Jul 2020 14:21:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4986C2070B for ; Mon, 27 Jul 2020 14:21:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859672; bh=TecO03OPduOUqsycocBSfTknmGQEVs9nwM8nTt4HnO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LzeQ0tbFZvKOmk8lrkkP4HrQetXg/B0mIYMLt97enhw5+GMbp08GrKth2x33iYCRV i5lBdeHhNaizRTOHcqE24JVbGY/YZivpqHoDtbMLkB3rizziF+73ChWolR4CZ8rAHu EU4P5o8HdKB+/X6LvvSMGCCS5V9ji2pZBQrrRHM8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731678AbgG0OVL (ORCPT ); Mon, 27 Jul 2020 10:21:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:49704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731638AbgG0OVK (ORCPT ); Mon, 27 Jul 2020 10:21:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 310492070B; Mon, 27 Jul 2020 14:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859669; bh=TecO03OPduOUqsycocBSfTknmGQEVs9nwM8nTt4HnO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u1Gfzg5YoPpNOoKms/o9WqI6WXSUcLABU96sVFUr0SQOgVdZhHPvkoxFu3s1UPXqM xdOJxD7iY9fr/JG1k7sTh8gTSgbvcfMH5EolNsyfv5TNccdXw8KL4TID9aHnr9ap/y eTluKDLtHnPNwhnN5lImYz0lxHxmMP9awFXP6FA8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chen-Yu Tsai , Mans Rullgard , Maxime Ripard , Sasha Levin Subject: [PATCH 5.7 060/179] drm: sun4i: hdmi: Fix inverted HPD result Date: Mon, 27 Jul 2020 16:03:55 +0200 Message-Id: <20200727134935.594677480@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134932.659499757@linuxfoundation.org> References: <20200727134932.659499757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chen-Yu Tsai [ Upstream commit baa1841eb797eadce6c907bdaed7cd6f01815404 ] When the extra HPD polling in sun4i_hdmi was removed, the result of HPD was accidentally inverted. Fix this by inverting the check. Fixes: bda8eaa6dee7 ("drm: sun4i: hdmi: Remove extra HPD polling") Signed-off-by: Chen-Yu Tsai Tested-by: Mans Rullgard Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20200711011030.21997-1-wens@kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c index f07e0c32b93a2..4c5072a578bf2 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -263,7 +263,7 @@ sun4i_hdmi_connector_detect(struct drm_connector *connector, bool force) unsigned long reg; reg = readl(hdmi->base + SUN4I_HDMI_HPD_REG); - if (reg & SUN4I_HDMI_HPD_HIGH) { + if (!(reg & SUN4I_HDMI_HPD_HIGH)) { cec_phys_addr_invalidate(hdmi->cec_adap); return connector_status_disconnected; } -- 2.25.1