From patchwork Tue Nov 22 00:37:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 83318 Delivered-To: patches@linaro.org Received: by 10.140.97.165 with SMTP id m34csp1848623qge; Mon, 21 Nov 2016 16:37:37 -0800 (PST) X-Received: by 10.99.176.78 with SMTP id z14mr38561944pgo.3.1479775057006; Mon, 21 Nov 2016 16:37:37 -0800 (PST) Return-Path: Received: from mail-pg0-x229.google.com (mail-pg0-x229.google.com. [2607:f8b0:400e:c05::229]) by mx.google.com with ESMTPS id m129si25260461pgm.165.2016.11.21.16.37.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2016 16:37:36 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::229 as permitted sender) client-ip=2607:f8b0:400e:c05::229; 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::229 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x229.google.com with SMTP id p66so988694pga.2 for ; Mon, 21 Nov 2016 16:37:36 -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=G685zGCwiz7uQFWopadX13PZ9PaXb0rcEonKu/Zq7C4=; b=gHdpLFUKqpKMeMn/wglbbbLw8mEEgunNZ66qSSy+TBbo1IT38cCV20RVE9YF4iFGxh 90bw81ekzwOJCEBcQ2IrnMA1M81PwtOy7VmP5BBEgqLQnqP/9fxlB5/BEAbgFu/C3UCm 6tR4LDg/7l1XQNxk3XAC2Lh8fCRQm4arNG/yA= 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=G685zGCwiz7uQFWopadX13PZ9PaXb0rcEonKu/Zq7C4=; b=DRngFWo4+ECMwkI8zMQURKiMxs0u/SEffnPbjpMJGukj6jgdZ0MbfXwth7/TdpiJZd WE/2/jDHY8fVos98F3DBxN7HTJnb9LAOkZWpDux16Ys1wY4BZ0lvFqrzPY4ixQ7MVd33 hyPSJMrSdWhYY5bV92fU4BuNgphuZ+2mfIzf0IJ37MhFNi5HnTCuwkVy4FJWwTmgTccY BPgWQW28rL+rc/RXEIRqgfa/KB7qIhuHBsjf0YgUOoAroq1bcFVGzCg9DJc1GMsvc2gc aEV6rMC75Ya0Pj86FwYNrMvHBLcmIquK0uMol+zdesYQJHd3jVVn19NO628Y0o4ZsHEU cSCg== X-Gm-Message-State: AKaTC03AncuOmYI3ZCaoI8f/JJQVp7GOrV5TUlHxDZsq0AqfDavQ2fekETcoGMD08vp1NBIHQvg= X-Received: by 10.98.223.25 with SMTP id u25mr21617844pfg.96.1479775056454; Mon, 21 Nov 2016 16:37:36 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u78sm38514933pfa.53.2016.11.21.16.37.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 16:37:36 -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 1/3] drm/bridge: adv7511: Rework adv7511_power_on/off() so they can be reused internally Date: Mon, 21 Nov 2016 16:37:30 -0800 Message-Id: <1479775052-28194-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479775052-28194-1-git-send-email-john.stultz@linaro.org> References: <1479775052-28194-1-git-send-email-john.stultz@linaro.org> In chasing down issues with EDID probing, I found some duplicated but incomplete logic used to power the chip on and off. This patch refactors the adv7511_power_on/off functions, so they can be used for internal needs, and replaces duplicative logic that powers the chip on and off around the EDID probing with the common logic. 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 | 30 +++++++++++++--------------- 1 file changed, 14 insertions(+), 16 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 8dba729..b240e05 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -325,7 +325,7 @@ static void adv7511_set_link_config(struct adv7511 *adv7511, adv7511->rgb = config->input_colorspace == HDMI_COLORSPACE_RGB; } -static void adv7511_power_on(struct adv7511 *adv7511) +static void __adv7511_power_on(struct adv7511 *adv7511) { adv7511->current_edid_segment = -1; @@ -343,6 +343,7 @@ static void adv7511_power_on(struct adv7511 *adv7511) ADV7511_INT1_DDC_ERROR); } + /* * Per spec it is allowed to pulse the HPD signal to indicate that the * EDID information has changed. Some monitors do this when they wakeup @@ -362,11 +363,15 @@ static void adv7511_power_on(struct adv7511 *adv7511) if (adv7511->type == ADV7533) adv7533_dsi_power_on(adv7511); +} +static void adv7511_power_on(struct adv7511 *adv7511) +{ + __adv7511_power_on(adv7511); adv7511->powered = true; } -static void adv7511_power_off(struct adv7511 *adv7511) +static void __adv7511_power_off(struct adv7511 *adv7511) { /* TODO: setup additional power down modes */ regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER, @@ -376,7 +381,11 @@ static void adv7511_power_off(struct adv7511 *adv7511) if (adv7511->type == ADV7533) adv7533_dsi_power_off(adv7511); +} +static void adv7511_power_off(struct adv7511 *adv7511) +{ + __adv7511_power_off(adv7511); adv7511->powered = false; } @@ -545,24 +554,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;