From patchwork Tue May 23 16:40:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 100379 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp405142qge; Tue, 23 May 2017 09:40:33 -0700 (PDT) X-Received: by 10.99.113.20 with SMTP id m20mr32320156pgc.120.1495557633156; Tue, 23 May 2017 09:40:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495557633; cv=none; d=google.com; s=arc-20160816; b=tfyDYikLLaXSO5lrzzUEnMpXbcBeF4tIoUmSx8o2GYLpcVZtTWITSeU87AgetMcC22 6sAU1BVqvnGW+YLtHbyKIe7Wazk73u4lWOCm9KgfFgnNfe2/sOjcNcqJkkOOJfDBF4Xy sxVfF+w5hKBJd3HNQUHE9UFpvvFv6c4df9AUSvUpoN89zSuX3z64yXs9EY5Bd9Un6OF8 0lvN3GqY+ZjsXUbMYPsSgEDO/IvhCtR4nHLFxQPsYyUpfQSXxKoXiD1ci3YqaLhtu3yO mlfv+ASICQwCXicT9EnHLGu5F33RcdbyTF1NkSwhKzoOu3YC+j3NQgFXu13Qma9KHeEU iqHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=1VFJy62rezGOJI6R3FmNxzPaHtWfWeybfqAxxebMLAE=; b=KDGGUev7i61alun9lM+EdXLY8Yl7zaGgTvOSpddDv8YW4zn5ZUwc8SyHsQmoiwvrWi GCWaP2giwj7j+hl5Na38zhIS/5z2OnnIulfDFDlKkwGjA7EWqyoAbLLY0OV9GM1cnBLu vIbKz688o94SqsyqWRREPJntJU4HtYsaF66aev7nx5oVRRWnsWlNi6pntAuhqZnh9HcX JMUzl6E9/Vy1kzcUgVP2Chg7Wxmm9aqTNjx1IddwwFaQ6EIjEuIVltMt4/TdwUQT+F6b 4/wfzmBhs/zFm4pyu5Xq/R1uEIP6lCi1g4GGKNprMykGlWEDbT8VMNhYgVlPd57qKGeR 8ZGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::233 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-pf0-x233.google.com (mail-pf0-x233.google.com. [2607:f8b0:400e:c00::233]) by mx.google.com with ESMTPS id p15si21963958pli.166.2017.05.23.09.40.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 09:40:33 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c00::233 as permitted sender) client-ip=2607:f8b0:400e:c00::233; 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::233 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-x233.google.com with SMTP id 9so119799719pfj.1 for ; Tue, 23 May 2017 09:40:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=1VFJy62rezGOJI6R3FmNxzPaHtWfWeybfqAxxebMLAE=; b=KHsUogmTNFaCebXnKD2WD9QzQTmN2rYdVZSxPq1W2CL0iYyWmRdEIF1zU6ZSrrF9O4 aHsSIOAPWp9E4LHJcSe8NCoIgLsPvt3s0up7VBW+2njdtFDnwOL3TLufj2/E3zm2tfce otJBX4Xpbt4NEvCuXv3gMkwbBtaZUkxd0TtL0= 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; bh=1VFJy62rezGOJI6R3FmNxzPaHtWfWeybfqAxxebMLAE=; b=rlHd+j8WWMMd1aycyHL0Pll0E/sZg+FD3QB40ofPyDoyaOEKoT8TQ2R3Q7UQxSVSN+ +2keBQpHKcw18OnZInx2winmVLRUn/F41hVNj2N57MhuXP2zdwVkw8okkByF3TVdIg0h PZqe8XSqpbGfKkZWQ/bL9bKudcaNW8KRZZdVnMaB5jd2aLiHv5QRmm42tTHaSIvy8P6Y mYAmL85vZYdIdPBu3r9fd9qNSz3/vKwloWp9MbmRz+tlfNnnPFCF+PK3HQQRp/MElWYO FxNBwuAeXNI8fkHwb7woYCK1KKQh3EdVyBkQHWu8YsjPXyZkTWI0oq2vR3mqiGIFIGPd BPDg== X-Gm-Message-State: AODbwcDCTZpgkuQnufEU0EioVVVT42SqD7KA+CkztKK1HqAAbvS5LPJ9 emF5ccxMjxL5LDw/Oc4= X-Received: by 10.98.158.136 with SMTP id f8mr32523373pfk.90.1495557632795; Tue, 23 May 2017 09:40:32 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id r90sm3009340pfl.82.2017.05.23.09.40.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 May 2017 09:40:31 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rob Herring , Archit Taneja , Philipp Zabel , Maxime Ripard , Sean Paul , Dave Airlie , Xinliang Liu Subject: [PATCH][REGRESSION] drm: kirin: Fix drm_of_find_panel_or_bridge conversion Date: Tue, 23 May 2017 09:40:26 -0700 Message-Id: <1495557626-25285-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 This fixes a regression introduced by ebc944613567 ("drm: convert drivers to use drm_of_find_panel_or_bridge") that was recently merged, causing HDMI output to not work. For the kirin driver, the port value should be 1 instead of 0, so this oneline patch fixes it and gets graphics working again. Cc: Rob Herring Cc: Archit Taneja Cc: Philipp Zabel Cc: Maxime Ripard Cc: Sean Paul Cc: Dave Airlie Cc: Xinliang Liu Fix-suggested-by: Rob Herring Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 5abc69c..f77dcfa 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -760,7 +760,7 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi) * Get the endpoint node. In our case, dsi has one output port1 * to which the external HDMI bridge is connected. */ - ret = drm_of_find_panel_or_bridge(np, 0, 0, NULL, &dsi->bridge); + ret = drm_of_find_panel_or_bridge(np, 1, 0, NULL, &dsi->bridge); if (ret) return ret;