From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD2EFC433E5 for ; Tue, 28 Jul 2020 12:37:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B54A82074F for ; Tue, 28 Jul 2020 12:37:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="iO9VZXjU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729714AbgG1Mhk (ORCPT ); Tue, 28 Jul 2020 08:37:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729334AbgG1Mhi (ORCPT ); Tue, 28 Jul 2020 08:37:38 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D2EEC061794 for ; Tue, 28 Jul 2020 05:37:37 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id b6so18128514wrs.11 for ; Tue, 28 Jul 2020 05:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/0hxasPjkT/YyjIyd6ev9IMJ4snCTb42IQ0PCBN6d94=; b=iO9VZXjU6hvp1uQ1auh+fWeL1JrNYy54Zd0p/aR+tl4Zw+1vkVUCMGJ2EEt34v4/GK sIkwuGq/jSrCK83Sbv43vRDsgjQ9gEwwgmDRWmipeTCJGP4a3I1qxoG07O2Ocg/arG4e kvHyW09rpYG266Cs/RQCI+4WsO9xRxbtU3iIca1CNvglmjtdxC+rYaDWPjlqty6R/6LC 2z6oZ2FcwVozKFXn8wMeekl3xQ6dX71pTKDDoj/DWzvCcEv+7dOkqCcPcpqYLs4ftpAp iFF3P3BvnXcU48OmPgZaIVrjtebfsFh7J8KS1gL9mMLGzaUL0rzfCsfn8yJmnmA9Pyin Qhag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/0hxasPjkT/YyjIyd6ev9IMJ4snCTb42IQ0PCBN6d94=; b=YATltJ8IBcfts5lxlGKIui5YLxJiL987d/IJj9GCqjF31FnjIsam41i3PfRQH0bMxP yWCEuDPXpKMw9eLLX1n5v4czwlagNpv1tK2CBazDRtMGPsX+D/0orGyruk5UgcsuNa6Z iubSZRxOmx9eHZlUDPnJRXr4reR4APzjKn6K5gzICHedYQAeDg9LSq14DtjTt9/Pr+KZ C+XIAmP+Hv+9YuYw+odL3opL/VKjaawtF5mHLfkcY9mBccX1Y36oFt8yRntxmC3yF7EY kN4vnU8Fxj0slHkeFR/hIYq/9wsTEMEyjNU6whfn/evJONLgOe5hOmGyKK9DziRntlX8 n+GA== X-Gm-Message-State: AOAM530g4g8U2I49AdHW3PHkK+9Ye7LQGdsilClf2RGaMny3Pmnue/uu Hv1pN0xhHGOSIKujjTqsDAcLkigmcXoEb0LcgE72Ow== X-Google-Smtp-Source: ABdhPJz5r1LeMnmIuvcgOziDFvfrRYb+Jc5FtZPjzhagrB6X5cXvMh2ad7Kr51ppE5WkzKsKl4nb7vypV+jB19aV45Y= X-Received: by 2002:adf:fe50:: with SMTP id m16mr7426770wrs.27.1595939856030; Tue, 28 Jul 2020 05:37:36 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dave Stevenson Date: Tue, 28 Jul 2020 13:37:20 +0100 Message-ID: Subject: Re: [PATCH v4 50/78] drm/vc4: hdmi: Introduce resource init and variant To: Maxime Ripard Cc: Nicolas Saenz Julienne , Eric Anholt , DRI Development , linux-rpi-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, LKML , Tim Gover , Phil Elwell Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Maxime On Wed, 8 Jul 2020 at 18:43, Maxime Ripard wrote: > > The HDMI controllers found in the BCM2711 has a pretty different clock and > registers areas than found in the older BCM283x SoCs. > > Let's create a variant structure to store the various adjustments we'll > need later on, and a function to get the resources needed for one > particular version. > > Signed-off-by: Maxime Ripard Reviewed-by: Dave Stevenson > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 61 +++++++++++++++++++++++------------ > drivers/gpu/drm/vc4/vc4_hdmi.h | 10 ++++++- > 2 files changed, 51 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index ec7710dfd04e..ac021e07a8cb 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -1179,28 +1179,12 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = { > }; > #endif > > -static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > +static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) > { > -#ifdef CONFIG_DRM_VC4_HDMI_CEC > - struct cec_connector_info conn_info; > -#endif > - struct platform_device *pdev = to_platform_device(dev); > - struct drm_device *drm = dev_get_drvdata(master); > - struct vc4_hdmi *vc4_hdmi; > - struct drm_encoder *encoder; > - struct device_node *ddc_node; > - u32 value; > + struct platform_device *pdev = vc4_hdmi->pdev; > + struct device *dev = &pdev->dev; > int ret; > > - vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL); > - if (!vc4_hdmi) > - return -ENOMEM; > - > - dev_set_drvdata(dev, vc4_hdmi); > - encoder = &vc4_hdmi->encoder.base.base; > - vc4_hdmi->encoder.base.type = VC4_ENCODER_TYPE_HDMI0; > - vc4_hdmi->pdev = pdev; > - > vc4_hdmi->hdmicore_regs = vc4_ioremap_regs(pdev, 0); > if (IS_ERR(vc4_hdmi->hdmicore_regs)) > return PTR_ERR(vc4_hdmi->hdmicore_regs); > @@ -1212,6 +1196,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > vc4_hdmi->hdmi_regset.base = vc4_hdmi->hdmicore_regs; > vc4_hdmi->hdmi_regset.regs = hdmi_regs; > vc4_hdmi->hdmi_regset.nregs = ARRAY_SIZE(hdmi_regs); > + > vc4_hdmi->hd_regset.base = vc4_hdmi->hd_regs; > vc4_hdmi->hd_regset.regs = hd_regs; > vc4_hdmi->hd_regset.nregs = ARRAY_SIZE(hd_regs); > @@ -1223,12 +1208,44 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > DRM_ERROR("Failed to get pixel clock\n"); > return ret; > } > + > vc4_hdmi->hsm_clock = devm_clk_get(dev, "hdmi"); > if (IS_ERR(vc4_hdmi->hsm_clock)) { > DRM_ERROR("Failed to get HDMI state machine clock\n"); > return PTR_ERR(vc4_hdmi->hsm_clock); > } > > + return 0; > +} > + > +static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) > +{ > +#ifdef CONFIG_DRM_VC4_HDMI_CEC > + struct cec_connector_info conn_info; > +#endif > + const struct vc4_hdmi_variant *variant = of_device_get_match_data(dev); > + struct platform_device *pdev = to_platform_device(dev); > + struct drm_device *drm = dev_get_drvdata(master); > + struct vc4_hdmi *vc4_hdmi; > + struct drm_encoder *encoder; > + struct device_node *ddc_node; > + u32 value; > + int ret; > + > + vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL); > + if (!vc4_hdmi) > + return -ENOMEM; > + > + dev_set_drvdata(dev, vc4_hdmi); > + encoder = &vc4_hdmi->encoder.base.base; > + vc4_hdmi->encoder.base.type = VC4_ENCODER_TYPE_HDMI0; > + vc4_hdmi->pdev = pdev; > + vc4_hdmi->variant = variant; > + > + ret = variant->init_resources(vc4_hdmi); > + if (ret) > + return ret; > + > ddc_node = of_parse_phandle(dev->of_node, "ddc", 0); > if (!ddc_node) { > DRM_ERROR("Failed to find ddc node in device tree\n"); > @@ -1404,8 +1421,12 @@ static int vc4_hdmi_dev_remove(struct platform_device *pdev) > return 0; > } > > +static const struct vc4_hdmi_variant bcm2835_variant = { > + .init_resources = vc4_hdmi_init_resources, > +}; > + > static const struct of_device_id vc4_hdmi_dt_match[] = { > - { .compatible = "brcm,bcm2835-hdmi" }, > + { .compatible = "brcm,bcm2835-hdmi", .data = &bcm2835_variant }, > {} > }; > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h > index 674541493909..0eaf979fe811 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h > @@ -21,6 +21,15 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) > return container_of(encoder, struct vc4_hdmi_encoder, base.base); > } > > +struct vc4_hdmi; > + > +struct vc4_hdmi_variant { > + /* Callback to get the resources (memory region, interrupts, > + * clocks, etc) for that variant. > + */ > + int (*init_resources)(struct vc4_hdmi *vc4_hdmi); > +}; > + > /* HDMI audio information */ > struct vc4_hdmi_audio { > struct snd_soc_card card; > @@ -39,6 +48,7 @@ struct vc4_hdmi { > struct vc4_hdmi_audio audio; > > struct platform_device *pdev; > + const struct vc4_hdmi_variant *variant; > > struct vc4_hdmi_encoder encoder; > struct drm_connector connector; > -- > git-series 0.9.1