From patchwork Mon Aug 19 23:03:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171750 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3596289ily; Mon, 19 Aug 2019 16:03:59 -0700 (PDT) X-Received: by 2002:a17:902:d88e:: with SMTP id b14mr3026935plz.244.1566255839665; Mon, 19 Aug 2019 16:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566255839; cv=none; d=google.com; s=arc-20160816; b=qJLZ+cSzBGi8mCPnoxa3xqDXWw2lBvTPUdtbRxalea+wn0CPrvhpq+HUSwI6CUPUjt d+0qVLIZgPoJaMZw9JwSNWE0l1Zx6o9RO+/THCyVST4lDPdv3iLAV9y2EXvFI2Zywssf 3JTGYUZA3h7Jjp06qjPaS0MddmEWyJh3YS3hE+GUY+1jIvw2II9wRgk+cRHBPY/sH/35 Jh9DpbNAgDWAWimkMLVfLSycYpuBej4UXwAPwZZf+VdEnzJCysoaN2Zz3fDo5LghAdPR mTSk4pthw0G45MuCGxdpzBHBM/f054yPvySNvGr7D7X10zzPknrLD4dGAiO8xvvRoDV2 +eLg== 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=iSQb8FgaCNaXcBii2QVIuOGP6f5h31ib3HlDrpYCUmw=; b=cBsbj2k57RRUIyB9lqgD8n3ayQSVSwlyFFEoroJWbY3C9Kufv7SATVpZDQAUl/abRo s0Pt4nMTxAzzXO4cf0pPN7FA6MhRUmR+iSsv4qnZtrOgrB27Eg7OQUAo6McIjb1HicuW Xs9HUOTzntC39l30s7Y4fAwcSId5wO/C4rAPMPt3NHiX2wfqw15Ek653RjPTtfIptfdS DoloeDVOWP0NgWAhjAof1dYxyJsByJLzbHmZi4oFImIfvn0jqCzlrgKYbhdSx7oKjjGH 7I4CKWlLMfInjb13WCw32heFsLl9kxwliniKZGa5hotUcmYVVtuUVlXLsO0LrBkkRUHa H3bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QrkgArX0; 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 b1sor1777846pgr.86.2019.08.19.16.03.59 for (Google Transport Security); Mon, 19 Aug 2019 16:03: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=QrkgArX0; 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=iSQb8FgaCNaXcBii2QVIuOGP6f5h31ib3HlDrpYCUmw=; b=QrkgArX0B3Kj0xDaromy4qzCPe+ESlH2vc6lYT0aQG/b5Ry0WwjZjdbsZ+2UZG2x+K 6y5q7KG4OqXaWU1fzhH3MC1bC4X7EXx9k4+4mg/KUqSCNUTajD7+ZwpcNxAdMgemgQG6 HrZbhzgqJB0FXQnl3fgaYls9yl6fklO2aJeoMQw0Tb3DHoY7kIpqffUNL9lb8+RCYFqI KeGpBenrN2lyhF1tm7gOgiQiX5gZhfBXmgs6VhkwFK8JsSIdbxyAMuk79k2xQs0KAnsU 2zH6Be8BqnNrPIhjfkK1rzSCdno/V0Snr8CURxDs/TjYeRL4h1JFn9KIsikc3nCB8HFo CIAw== 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=iSQb8FgaCNaXcBii2QVIuOGP6f5h31ib3HlDrpYCUmw=; b=d0Quqny7/EyVVHdhhGV1+YDLvlDe/xpQYAmyicmoVWu7HP87Yruw3du9I9GBH+MjDr jIMcZuOBO9eqXaWzxn5t1BPkWMB/G6ze00L6M/nO20vJ1jzV+ZPwmtT4G/GXMwoXEotN bKUWFBiu6L55U7SY9n8HnIVB82B+ntXXFdHFv+N2fOQq6zC4URsvN9HMa9b/RSQLulaj 9uH8RjT8cCc23sXSkjWLpp1NMlpH0r8h+E1ZO2LYNWOD1cAQyfAdVY7yUJeqUpwx6K/2 OmlrXTF4xKfyXCng+at2IIZPGAjYB2TrgLtblbbt+pfRQHbf1+QlMiR4vZPmihnL+AEu tfDA== X-Gm-Message-State: APjAAAU7BnrSqI0JiMmVIoxs/nZhedexRsjJTRJvhCRUksdWeBTZUV07 J+fRlZ8YARy30pJZX3bSkLg+bMeDLih5HQ== X-Google-Smtp-Source: APXvYqz0V0XOXIPeAq3o2S1YQkSrU0pipkFmKcruZgN4S03QshB4Zhd+fABk5Xoj6Ks7kaSVwW7BpA== X-Received: by 2002:a63:505a:: with SMTP id q26mr21501966pgl.18.1566255839103; Mon, 19 Aug 2019 16:03:59 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id j15sm17256509pfr.146.2019.08.19.16.03.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:03: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 v4 22/25] drm: kirin: Make driver_data variable non-global Date: Mon, 19 Aug 2019 23:03:18 +0000 Message-Id: <20190819230321.56480-23-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> References: <20190819230321.56480-1-john.stultz@linaro.org> From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch changes the driver_data value to not be a global variable. Instead the driver_data value is accessed via the of_device_get_match_data() when needed. 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 --- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) -- 2.17.1 diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 55c8dbb68be0..84215f9dc985 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -29,18 +29,9 @@ #include "kirin_drm_drv.h" -static struct kirin_drm_data *driver_data; -static int kirin_drm_kms_cleanup(struct drm_device *dev) -{ - drm_kms_helper_poll_fini(dev); - driver_data->cleanup(to_platform_device(dev->dev)); - drm_mode_config_cleanup(dev); - - return 0; -} - -static int kirin_drm_kms_init(struct drm_device *dev) +static int kirin_drm_kms_init(struct drm_device *dev, + const struct kirin_drm_data *driver_data) { int ret; @@ -96,6 +87,21 @@ static int compare_of(struct device *dev, void *data) return dev->of_node == data; } +static int kirin_drm_kms_cleanup(struct drm_device *dev) +{ + const struct kirin_drm_data *driver_data; + + drm_kms_helper_poll_fini(dev); + + driver_data = of_device_get_match_data(dev->dev); + if (driver_data->cleanup) + driver_data->cleanup(to_platform_device(dev->dev)); + + drm_mode_config_cleanup(dev); + + return 0; +} + static int kirin_drm_connectors_register(struct drm_device *dev) { struct drm_connector *connector; @@ -132,15 +138,21 @@ static int kirin_drm_connectors_register(struct drm_device *dev) static int kirin_drm_bind(struct device *dev) { + struct kirin_drm_data *driver_data; struct drm_device *drm_dev; int ret; + driver_data = (struct kirin_drm_data *)of_device_get_match_data(dev); + if (driver_data == NULL) + return -EINVAL; + drm_dev = drm_dev_alloc(driver_data->driver, dev); if (IS_ERR(drm_dev)) return PTR_ERR(drm_dev); dev_set_drvdata(dev, drm_dev); - ret = kirin_drm_kms_init(drm_dev); + /* display controller init */ + ret = kirin_drm_kms_init(drm_dev, driver_data); if (ret) goto err_drm_dev_put; @@ -190,12 +202,6 @@ static int kirin_drm_platform_probe(struct platform_device *pdev) struct component_match *match = NULL; struct device_node *remote; - driver_data = (struct kirin_drm_data *)of_device_get_match_data(dev); - if (!driver_data) { - DRM_ERROR("failed to get dt id data\n"); - return -EINVAL; - } - remote = of_graph_get_remote_node(np, 0, 0); if (!remote) return -ENODEV; @@ -209,7 +215,6 @@ static int kirin_drm_platform_probe(struct platform_device *pdev) static int kirin_drm_platform_remove(struct platform_device *pdev) { component_master_del(&pdev->dev, &kirin_drm_ops); - driver_data = NULL; return 0; }