From patchwork Thu Apr 9 00:43:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 185290 Delivered-To: patches@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1206678ilr; Wed, 8 Apr 2020 17:43:11 -0700 (PDT) X-Received: by 2002:a17:902:20b:: with SMTP id 11mr8761431plc.209.1586392991579; Wed, 08 Apr 2020 17:43:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586392991; cv=none; d=google.com; s=arc-20160816; b=zXo98qgN3eINZj65DVebZna/i4Njd4bOdZutszQOB2Ca8ybDcv2jHcvGqdm+HptGRH 4YEhjZC3s+O1RCq7QJNutExDGG5SCe7KuFzisCumORUkDse0taLDM5r6koQrg6SR2jrt 0aIWwgsOjEHPk/FEylxp9zDkeIqgqvCZhXqcK5nL0OG1D8txYATKWiG0OvlH25YxkGYY wYAley1c/8Q/XgCgg3b/GuJOxJZw/2+t9MDMsFzAqdZ/vwJVIapV0bySCyM4sVKikvBs dBACB25Re9Y017e7aOcE772mNVCEg/eR8/D6S7MuG+ATLBSCR1KqEwndWihHlqfc2LWD vA7Q== 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; bh=VJUF1SB/P+2GwzxWVksYTgRtuu1H7WnENANWehljizI=; b=ad1ovPeUeDJLiCGtMxqAFYBO6A+yjVZlv4Jpjw1+pzPF1CIpVv6mXEdwFeom6VsRuz 6WnNXkXSvWlwiwxbmqzdjVU/W7xjOIpWqXutDFRtMc3AwVDaQLLtXdq0Z1aa/Zk16a5Q FiUBwPxYmIvBfbgHkFKKAYDW4sO2PXwMwvBMcyayVd7mFA7l2UcIfAHcvsDKZuwusI36 uZa7+/91e1DkO+T5U1pY8dWSs2jhWqcLxJvhXV1pwPXKDTaI1a8aPC4OWAHmrvR046jT 8T67mYkx5Q5xG5lvg//v5RQyYCUlheYZYgSL5bTGNVVn87Fn6V8QffKV2rWeFddpfblU xhTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Kc/5ZrJZ"; 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 i5sor1725765pjj.29.2020.04.08.17.43.11 for (Google Transport Security); Wed, 08 Apr 2020 17:43:11 -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="Kc/5ZrJZ"; 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; bh=VJUF1SB/P+2GwzxWVksYTgRtuu1H7WnENANWehljizI=; b=Kc/5ZrJZnJkC11ySxO/gJzQyEAk6OPdFPfkF5ZgjaSuNGTjG7wB+ioLu7Qvf6mKKzO 5tdTKmtw/7Z/YzkiO+vW2qRM442A9cvZP4QroD8pq5Ur8UHI0Pm57r/UYuDzAx+Xn+0P lSim0dvF+QHWkMATuiS52pgYsBOsZDI8da5GR0Kn7cRz3H4mr9eKl0DHGv8QFoYAnUPM +zgPbYzkniSuhrpKQrTfUFofwxNjO9gYoKm3QVHF+FpHuIXqlsCIMXEoSc80arSr2+ue EnBiJOJxrnjQbiXgrTm4Br9TUD9/BLP39NAq3LL2oXb7rZJc/6hLFoD2d7flTL/LnRE0 dmNw== 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=VJUF1SB/P+2GwzxWVksYTgRtuu1H7WnENANWehljizI=; b=rn0kFbtlFK7jDjv+kLrGs1d9jY8VhCWq6bOC+MaUBY5khGQEicS3nCY5m4eBWpqGI6 uwrSxxMLqGeF5QoM7hVd1T3+8Gk43BGcTJAwqviHotWglUU5/I2odC2F4LiO5sEmF7eM Z5j8QY3LYaFjCOKda2p9sLU6Wf0ousztvWyuTVO4mVy6eX+KIJaQldGuCa5bsopZGDD2 3SEZ/boubK5WNjrcIwneWHcTw3QPYdEavO3ZMaIRTDRfjEPlT8S6fhrIwCoOWSBH4Ut1 EX/q9d095H1QolD57h7ZipwrAJcis4MMZPe3crp9Qznoc5h/QA/jALaAM8UoCt7WfAFM iDRA== X-Gm-Message-State: AGi0PuaFPi1nu92GKJH/buOPNc2mgYCuVpZlTtVmN1XPFAX3fnIoBAld hs7ClcWWeJ0fN6WdA6+d0JCcmNTG X-Google-Smtp-Source: APiQypIFE2K88ws272Mk4HBlN//iOn6YSF2U0g12SuRati06xtmisiTS9XLJL76/Ccgl2aIj49TSJw== X-Received: by 2002:a17:90a:2e15:: with SMTP id q21mr8390108pjd.166.1586392991078; Wed, 08 Apr 2020 17:43:11 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id d21sm17705783pfo.49.2020.04.08.17.43.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2020 17:43:10 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Xu YiPing , Rongrong Zou , Xinliang Liu , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , Sam Ravnborg , dri-devel Subject: [PATCH] drm: kirin: Revert change to add register connect helper functions Date: Thu, 9 Apr 2020 00:43:06 +0000 Message-Id: <20200409004306.18541-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 Daniel noted[1] that commit d606dc9a6323 ("drm: kirin: Add register connect helper functions in drm init") was unnecessary and incorrect, as drm_dev_register does register connectors for us. Thus, this patch reverts the change as suggested by Daniel. [1]: https://lore.kernel.org/lkml/CAKMK7uHr5U-pPsxdQ4MpfK5v8iLjphDFug_3VTiUAf06nhS=yQ@mail.gmail.com/ Cc: Xu YiPing Cc: Rongrong Zou Cc: Xinliang Liu Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: Sam Ravnborg Cc: dri-devel 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 deletions(-) -- 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 86000127d4ee..c339e632522a 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -940,7 +940,6 @@ 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 d3145ae877d7..4349da3e2379 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -219,40 +219,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) return 0; } -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 kirin_drm_data *driver_data; @@ -279,17 +245,8 @@ 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 4d5c05a24065..dee8ec2f7f2e 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -37,7 +37,6 @@ 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;