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=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 5A624C2BB84 for ; Mon, 7 Sep 2020 18:14:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 0D22B2078E for ; Mon, 7 Sep 2020 18:14:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Pj9tMGSo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D22B2078E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE1506E525; Mon, 7 Sep 2020 18:14:43 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48AE76E520 for ; Mon, 7 Sep 2020 18:14:42 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id a17so16624368wrn.6 for ; Mon, 07 Sep 2020 11:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=xMmocTlajCiS0vszEsHyq9NFZY0oFxHiPXZEs5xLhBU=; b=Pj9tMGSoWZzK5TXp61WgIWU4eJl3hwo/TwRpU6faHZUORa/L0vauWoHHdZUrqrFvXE msk/KtWKET7TYom7rPpX52B+HcViQiXlWZ8GjoqVnvffAob99gKBMlZc2RYh1OcUHCBa g6Xb7x3PtaysXtUsFyEDgvwSMO0htRKxnyaj4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=xMmocTlajCiS0vszEsHyq9NFZY0oFxHiPXZEs5xLhBU=; b=sn5cMXcDopQLPf5XaeBPvI3opNYuX8fvMdfEfTPoxl33IzPF1jHQDXdUv5sbpfrP5Z YKdQaZ0UxToDrOwpB1BKl+eHsN6pC44HQcteA2vTz7aTY5IGS/dFKZaWx7WgSd/rHfec Q5go54bIDRtxKgY9IeUM1GP6T2PUysDyPMXtCVBGwC52hJas5FJ+vxPspw/ox0w/wG96 B9Prcnb2f/J09KN60P7zXWUu1HTUKtJlkF31f22NlKKEi33sWnusRCo+XBqVlyfTntFa ixMvmHe23yWpRLpL0qhjHJwk8iNLcvMA30kPsAelUTza/ZIb4YDxSL6tWR5cDVVRB8FY dZ+g== X-Gm-Message-State: AOAM531ZSGYm7OT8VRazYQWPizVWQBtOacsbMnqqh3rZAB175qTwfGNa dORT9cJhNiSalESyd8d8hnGS6w== X-Google-Smtp-Source: ABdhPJy2GCGqNz6tDjmDouMiHfcsR1h/0ITf5PxQuKk0CqNUtlRwXIIAfHRn2kRbposrfH2RvOvn3A== X-Received: by 2002:adf:828e:: with SMTP id 14mr24611433wrc.217.1599502480955; Mon, 07 Sep 2020 11:14:40 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l8sm30062870wrx.22.2020.09.07.11.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 11:14:40 -0700 (PDT) Date: Mon, 7 Sep 2020 20:14:38 +0200 From: Daniel Vetter To: Ville Syrjala Message-ID: <20200907181438.GC2352366@phenom.ffwll.local> References: <20200907120026.6360-1-ville.syrjala@linux.intel.com> <20200907120026.6360-3-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200907120026.6360-3-ville.syrjala@linux.intel.com> X-Operating-System: Linux phenom 5.7.0-1-amd64 Subject: Re: [Intel-gfx] [PATCH 3/3] drm/i915: Drop the drm_atomic_helper_calc_timestamping_constants() call X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Sep 07, 2020 at 03:00:26PM +0300, Ville Syrjala wrote: > From: Ville Syrj=E4l=E4 > = > We update the timestamping constants per-crtc explicitly in > intel_crtc_update_active_timings(). Furtermore the helper will > use uapi.adjusted_mode whereas we want hw.adjusted_mode. Thus > let's drop the helper call an rely on what we already have in > intel_crtc_update_active_timings(). We can now also drop the > hw.adjusted_mode -> uapi.adjusted_mode copy hack that was added > to keep the helper from deriving the timestamping constants from > the wrong thing. > = > Signed-off-by: Ville Syrj=E4l=E4 Does this fix some CI fail? I'd kinda expect/hope for that ... Anyway looks like a good idea to not mess with the uapi state like this. Reviewed-by: Daniel Vetter > --- > drivers/gpu/drm/i915/display/intel_display.c | 7 ------- > 1 file changed, 7 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 035840ce3825..a846f414c759 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -13472,12 +13472,6 @@ intel_modeset_pipe_config(struct intel_crtc_stat= e *pipe_config) > "hw max bpp: %i, pipe bpp: %i, dithering: %i\n", > base_bpp, pipe_config->pipe_bpp, pipe_config->dither); > = > - /* > - * Make drm_calc_timestamping_constants in > - * drm_atomic_helper_update_legacy_modeset_state() happy > - */ > - pipe_config->uapi.adjusted_mode =3D pipe_config->hw.adjusted_mode; > - > return 0; > } > = > @@ -15578,7 +15572,6 @@ static void intel_atomic_commit_tail(struct intel= _atomic_state *state) > = > if (state->modeset) { > drm_atomic_helper_update_legacy_modeset_state(dev, &state->base); > - drm_atomic_helper_calc_timestamping_constants(&state->base); > = > intel_set_cdclk_pre_plane_update(state); > = > -- = > 2.26.2 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx