From patchwork Thu Aug 1 03:44:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170302 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836614ile; Wed, 31 Jul 2019 20:45:24 -0700 (PDT) X-Received: by 2002:aa7:8383:: with SMTP id u3mr51044082pfm.175.1564631124885; Wed, 31 Jul 2019 20:45:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631124; cv=none; d=google.com; s=arc-20160816; b=eIhKeBQV+AMSV51j7FFnZfd1k0CHPCCnk6Qf3/LLmyH3aCNwPX6BEbuNm7qIYX5iL6 XBVYLtHO/aV6fTIIG4AmRGMlmqGaXJCQFs0tizp07+GX1Ox9zSe53P2gqL4vjW2zk4mg xV/56bZx9s8U5w9uNNPELHTCc3wZ7H4WyTDzOz7AlDuCm/uDsHuiQWlkCajd71Ou4sjq 4r64jIwZxpc7NhXIob9UtSPslOnZZe29dpf4j9dR996lN5c+MUErII9gKDU1lTnv4QQa NsaXF8+YCDyZSwRfZIG3UXkqAuHhtCcamZUv8raoeMKJ76yl0flx89O8Jq+VVz4jDYeK E+YQ== 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=gE/41V3p8E7KtwwzgftBMLTA6SAC75G2Kpa5UKCO8Qo=; b=m9RtA0tRy/dVjiAAgqvNelZ4Yc3CyokgCE4iS8dI6l13WJKkoAfiXf5nIDsdncvlqx yRVcwOUGqXckiVh84oLzIzzen6R7OLV9cmeR5jTbuFlS+rkSSlJmHv7q81MDd21TFd8S zs1geqr5bxDveizKRZ5kOWJ9y367Y1qw6NzPjcOTh5SOOOS1NgVggH1r+H+qbR9gFI6v uvAtaUuwEbCTC16Ja07UaEc3QlG5/qf+JfElefedq6rnLuLu31ydcvj8pCffowRb0RCG UDPeMWbovNPGtShrHC5+4cmzlFx09hbPsJPv6kBkbiPFFijCMbgXzaYYU/oNyZLbto+V 0smQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C5j8hBfr; 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 l6sor21672992pgt.33.2019.07.31.20.45.24 for (Google Transport Security); Wed, 31 Jul 2019 20:45:24 -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=C5j8hBfr; 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=gE/41V3p8E7KtwwzgftBMLTA6SAC75G2Kpa5UKCO8Qo=; b=C5j8hBfr3aQsA/OwNaVL8RCHkNAn9o85zTFnFGuituGatDhp15FNjaHXBlQlTMU6rz R9Ueq+9X6/0S14B9yYKbMcun3w2oWE/LS2TLZtVeagOiBxnh6zj4VD9+wgFm8U/37cqw FsiOGw/k9+82qWFd/6b3+1sKJwJmKS4rmnrGjNbWYe/U+gCgkMNLxgOdd0CFCrmaOV43 0K5yQZTMiRJy7XWuING4I+3VjkycyWBXP3G9qfOOFokyx0en29yAN4ha6CvcK7Fe3d0k PuqkPSdckPrm32/FuFGSFPpayCgH1l5vV3xwmBy4dlS/yIVPUbWbBRiOLkgguX/cQqYm g3FQ== 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=gE/41V3p8E7KtwwzgftBMLTA6SAC75G2Kpa5UKCO8Qo=; b=Nf5KnshG+IMFZUffcK+dhMKG+8G8T/BoFaT7Zmg738AmpOFSy6+q7tiVJNRRCtWWUc afEplpIRD3vUJZz1RULRuBgAsENQsS6LEPIT0ueHpBe7TpDNlqHDhHDJHECWiYrY3QE0 InCEZ1ilYdwWS9v0CbukP/YFFaD1hT1LuHQd7mFxQhsKd5Gb6cqn6gN0BtJ0J0s3y4oF 38Nigvz4RBdz7K3f958MCmiHxGbJ51ig44MIvV4pYHgFkyYDEsn3o8TNpfz1ApCc6vDi 8byt7SV1tMCwi0YGQizQR3vn3V5Kp9/L+RTSXIqtZEq1hj4JLSme/+wOE4tzsr91jHJ6 u7oQ== X-Gm-Message-State: APjAAAWhwDfvQae9hKoaewV5Cl3RD802RXad2Wxv2vf1nHM0cHrogoEF ETElLbZ+P5JiyzhB+Qe0z2k8d7Hp X-Google-Smtp-Source: APXvYqwT1VFMzc9tchbe9OkpDTvnzfmXSm4NMZYpWM+g4G4Q0+yWy9eVQ91PrnNFB3Ofujh71vMk+Q== X-Received: by 2002:a63:5c7:: with SMTP id 190mr114583297pgf.67.1564631124394; Wed, 31 Jul 2019 20:45:24 -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.22 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:23 -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 25/26] drm: kirin: Pass driver data to crtc init and plane init Date: Thu, 1 Aug 2019 03:44:38 +0000 Message-Id: <20190801034439.98227-26-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 changes the code via a passed in driver_data pointer, rather than hardcoding them via ade_driver_data variable. This will allow those funcitons to be later moved to the generic kirin_drm_drv.c using alternative driver_data structures that support other hardware. 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 --- v2: Whitespace fixups, commit message tweaks suggested by Sam. --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 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 f729a1de6e14..ab0c5d03903d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -572,7 +572,8 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { }; static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *plane) + struct drm_plane *plane, + const struct kirin_drm_data *driver_data) { struct device_node *port; int ret; @@ -589,13 +590,13 @@ static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->port = port; ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, - ade_driver_data.crtc_funcs, NULL); + driver_data->crtc_funcs, NULL); if (ret) { DRM_ERROR("failed to init crtc.\n"); return ret; } - drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs); + drm_crtc_helper_add(crtc, driver_data->crtc_helper_funcs); return 0; } @@ -894,21 +895,22 @@ static struct drm_plane_funcs ade_plane_funcs = { static int kirin_drm_plane_init(struct drm_device *dev, struct kirin_plane *kplane, - enum drm_plane_type type) + enum drm_plane_type type, + const struct kirin_drm_data *driver_data) { int ret = 0; ret = drm_universal_plane_init(dev, &kplane->base, 1, - ade_driver_data.plane_funcs, - ade_driver_data.channel_formats, - ade_driver_data.channel_formats_cnt, - NULL, type, NULL); + driver_data->plane_funcs, + driver_data->channel_formats, + driver_data->channel_formats_cnt, + NULL, type, NULL); if (ret) { DRM_ERROR("fail to init plane, ch=%d\n", kplane->ch); return ret; } - drm_plane_helper_add(&kplane->base, ade_driver_data.plane_helper_funcs); + drm_plane_helper_add(&kplane->base, driver_data->plane_helper_funcs); return 0; } @@ -1024,14 +1026,15 @@ static int ade_drm_init(struct platform_device *pdev) else type = DRM_PLANE_TYPE_OVERLAY; - ret = kirin_drm_plane_init(dev, kplane, type); + ret = kirin_drm_plane_init(dev, kplane, type, &ade_driver_data); if (ret) return ret; } /* crtc init */ ret = kirin_drm_crtc_init(dev, &kcrtc->base, - &ade->planes[ade_driver_data.prim_plane].base); + &ade->planes[ade_driver_data.prim_plane].base, + &ade_driver_data); if (ret) return ret;