From patchwork Tue Jan 17 00:52:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 91595 Delivered-To: patches@linaro.org Received: by 10.140.20.99 with SMTP id 90csp267308qgi; Mon, 16 Jan 2017 16:53:01 -0800 (PST) X-Received: by 10.98.198.90 with SMTP id m87mr10466062pfg.153.1484614381648; Mon, 16 Jan 2017 16:53:01 -0800 (PST) Return-Path: Received: from mail-pf0-x22e.google.com (mail-pf0-x22e.google.com. [2607:f8b0:400e:c00::22e]) by mx.google.com with ESMTPS id u22si23132830plj.69.2017.01.16.16.53.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jan 2017 16:53:01 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::22e as permitted sender) client-ip=2607:f8b0:400e:c00::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:c00::22e as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pf0-x22e.google.com with SMTP id 189so57181813pfu.3 for ; Mon, 16 Jan 2017 16:53:01 -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=o2upXYjWmfaMmIKtkrtAWcv9SJuF68mVRfAmxFc85Oc=; b=cvkml/iDsxr6Js6SOofXZLsLXu3Hq9YM5BpuschaEPizuSHi4LS6KXiNjtzDDuEM8w BIqN0npkQVB+72ap1Zdpif3wEEqysMC7dT+0KUR0Z+4kR9QNr9CwY8LOHKuTpB2rPu7i ykrj/2sY/okfrk4wRedIOPeKjGoyPKyVjqftI= 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=o2upXYjWmfaMmIKtkrtAWcv9SJuF68mVRfAmxFc85Oc=; b=ArIJlDn+PbYD2OLiDI7SCiCLYlTZZhIcE9kVzqDIAs/x6rcK9rNPuwK8eHqqqLR3nT dAZFzBRa6p5MD3qnX5IdzmhpGKuyirlI6ktOnVl62oyZeZEu8ivd7N2nIuJdS69ktmcM P6DFqUGh/3Z7BHt5iKVcttGhDL+lJFMG6vouqR4aGNpVGAo4UvuNoY9JFmB7/jl+zEvL jDI08tI7eTmREOtVnSscXFq11KFk8n447nKk3DGI7DhiDeAlAKOLOUC+cKqsxiHbNi5X fiaMJUXK9yCjF94Q9jyBTolSWo+aUrT/ggb48NM+cTA3REzfP49B/0X8MkEs2YfVXRli ImvA== X-Gm-Message-State: AIkVDXIW8YSbPjm4VxSEYaCO+0TrqNcBK/s4UPbcVTNsb7st4PvtMAJDj1cuLjGZOB7lC1IO140= X-Received: by 10.98.35.25 with SMTP id j25mr33424986pfj.35.1484614381364; Mon, 16 Jan 2017 16:53:01 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id q19sm50220516pfl.21.2017.01.16.16.53.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Jan 2017 16:53:00 -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 5/6] drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID Date: Mon, 16 Jan 2017 16:52:51 -0800 Message-Id: <1484614372-15342-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484614372-15342-1-git-send-email-john.stultz@linaro.org> References: <1484614372-15342-1-git-send-email-john.stultz@linaro.org> Thus this patch changes the EDID probing logic so that we re-use the __adv7511_power_on/off() calls instead of duplciating logic. This does change behavior slightly as it adds the HPD signal pulse to the EDID probe path, but Archit has had a patch to add HPD signal pulse to the EDID probe path before, so this should address the cases where that helped. 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 --- v4: Reworded commit message, focusing on re-use and HPD pulse behavior change. --- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) -- 2.7.4 diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 12f2876..d216f61 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -573,24 +573,13 @@ static int adv7511_get_modes(struct adv7511 *adv7511, unsigned int count; /* Reading the EDID only works if the device is powered */ - if (!adv7511->powered) { - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, - ADV7511_POWER_POWER_DOWN, 0); - if (adv7511->i2c_main->irq) { - regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(0), - ADV7511_INT0_EDID_READY); - regmap_write(adv7511->regmap, ADV7511_REG_INT_ENABLE(1), - ADV7511_INT1_DDC_ERROR); - } - adv7511->current_edid_segment = -1; - } + if (!adv7511->powered) + __adv7511_power_on(adv7511); edid = drm_do_get_edid(connector, adv7511_get_edid_block, adv7511); if (!adv7511->powered) - regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, - ADV7511_POWER_POWER_DOWN, - ADV7511_POWER_POWER_DOWN); + __adv7511_power_off(adv7511); kfree(adv7511->edid); adv7511->edid = edid;