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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 AFBFDC2BB84 for ; Fri, 4 Sep 2020 15:53:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B5862074D for ; Fri, 4 Sep 2020 15:53:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2Q87IKSf"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="ctlOJyDx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B5862074D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=qcqR920qddX1dBWXW0axrBVYs/KwTvfKguwk86SINV8=; b=2Q87IKSfR8idTopdnNitiy0sV mNFQgSQFt8LPPhhvhBeT2yb4w08/y8ULlUE1FKXLzP+QDOmbyrIlsjZX5pEIt37lOZFHylDGABos/ AriYpYv3WXCPLWqNZKVblGoFPCwJUndxDHCoUsy5weRJD6Y36VrMKXVs70EJzRWtZkodhv2H54Pdk 3KrjV+pxqOHgx//+EgI1V8JJsy8042Y00SlMXbaVemVc65m1hKW3rrhp09ko3BC1QPhXzWzqzpihV M7P6Hxtt4sX5+224a/i36BQZLDRXuGwIQi4gnpUBFdRVYuORbTylFVah1/4FORWYktJviTI+L5mrD t8e8DUIcg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kEE09-0000Mb-TK; Fri, 04 Sep 2020 15:51:45 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kEE06-0000LN-43 for linux-arm-kernel@lists.infradead.org; Fri, 04 Sep 2020 15:51:43 +0000 Received: by mail-wr1-x441.google.com with SMTP id g4so7230281wrs.5 for ; Fri, 04 Sep 2020 08:51:41 -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=+mUIkf5+wSrm/eOZF7pJYOzf+3jat87UbehRU5d1CD4=; b=ctlOJyDxNnInQWTjGofcghYd8KfO8SgyHTC6gCppdxK0TvyA9HS2p/aVj9h9So7J5/ udjKiN+Q6VjQpb3vEQXFQ7uZN9LqWakT6awNFc6XlK3vzZy18iU8Lu066utYipZNZrWg Tf65wHzRBTDvSAZ7079Aepz5+qFAlMKSRKmd2xzua42SCMZQBBwDoKMldF+tx2WKlkyx VzoXt48tG+KSkEOePMS1j0xCZxw+OFBbzhsR8OhUaGKUhi4WHTNwrcfOQ6CwT/2DMU4c 02hw93ZPf0sJy49WW/hEFgcwXDnVazQefsrvwe7LpEQzU8GWov0cthRSoQTRa9GAfY5V 2YYg== 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=+mUIkf5+wSrm/eOZF7pJYOzf+3jat87UbehRU5d1CD4=; b=oNZKLgTthQaTy0EP1Ly9OgII8JE85ERLCmMlyRbmqYQoiuP4WQ6se4RjVOGR8TUdrL ExLXw3yknaunBJ6yiKG1DQhygZWrAtQdaer9EE5U4iSHiIHy5cw3w45Py3Dp/cY/Y2lf UxByme2Mj87yWUP9bdtcLnWHNEqOmtX8Q2lbxVxKHITU0wb0nxPoFAU70+0xulZVcv5Q m8QX/ito2X3gtabBnMpQQcX/Srd10Gcb0kAXFX3NlM1c/D2lqbPLVDPwHlSjRyRYdzxd emKGjhEm5mMpLytl/58VAmvdly7Uccksf4P1gT0c0TFuF9VV4FDjk/VbncGgcyWZS2VX cEYA== X-Gm-Message-State: AOAM531TWGtYKreVmhfcBG2XImJmrKLcifBaa4i8OKYo84FE/1bjSx/0 VFqcOAMOkI6WooZii0jR/A/jQVfvOJoNrxAWhSwcrw== X-Google-Smtp-Source: ABdhPJxVUA4kul9AONUXChuqM/AQenlSrCidWNt9xPtYdIgi/y8Q68ckj01B30VHM7wx5Fj4Ux2eJfyD2bMAZVV7AdQ= X-Received: by 2002:adf:ec0a:: with SMTP id x10mr7947475wrn.47.1599234700474; Fri, 04 Sep 2020 08:51:40 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dave Stevenson Date: Fri, 4 Sep 2020 16:51:25 +0100 Message-ID: Subject: Re: [PATCH v5 79/80] drm/vc4: drv: Support BCM2711 To: Maxime Ripard X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200904_115142_176331_DDCBAAFC X-CRM114-Status: GOOD ( 25.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Tim Gover , Chanwoo Choi , LKML , DRI Development , Hoegeun Kwon , Eric Anholt , bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne , Phil Elwell , linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Maxime On Thu, 3 Sep 2020 at 09:03, Maxime Ripard wrote: > > The BCM2711 has a reworked display pipeline, and the load tracker needs > some adjustment to operate properly. Let's add a compatible for BCM2711 > and disable the load tracker until properly supported. > > Tested-by: Chanwoo Choi > Tested-by: Hoegeun Kwon > Tested-by: Stefan Wahren > Signed-off-by: Maxime Ripard I'm happy with this. Potentially a case for having split it into two patches (make the load tracker optional, and then use that option for the new compatible), but I'm not convinced, so: Reviewed-by: Dave Stevenson > --- > drivers/gpu/drm/vc4/vc4_drv.c | 1 +- > drivers/gpu/drm/vc4/vc4_drv.h | 3 ++- > drivers/gpu/drm/vc4/vc4_kms.c | 44 +++++++++++++++++++++++----------- > drivers/gpu/drm/vc4/vc4_plane.c | 5 ++++- > 4 files changed, 40 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c > index 9567d1019212..f1a5fd5dab6f 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.c > +++ b/drivers/gpu/drm/vc4/vc4_drv.c > @@ -372,6 +372,7 @@ static int vc4_platform_drm_remove(struct platform_device *pdev) > } > > static const struct of_device_id vc4_of_match[] = { > + { .compatible = "brcm,bcm2711-vc5", }, > { .compatible = "brcm,bcm2835-vc4", }, > { .compatible = "brcm,cygnus-vc4", }, > {}, > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index 501a48a714d3..8c8d96b6289f 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -200,6 +200,9 @@ struct vc4_dev { > > int power_refcount; > > + /* Set to true when the load tracker is supported. */ > + bool load_tracker_available; > + > /* Set to true when the load tracker is active. */ > bool load_tracker_enabled; > > diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c > index bfc7ddd49ac5..16e233e1406e 100644 > --- a/drivers/gpu/drm/vc4/vc4_kms.c > +++ b/drivers/gpu/drm/vc4/vc4_kms.c > @@ -536,6 +536,9 @@ static int vc4_load_tracker_atomic_check(struct drm_atomic_state *state) > struct drm_plane *plane; > int i; > > + if (!vc4->load_tracker_available) > + return 0; > + > priv_state = drm_atomic_get_private_obj_state(state, > &vc4->load_tracker); > if (IS_ERR(priv_state)) > @@ -683,12 +686,18 @@ int vc4_kms_load(struct drm_device *dev) > struct vc4_dev *vc4 = to_vc4_dev(dev); > struct vc4_ctm_state *ctm_state; > struct vc4_load_tracker_state *load_state; > + bool is_vc5 = of_device_is_compatible(dev->dev->of_node, > + "brcm,bcm2711-vc5"); > int ret; > > - /* Start with the load tracker enabled. Can be disabled through the > - * debugfs load_tracker file. > - */ > - vc4->load_tracker_enabled = true; > + if (!is_vc5) { > + vc4->load_tracker_available = true; > + > + /* Start with the load tracker enabled. Can be > + * disabled through the debugfs load_tracker file. > + */ > + vc4->load_tracker_enabled = true; > + } > > sema_init(&vc4->async_modeset, 1); > > @@ -702,8 +711,14 @@ int vc4_kms_load(struct drm_device *dev) > return ret; > } > > - dev->mode_config.max_width = 2048; > - dev->mode_config.max_height = 2048; > + if (is_vc5) { > + dev->mode_config.max_width = 7680; > + dev->mode_config.max_height = 7680; > + } else { > + dev->mode_config.max_width = 2048; > + dev->mode_config.max_height = 2048; > + } > + > dev->mode_config.funcs = &vc4_mode_funcs; > dev->mode_config.preferred_depth = 24; > dev->mode_config.async_page_flip = true; > @@ -718,14 +733,17 @@ int vc4_kms_load(struct drm_device *dev) > drm_atomic_private_obj_init(dev, &vc4->ctm_manager, &ctm_state->base, > &vc4_ctm_state_funcs); > > - load_state = kzalloc(sizeof(*load_state), GFP_KERNEL); > - if (!load_state) { > - drm_atomic_private_obj_fini(&vc4->ctm_manager); > - return -ENOMEM; > - } > + if (vc4->load_tracker_available) { > + load_state = kzalloc(sizeof(*load_state), GFP_KERNEL); > + if (!load_state) { > + drm_atomic_private_obj_fini(&vc4->ctm_manager); > + return -ENOMEM; > + } > > - drm_atomic_private_obj_init(dev, &vc4->load_tracker, &load_state->base, > - &vc4_load_tracker_state_funcs); > + drm_atomic_private_obj_init(dev, &vc4->load_tracker, > + &load_state->base, > + &vc4_load_tracker_state_funcs); > + } > > drm_mode_config_reset(dev); > > diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c > index 1e38e603f83b..24d7e6db6fdd 100644 > --- a/drivers/gpu/drm/vc4/vc4_plane.c > +++ b/drivers/gpu/drm/vc4/vc4_plane.c > @@ -516,6 +516,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state) > struct vc4_plane_state *vc4_state; > struct drm_crtc_state *crtc_state; > unsigned int vscale_factor; > + struct vc4_dev *vc4; > + > + vc4 = to_vc4_dev(state->plane->dev); > + if (!vc4->load_tracker_available) > + return; > > vc4_state = to_vc4_plane_state(state); > crtc_state = drm_atomic_get_existing_crtc_state(state->state, > -- > git-series 0.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel