From patchwork Tue Jan 3 19:41:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 89722 Delivered-To: patches@linaro.org Received: by 10.140.20.101 with SMTP id 92csp8166379qgi; Tue, 3 Jan 2017 11:41:52 -0800 (PST) X-Received: by 10.99.115.76 with SMTP id d12mr115611954pgn.56.1483472512572; Tue, 03 Jan 2017 11:41:52 -0800 (PST) Return-Path: Received: from mail-pg0-x22e.google.com (mail-pg0-x22e.google.com. [2607:f8b0:400e:c05::22e]) by mx.google.com with ESMTPS id f123si69931899pfb.188.2017.01.03.11.41.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 11:41:52 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e as permitted sender) client-ip=2607:f8b0:400e:c05::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x22e.google.com with SMTP id g1so178781164pgn.0 for ; Tue, 03 Jan 2017 11:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o+3+c5NOuLGFhJNsbZ9KF/bbL9AU7Iszpp/GJGKrJZI=; b=NK3Q3kflY46f48O0lDv/B7/xnKWXTcUPCyo2Ews409c7Tspjbx+1Ozx1MD6vSiCWjF tucMB7Q1p/p4C9m2XaDGwCk+m80zncHmLQ89aw5A1z0p+0OpWXAVFmtZG7SaUBMW0103 TBYz1yEmx5V9BU1PMNMPXEavthyOGdCwBQ0nA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o+3+c5NOuLGFhJNsbZ9KF/bbL9AU7Iszpp/GJGKrJZI=; b=FnUN8lGg2EnoNnMihrr0WQE8qbu+n5YacxbD+YtU3DW4yLn+2DBFS2nMVDLXz/rC/O 4cOoRo6vJK9n6dKZRWXLWbWj88pG/SaJ/T9E9O8iKBtu1YvHGnbPpzZTxzgmJ2t2iS4D U48PC/g0fEmTmV12O44iwrtmQj1kurHkPffoSW3b7Ms3Dh47FAB7WnG/sag3Pr27M0iR h5m0PJi7HPt2DcNdiV1joceQZ8JbRnLAJlKts11/EdrcJtJEQn4gNa8xGdIEXg2dwj4f UNkJZBOlsp+6zZOR572OYxbb23cAtgWytUfbh+xrpvm1xK5implBZmNqP5qI6i3DrFxb R0Aw== X-Gm-Message-State: AIkVDXI49HtMNnI47vdNwHZtM3AgZPfawhcIri6Atv29Q9VpYLwxDgfoSNv1nj470qFif9qhNTQ= X-Received: by 10.98.108.3 with SMTP id h3mr59268979pfc.65.1483472512295; Tue, 03 Jan 2017 11:41:52 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id y62sm77865957pfk.52.2017.01.03.11.41.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jan 2017 11:41:51 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , David Airlie , Archit Taneja , Wolfram Sang , Lars-Peter Clausen , Laurent Pinchart , dri-devel@lists.freedesktop.org Subject: [PATCH 2/5 v3] drm/bridge: adv7511: Switch to using drm_kms_helper_hotplug_event() Date: Tue, 3 Jan 2017 11:41:39 -0800 Message-Id: <1483472502-16403-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483472502-16403-1-git-send-email-john.stultz@linaro.org> References: <1483472502-16403-1-git-send-email-john.stultz@linaro.org> In chasing down a previous issue with EDID probing from calling drm_helper_hpd_irq_event() from irq context, Laurent noticed that the DRM documentation suggests that drm_kms_helper_hotplug_event() should be used instead. Thus this patch replaces drm_helper_hpd_irq_event() with drm_kms_helper_hotplug_event(), which requires we update the connector.status entry and only call _hotplug_event() when the status changes. Cc: David Airlie Cc: Archit Taneja Cc: Wolfram Sang Cc: Lars-Peter Clausen Cc: Laurent Pinchart Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- v3: Update connector.status value and only call __hotplug_event() when that status changes, as suggested by Laurent. drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 4fcea44..d93d66f 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -405,8 +405,22 @@ static bool adv7511_hpd(struct adv7511 *adv7511) static void adv7511_hpd_work(struct work_struct *work) { struct adv7511 *adv7511 = container_of(work, struct adv7511, hpd_work); + enum drm_connector_status status; + unsigned int val; + int ret; + + ret = regmap_read(adv7511->regmap, ADV7511_REG_STATUS, &val); + if (ret < 0) + status = connector_status_disconnected; + else if (val & ADV7511_STATUS_HPD) + status = connector_status_connected; + else + status = connector_status_disconnected; + + if (adv7511->connector.status != status) + drm_kms_helper_hotplug_event(adv7511->connector.dev); - drm_helper_hpd_irq_event(adv7511->connector.dev); + adv7511->connector.status = status; } static int adv7511_irq_process(struct adv7511 *adv7511, bool process_hpd)