From patchwork Tue May 12 13:29:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6388291 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2E329BEEE1 for ; Tue, 12 May 2015 13:27:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F69B2041D for ; Tue, 12 May 2015 13:27:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 57F42203E1 for ; Tue, 12 May 2015 13:27:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 47F5A6E600; Tue, 12 May 2015 06:27:21 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id E2DA16E600 for ; Tue, 12 May 2015 06:27:19 -0700 (PDT) Received: by widdi4 with SMTP id di4so15503188wid.0 for ; Tue, 12 May 2015 06:27:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=KWZ8ZpttPI64p6g9KLB/RU6zGYOLNcHP9E8x5SqDhLI=; b=Tp7RBUYwiEBO+fTq2xs2RzCIlMKmcz91l4O2IHMtxxYdH56D8ugeHrVHBNjE/a3yiC kN0WvhmJY/OTCBW7ms6O3VZsbsXOSUEi2IwZRB5s5viztvkoZPQ9j/8G2eOmJ3Ojudbc +eCh36A6Euhd0NT+Lwg0CF8JqNWHJwgHDRzts= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KWZ8ZpttPI64p6g9KLB/RU6zGYOLNcHP9E8x5SqDhLI=; b=HUjeGUwRPz25i2CmAEuM3lpZXV2Ui7z+1TOrYQzEft0hmhZDo0iaDqe8vPBQRe7Cwr FVhK1UXJqC9W/FBmS7AJReOpuQrKssuvBgovvSDmeU5RJ2EoqtvSN9s2djyp4egkZNj/ 7oBCyMEjI7xEN6ymr51jZC+Q54BcSXgDli05cIXXi21bTOi+iX/MdgyrSAomUYYIk4MV npnrjd1sRGrbFqNRH7NdHFx8mol8EBgNWybn5LaMDSuvSajK2tOeqVvXOjf1YA68Dtzx SNOZYVdVgtra0M1f4K1i1sT4lKVDJdf1BVWxOcZButcWOLf08hyI4xYMLNS7y7EzgasK IOwg== X-Gm-Message-State: ALoCoQn+sDcwSkA5NVJffQ7C9qSrXURTkj5HZXYQuA40HycPfXxQ1tOTTgjWSz8DsboNHqYhlxyY X-Received: by 10.180.88.8 with SMTP id bc8mr5168157wib.19.1431437238938; Tue, 12 May 2015 06:27:18 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id ch2sm2878247wib.18.2015.05.12.06.27.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 May 2015 06:27:18 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 12 May 2015 15:29:34 +0200 Message-Id: <1431437375-17180-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 1/2] drm/atomic-helpers: Update vblank timestamping constants X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The atomic helpers don't call drm_calc_timestamping_constants, which is a regression compared to the crtc helpers. Fix this. Noticed while reviewing i915 atomic patches from Maarten. Cc: Maarten Lankhorst Signed-off-by: Daniel Vetter --- drivers/gpu/drm/drm_atomic_helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 5d30592c83cd..181bbc1ef1b9 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -657,6 +657,8 @@ set_routing_links(struct drm_device *dev, struct drm_atomic_state *old_state) crtc->enabled = crtc->state->enable; crtc->x = crtc->primary->state->src_x >> 16; crtc->y = crtc->primary->state->src_y >> 16; + + drm_calc_timestamping_constants(crtc, &crtc->state->adjusted_mode); } }