From patchwork Mon Dec 12 21:00:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 87772 Delivered-To: patches@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1858689qgi; Mon, 12 Dec 2016 13:00:50 -0800 (PST) X-Received: by 10.98.9.149 with SMTP id 21mr100642354pfj.159.1481576450345; Mon, 12 Dec 2016 13:00:50 -0800 (PST) Return-Path: Received: from mail-pg0-x22f.google.com (mail-pg0-x22f.google.com. [2607:f8b0:400e:c05::22f]) by mx.google.com with ESMTPS id l26si45011142pli.44.2016.12.12.13.00.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Dec 2016 13:00:50 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22f as permitted sender) client-ip=2607:f8b0:400e:c05::22f; 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::22f as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x22f.google.com with SMTP id f188so39012381pgc.3 for ; Mon, 12 Dec 2016 13:00:50 -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=Ax80QUMqId4NLw7Il0/zMOBdXwHVJIh1lSyd0ZBTu5s=; b=acXV9cySDiENcCsQNzzlmDS6KppC0C4N1oSqlCn/a/4tedKV31N/CiMshXtq0e2bjC 9E7GrVDMALGrk7Zom3syY/F/Aze0BwsPxi6K3zh8wLzIyOar17tCTvdydAO/bc8tmFPS up5zzoc/iW4Td4TlcYbK7BCZeWZ1iGWbb7v1U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ax80QUMqId4NLw7Il0/zMOBdXwHVJIh1lSyd0ZBTu5s=; b=IflNBMh7GL6A7SrGZgw8RwYvmDHat8H4X3DPdw4VMj6dJpx2ofZDw06mEBQFtbXcFf Qq2VVqbZ7fS98LE3r2dbtpwRf1i29Wf7Frp3Hrx2q/nRCMkDfUUnsGfknib6ONp7ffLv uKhIvno0IIF0XCrB5GQE1l8QGS/0eO8YYb7UfUdeM6/lYEocnDPwwDMOQUf/T/jUV1RF O6C+a1gbqnCwopMSvs23+hFiakaLRR3EpuMej3F/s5SHmljg6L6jKzzgaiafvhDb7bYi LLPnUe3vijE4XFvehEM95FYmWacW+N5XGZqn87G03W8OPH8dZpzd5FsOECvHGk/k+F2g JM1Q== X-Gm-Message-State: AKaTC03Cg2euN4w71o0g8AVQ4QovemuohVMOdyv2N48VzUOxdqEVj4F9oST0t6nTILGpmTgLRWs= X-Received: by 10.98.194.130 with SMTP id w2mr97657985pfk.143.1481576449961; Mon, 12 Dec 2016 13:00:49 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f3sm41074078pga.45.2016.12.12.13.00.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 13:00:49 -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: [RFC][PATCH 5/5 v3] drm/bridge: adv7511: Reuse __adv7511_power_on/off() when probing EDID Date: Mon, 12 Dec 2016 13:00:41 -0800 Message-Id: <1481576441-23529-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481576441-23529-1-git-send-email-john.stultz@linaro.org> References: <1481576441-23529-1-git-send-email-john.stultz@linaro.org> I've found that by just turning the chip on and off via the POWER_DOWN register, I end up getting i2c_transfer errors on HiKey. Investigating further, it seems some of the register state in the regmap cache is somehow getting lost. Using the logic in __adv7511_power_on/off() which syncs and dirtys the cache avoids this issue. Thus this patch changes the EDID probing logic so that we re-use the __adv7511_power_on/off() calls. 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 --- 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 dbdb71c..24573e0 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -572,24 +572,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;