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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05975ECAAA1 for ; Tue, 30 Aug 2022 15:45:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230254AbiH3Ppl (ORCPT ); Tue, 30 Aug 2022 11:45:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229688AbiH3Ppi (ORCPT ); Tue, 30 Aug 2022 11:45:38 -0400 Received: from smtp.domeneshop.no (smtp.domeneshop.no [IPv6:2a01:5b40:0:3005::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDC564BD39 for ; Tue, 30 Aug 2022 08:45:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tronnes.org ; s=ds202112; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8Ocmq31Puja4OESZlCsLhCSEzQOMmNoJhX4heKRiwq4=; b=tns5VaTmz03kuJUTzM0RUHOLB4 +ngDm3NvgS2S0bDwolvt+98eMyESiJrpMoVKNkOMRbz5xHnOiiq+0S8yotNYtN540yDjriQZa+l17 yhCd5NvwPEJWb3nfx5mYhV8QVFFBdFedj2MV4I6fNxIAq1oPk2o0msMWHU0aa4HD/Um6wC/uAmGmM D7+QEUH4yxGGZ4n3ObU7SKMy3tDgS7iP8DsbBimqI+FhGsS2AITUct9vEkRsQ0WbAEqWqqFv+BgkF ShctodeiRqxbQO8mPwlbBB6xMNkr/kKKJPRudae4kcUBrVMIHZzJEcywm7y8QiYbMlv0UhUF+nn9/ eEdWx1yA==; Received: from [2a01:799:961:d200:cca0:57ac:c55d:a485] (port=58133) by smtp.domeneshop.no with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oT3Qi-00029u-8W; Tue, 30 Aug 2022 17:45:32 +0200 Message-ID: Date: Tue, 30 Aug 2022 17:45:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH v2 27/41] drm/vc4: vec: Remove redundant atomic_mode_set To: Maxime Ripard , Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> <20220728-rpi-analog-tv-properties-v2-27-459522d653a7@cerno.tech> From: =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= In-Reply-To: <20220728-rpi-analog-tv-properties-v2-27-459522d653a7@cerno.tech> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Den 29.08.2022 15.11, skrev Maxime Ripard: > From: Mateusz Kwiatkowski > > > > Let's remove the superfluous tv_mode field, which was redundant with the > > mode field in struct drm_tv_connector_state. > > > > Signed-off-by: Mateusz Kwiatkowski > > Signed-off-by: Maxime Ripard > > > > diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c > > index 9a37c3fcc295..4d7bc7c20704 100644 > > --- a/drivers/gpu/drm/vc4/vc4_vec.c > > +++ b/drivers/gpu/drm/vc4/vc4_vec.c > > @@ -171,8 +171,6 @@ struct vc4_vec { > > > > struct clk *clock; > > > > - const struct vc4_vec_tv_mode *tv_mode; > > - > > struct debugfs_regset32 regset; > > }; > > > > @@ -316,7 +314,6 @@ static int vc4_vec_connector_init(struct drm_device *dev, struct vc4_vec *vec) > > drm_object_attach_property(&connector->base, > > dev->mode_config.legacy_tv_mode_property, > > VC4_VEC_TV_MODE_NTSC); > > - vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC]; > > > > drm_connector_attach_encoder(connector, &vec->encoder.base); > > > > @@ -360,6 +357,11 @@ static void vc4_vec_encoder_enable(struct drm_encoder *encoder, > > { > > struct drm_device *drm = encoder->dev; > > struct vc4_vec *vec = encoder_to_vc4_vec(encoder); > > + struct drm_connector *connector = &vec->connector; > > + struct drm_connector_state *conn_state = > > + drm_atomic_get_new_connector_state(state, connector); > > + const struct vc4_vec_tv_mode *tv_mode = > > + &vc4_vec_tv_modes[conn_state->tv.mode]; > > int idx, ret; > > > > if (!drm_dev_enter(drm, &idx)) > > @@ -418,15 +420,14 @@ static void vc4_vec_encoder_enable(struct drm_encoder *encoder, > > /* Mask all interrupts. */ > > VEC_WRITE(VEC_MASK0, 0); > > > > - VEC_WRITE(VEC_CONFIG0, vec->tv_mode->config0); > > - VEC_WRITE(VEC_CONFIG1, vec->tv_mode->config1); > > + VEC_WRITE(VEC_CONFIG0, tv_mode->config0); > > + VEC_WRITE(VEC_CONFIG1, tv_mode->config1); > > > > - if (vec->tv_mode->custom_freq != 0) { > > + if (tv_mode->custom_freq != 0) { > > VEC_WRITE(VEC_FREQ3_2, > > - (vec->tv_mode->custom_freq >> 16) & > > - 0xffff); > > + (tv_mode->custom_freq >> 16) & 0xffff); > > VEC_WRITE(VEC_FREQ1_0, > > - vec->tv_mode->custom_freq & 0xffff); > > + tv_mode->custom_freq & 0xffff); > Nit: This patch will be smaller if you add the tv_mode variable to the previous patch. Reviewed-by: Noralf Trønnes > } > > > > VEC_WRITE(VEC_DAC_MISC, > > @@ -442,15 +443,6 @@ static void vc4_vec_encoder_enable(struct drm_encoder *encoder, > > drm_dev_exit(idx); > > } > > > > -static void vc4_vec_encoder_atomic_mode_set(struct drm_encoder *encoder, > > - struct drm_crtc_state *crtc_state, > > - struct drm_connector_state *conn_state) > > -{ > > - struct vc4_vec *vec = encoder_to_vc4_vec(encoder); > > - > > - vec->tv_mode = &vc4_vec_tv_modes[conn_state->tv.mode]; > > -} > > - > > static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder, > > struct drm_crtc_state *crtc_state, > > struct drm_connector_state *conn_state) > > @@ -470,7 +462,6 @@ static const struct drm_encoder_helper_funcs vc4_vec_encoder_helper_funcs = { > > .atomic_check = vc4_vec_encoder_atomic_check, > > .atomic_disable = vc4_vec_encoder_disable, > > .atomic_enable = vc4_vec_encoder_enable, > > - .atomic_mode_set = vc4_vec_encoder_atomic_mode_set, > > }; > > > > static int vc4_vec_late_register(struct drm_encoder *encoder) > > >