From patchwork Tue Apr 23 23:20:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162756 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354924jan; Tue, 23 Apr 2019 16:21:28 -0700 (PDT) X-Received: by 2002:a63:ff0f:: with SMTP id k15mr26715279pgi.407.1556061688081; Tue, 23 Apr 2019 16:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061688; cv=none; d=google.com; s=arc-20160816; b=sM9NQq72WIwx6eepmXtjUHeFknrhabY98uzTN4jO7t3qjZsmy8u65oSPC97Eobo1nb tQN7nx0s170oH2p8dVcYWyvWJOr8koWdSe5YE81vv1Irzkb9XqksUpVjVENxmKSBva70 hTY/H6vVRtMd47q3c4IEDXBhlKTqA22AnmZdkdoLs8ybE8NaFZ30su6v4kFsicG/KmtU i//YlOIinCUNiZWL6Me7kB+3DzmG+Fov+4ublDOXZyR+1dtBBQcMgcgw2659nFAvWwg1 l6VsXF7dHy8m9EVaHd+S8Hzwzx81CjQrR9h7bkrTOqdXKaS2nkDfR76joHXTm6sfkIaw 9Llw== 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=LzxumMzcEtq/SNQTqskpd8l6h66SMPqIvO/SUnJJpKM=; b=RQlV0Zp/eW6PJqjTHOvqRB+DhQJ7ImSFH0yUqUPr5gM53Ra+iCF2Jg9LrMOyv7+Z3m mFB3jRn0bu7YzLWCXalJtbuY/kIVawL3r4fz3w7JIl1A2QJIezVpjVs1hLEyqHVmxinw nRaZ5nNyk8rTN03cclQA6neB7JhE8EEmFSd0rr32IPPDoyi5oLBsJxZk3epTG+oXqge4 Zhhz3qbL/bPDK357iJAj6shiNQ/GPjcB7LlWy7OAwaFwy/WuPTf1+7RwqpREbrxRicfm K7aovcuDVDMfDPlINSGmKXfqWUBa7bNwmWyd62lg791hw80+EKq6zrfImgrkYKXdJnyU vvzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K7nqhQ4o; 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 z18sor15164942plo.58.2019.04.23.16.21.28 for (Google Transport Security); Tue, 23 Apr 2019 16:21:28 -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=K7nqhQ4o; 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=LzxumMzcEtq/SNQTqskpd8l6h66SMPqIvO/SUnJJpKM=; b=K7nqhQ4oUzp+oLLua5HKg230xAqYILqx/7xXmGUjCnyj9D5AAhdGD+GNp3T8DMLrzl ph04wV1JpRAB90Sbx4IYwihZte0cxfMdYvm9Fisf8m/gOj92AuoBWwzExFK+5os+EUfk p3NXmrbKmHB5VMw6K6aAALPCKQjV4jvoyRGw0l/Tu1sujuXX3UeHto5WaeKkrQ/dbR6I aUuqqVWvIlTUKuONfHdYSFKflXOtOUYxkoJXY2vNpMiZVPSoLKHZajYF5AciTpQuNXmK Zps1LUzTEICkOweLOfLhBidUtU0IsK0kjPaH3ath5NrX6sGAmsAJG/ptOpFWrZi50I08 0mqw== 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=LzxumMzcEtq/SNQTqskpd8l6h66SMPqIvO/SUnJJpKM=; b=pMhhVHXVxSKk1kscaldgJAL/mEbIaEqPRBD+pZyTxz9/yxX57PNog52WhMK9u6+sF8 /zzvfiF2WA55WhGlCuN3nkYezg4LSJgKjQ3IN7AXF3pAjtA0WxvOOqWRLcjJ9jKeiV4W 4h8PtUvYF+yc+yrZASQY7x/TUFxKGiYiZQTSl49jvvRmna+SvzlfF+2bOWslU6IPJ7lK yAEhyyUTC2iswi5S+SYAVwXdvnfYcf5AXilyqxSrZATposA31i7wO7Y/eAeAXtsJc7Bd tAteo714/9/NklMEzTgaYTjz+QeSoJvsikMzVGiIWs54VxhOiD81g3e2F84VZOYVorVv +hJQ== X-Gm-Message-State: APjAAAWLRRhJo1ot+NsgFfS4anfrNIdfZJwzpDeBYRmMfMC3UJK1mBwZ 7qEH/0iFDLUTV77T7QxWF0uPLHIT X-Google-Smtp-Source: APXvYqzCahw17URM7uPDNgnjEJPFq7bbhmKrHgotw8tL24qZ6Ookm3NHOl1b3VFuO++uU1km6VLpmg== X-Received: by 2002:a17:902:7085:: with SMTP id z5mr18996294plk.78.1556061687689; Tue, 23 Apr 2019 16:21:27 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:26 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 19/25] drm: kirin: Add register connect helper functions in drm init Date: Tue, 23 Apr 2019 16:20:50 -0700 Message-Id: <1556061656-1733-20-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-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: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 +++++++++++++++++++++++++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 + 3 files changed, 45 insertions(+) -- 2.7.4 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index bdd1b00..fcc01c2 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -1076,6 +1076,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 c987b4e..5ee90d7 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -99,6 +99,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; @@ -118,8 +152,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 == true) { + 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 61fb0da..8818ccf 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -43,6 +43,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;