From patchwork Thu Aug 1 03:44:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170298 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836466ile; Wed, 31 Jul 2019 20:45:17 -0700 (PDT) X-Received: by 2002:a63:184b:: with SMTP id 11mr56539029pgy.112.1564631117256; Wed, 31 Jul 2019 20:45:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631117; cv=none; d=google.com; s=arc-20160816; b=XPh6+E4UJZz8zAMmfQEckL0/G7a+a1zj5EZMWogNVfzW6i+Te9rwypATFF7hr5yXLR GdlDHD1Phpcqe2GiU/3QSF9LkKQJV8VFOcFT+YYkP/VxqBbkndGVJEfH9eY7hzEtJjSx 161Lf2fOECUVf9ZJLkh5Giv4azAiApwbbDZREYD0T1jp1A2oi7dq2I6bA+cwXc1FRarI wf4rf2KfZVU8RUXNzsvmyoMxSu8RtmuI57NjeK1hvtpg/oJz0/KmSHFjhRLasIGf/B6w z8pQx7FB3Pu1RtOhktLvCE5NUxj/rZdAYiqrzD/PHjixcM/z3Fnhl8D4q17iIE6qNbdl FuIA== 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=zuYtIfU+UT/PNXXXBYUFuMDBxtjn9glQQrqM7vGxjYE=; b=TiH6We1yOy8VAjddUvlXxuXGT0Go4TYedohvnwwAzcBVFZinTVjU35MjBWwSmk2xqc JvCUoZQU8CX2TxyunUroxpzAK82gy+C3Z5tpwrGrTBnz5xKCPyEjsX1XcIT/e0f++zVg rqZ7+1tvM9IW9TXCU6h1tvEg3YLUi40sGLOqeDjSWYxV5/+lyXJT6QQF90bXa+a0I3Tb ZSCVMB9lzRqlsetl+lh3H5p2mRPLd5q9LSAt7jSQPNKlZAD33Eu+xWHFpzHeb9CTz+Zf PkITZKfoAkTTNVgBt9rJ+71y6rK3eQB8xGSf68sTAyQWIV4O+xQKUkGRKhpiC24NF0Td BSXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a5VbWHzE; 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 o11sor85116866plk.18.2019.07.31.20.45.17 for (Google Transport Security); Wed, 31 Jul 2019 20:45:17 -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=a5VbWHzE; 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=zuYtIfU+UT/PNXXXBYUFuMDBxtjn9glQQrqM7vGxjYE=; b=a5VbWHzEBLlu3fIz+fCVmCe94QAY4LsuQSJPED6ssrg/nwTK/5Mt/n4elQQgHSmiar Oet4P6qsMMOv9o+cf6wahhatHdyJDKzPhGlfGyZa9qy9qm4g4E2RyvLb7IKMC8Ax5Cs0 FB7IrETlv2TW5rn7rxJt3xsY/T0g7K245ivpcEvRzhPvtmY7N6shhLGFQhBAWPS/PdX0 iWPQLutk2shT0xcDZUWDf4PeMGQ76Sv2gbz0zylYt4LDmeUSTgkgO+WUBe/+IJZuL3SZ c3gJKLsURrOdoIppdcUQ8XQwk9Mg1mNaK7DoJfxUxWdQdecQ9UhzKQcgRneFo5biIsye Olpw== 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=zuYtIfU+UT/PNXXXBYUFuMDBxtjn9glQQrqM7vGxjYE=; b=ZvqoUuOyBCPjszpr8+0hfhxpECGUxu5+2l34ZtQ49P+9pptszRos1PGvv3hUj5x2GX 1K+svEfb06U0rQ+eeaFB/EyQPkwVSe9uEDzcrQYuG+Mtmc6vOpSjtYbAxW9hVd50OrI7 B0lKNsCFQmUdtxwQtyb40nMvd3K/OAQpHFp7z+uJXesskPHWWy19B2yA2QZsPS3kQjbd 3pnmS7HOfxcSuutK3gyY0fTUkQ8GEoHBXQxAWEJZPsSKd4eL0eiKfFikXSMuwU24nXEq bGbWAelg3ZD4+imAPzG4uKAVYSJqXCHVtdGqnG9VjZ51mc41p+TeD4OITvyj915b3/eA f/lg== X-Gm-Message-State: APjAAAXZ9DN9Ao1KP0ijLO2KAF1P61p1XEW2s4h7wM+WiNcSEHO3Pepp YRAlTWQIQ8A4Vkw/pnYH4ZxhBretOURyzQ== X-Google-Smtp-Source: APXvYqwB4SrO/uHgu51bOWy2W68HjOxGfBkUOryPOB8eQxWuCtrE3RRTyK8dT+4vf/lBmWbGaodg1w== X-Received: by 2002:a17:902:6b02:: with SMTP id o2mr69099475plk.99.1564631116882; Wed, 31 Jul 2019 20:45:16 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.45.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:16 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v3 20/26] drm: kirin: Add register connect helper functions in drm init Date: Thu, 1 Aug 2019 03:44:33 +0000 Message-Id: <20190801034439.98227-21-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> References: <20190801034439.98227-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: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- .../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 0bc2e538913b..66434c0cce6e 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 296661ba300f..1c9658e9565e 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -97,6 +97,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; @@ -116,8 +150,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 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;