From patchwork Tue Aug 20 23:06:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171877 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp180399ily; Tue, 20 Aug 2019 16:06:59 -0700 (PDT) X-Received: by 2002:aa7:83c7:: with SMTP id j7mr33470537pfn.59.1566342419222; Tue, 20 Aug 2019 16:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342419; cv=none; d=google.com; s=arc-20160816; b=jfvY2+3QHeMZa18eSZn5VFvLz+gTbD7J8ynfacueb05M4bSOG0sJpmu5FKlB3CdsSh FW9SginldcIuxMX83nCkgr37JiZL3GSweRpYXX7KZ7OfIsubR6wn9qGrps/HCyWuVgIw E2OEt5yr5bwktXhTmKj+HeZW+W9sBYd8EjjISRPaUxiMKRSI+RQNpCcgg7M+j7h3wa2v 0gc2l7zOX+fuvkg5hMOGfjJaCmXVJdDCP8MFDnYaBllvaKPVjkVdpoKpMl1YftSm7Rqb IOCAuQfV9nK6TvT5ANmaVotYSlGdhK881vcquNYLZDhQmsyJ7S9PwxDwj7L0OpL6kQok NJ8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=snb+417mkIMijis5gqdevRgXi5CVEc/HJIJZWNwpKg4=; b=AR0cJYd+nqQT6K67IWerMxBE5xhDRh4Ce3cE09ouupywJfzKjY10/+GltfiraSUFzr zBd9TnJs83y/f5nqFupumXgpKGqm0C5Ygb29OaJ2PWA8bUgFPQJq01E6zXAUzemLZMPJ zYK3Ij+89PqgXfuPYSWMZfIMTtjWiz7pVtIdqgYtX5JqZF+CGce15QzITgbF3Z3fSX1C jjwZHZTJm/ahoTj23Nxdj5R55XFaHpSzpkuydcUJtnt+4A9y379Bxqp+nuk/LltMrEbp 3YQh0uk5CuDzk5oWpWJwPlQBRuPoB11WI7KCkMGOxFjJjAYTDo4Kiv8gPpp7uhAtSo8E cemQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ckmC6bHO; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 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-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j65sor4538492pgc.28.2019.08.20.16.06.59 for (Google Transport Security); Tue, 20 Aug 2019 16:06:59 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ckmC6bHO; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=snb+417mkIMijis5gqdevRgXi5CVEc/HJIJZWNwpKg4=; b=ckmC6bHO8Kbn1CHlkCqw7uMa48JTuuzH2nyUAHB1uDRaO0HUittmeTKLjRL0mTNEcy lubKDnkDdpPxOQ/Ua9bx/0M77HH0xP0TbZxIGkOdUgKpk3/2VC3U/RlG9jrdMLe3HBPL /ufFGRVWEQb41zCT1YnIk41YzfHkCnZ5leAuMjMdjHxzeMAebw6HwxJ49mvpod07sywX t7UIxQDlrlNuS/DVY7IjsbG19IzhsJ+dwbzFx41/yrW9F3sOpS9pbHFo5q7ONbgurGj4 z56oCcreOzy1X0wR/2dZ2ERY0AfVh28rQRfwSsv4IHENeCN7W7hq7UAYt+z50QjE7sEp cLwQ== 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=snb+417mkIMijis5gqdevRgXi5CVEc/HJIJZWNwpKg4=; b=rB+OhwfJgjZR+rjZ82vApMY94gRo7zpRoKJNcN2m9C+ptesKlsT+C2sm/CaDsGnl0q DDf6w2+OVW8PFpoEvewOENImOQpS0pacsf3XChGOKYv53Q19z+aqT0kx6WP/Xv094Tlv 0q4lEPlVUCguMlqmGYfAMyzBGHwTiVmWQKiPqQpDZ+T3sj/Af5pJ7oA9eqvXq0P7bTbn wGY4B2Ffrs9+TKtDHMgaV0TkKaFAuHxABxJCO5zRvP+n1AOwDZsMYxoyjVhpIrzMj/6r zDsN21XBClF1FwlnWrGD6RC2LNSn1ej6aVzxB38FIy92MYRlPcA0w9UjdjnFHlnOZKWP mpBw== X-Gm-Message-State: APjAAAUo9ZVLsJotZhCLwckRobAgsXMmfgvLsk8+IEqI0YoUAbT36hmE ZJN7x30jxE6ZZwaEMVUXutIhhoU7 X-Google-Smtp-Source: APXvYqwY4EfPryJEWWvkuEZzRawoYOjYmi1jU1CLX9i5qMq4MfYDgepzGUiPR7bgjFNv9hEGkySf8A== X-Received: by 2002:a63:3006:: with SMTP id w6mr27037577pgw.440.1566342418741; Tue, 20 Aug 2019 16:06:58 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q4sm27564747pff.183.2019.08.20.16.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 16:06:58 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v5 19/25] drm: kirin: Add register connect helper functions in drm init Date: Tue, 20 Aug 2019 23:06:20 +0000 Message-Id: <20190820230626.23253-20-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820230626.23253-1-john.stultz@linaro.org> References: <20190820230626.23253-1-john.stultz@linaro.org> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch adds a flag to the device specific driver data so that we can conditionally register the connectors at init. Cc: Rongrong Zou Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Acked-by: Xinliang Liu Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- v5: checkpatch --strict whitespace fixups noticed by Sam --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 +++++++++++++++++++ .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 + 3 files changed, 45 insertions(+) -- 2.17.1 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 21c5d457a97d..89bdc0388138 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -1073,6 +1073,7 @@ static struct drm_driver ade_driver = { }; struct kirin_drm_data ade_driver_data = { + .register_connects = false, .num_planes = ADE_CH_NUM, .prim_plane = ADE_CH1, .channel_formats = channel_formats, diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index c9faaa848cc6..68de8838da3c 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -98,6 +98,40 @@ static int compare_of(struct device *dev, void *data) return dev->of_node == data; } +static int kirin_drm_connectors_register(struct drm_device *dev) +{ + struct drm_connector *connector; + struct drm_connector *failed_connector; + struct drm_connector_list_iter conn_iter; + int ret; + + mutex_lock(&dev->mode_config.mutex); + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + ret = drm_connector_register(connector); + if (ret) { + failed_connector = connector; + goto err; + } + } + drm_connector_list_iter_end(&conn_iter); + mutex_unlock(&dev->mode_config.mutex); + + return 0; + +err: + drm_connector_list_iter_begin(dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (failed_connector == connector) + break; + drm_connector_unregister(connector); + } + drm_connector_list_iter_end(&conn_iter); + mutex_unlock(&dev->mode_config.mutex); + + return ret; +} + static int kirin_drm_bind(struct device *dev) { struct drm_device *drm_dev; @@ -117,8 +151,17 @@ static int kirin_drm_bind(struct device *dev) drm_fbdev_generic_setup(drm_dev, 32); + /* connectors should be registered after drm device register */ + if (driver_data->register_connects) { + ret = kirin_drm_connectors_register(drm_dev); + if (ret) + goto err_drm_dev_unregister; + } + return 0; +err_drm_dev_unregister: + drm_dev_unregister(drm_dev); err_kms_cleanup: kirin_drm_kms_cleanup(drm_dev); err_drm_dev_put: diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index fdbfc4a90f22..95f56c9960d5 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -39,6 +39,7 @@ struct kirin_drm_data { u32 channel_formats_cnt; int config_max_width; int config_max_height; + bool register_connects; u32 num_planes; u32 prim_plane;