From patchwork Sat Mar 22 14:37:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3877631 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D92EF9F334 for ; Sat, 22 Mar 2014 14:37:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24C7A20295 for ; Sat, 22 Mar 2014 14:37:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 00B2F2026C for ; Sat, 22 Mar 2014 14:37:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F3816E545; Sat, 22 Mar 2014 07:37:19 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by gabe.freedesktop.org (Postfix) with ESMTP id F1A8F6E545 for ; Sat, 22 Mar 2014 07:37:17 -0700 (PDT) Received: by mail-ee0-f42.google.com with SMTP id d17so2772682eek.15 for ; Sat, 22 Mar 2014 07:37:16 -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=WyRwfdive6ZlDWAwLIaJrj74AzLKotKGRCWsen0Ipuw=; b=auYWWg3z7NbWMkNLezyoBpilbW/g9Gk6zCy8mrqP1HiEnWH66/lQOblR8ux3D5FDoZ 0ajZMhKygY57YNlGXMCoX00rrolS3MxC24NYIw0jpFZT+N6SsCD5QVOEKb1llWE+N9Ou xSddgwfLxPkbgDgcrKX/ba02JZ6Vzmb830xhA= 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=WyRwfdive6ZlDWAwLIaJrj74AzLKotKGRCWsen0Ipuw=; b=gzNgtc+CZkNT73weVleFmnifNTK+iZAxrWubiYLchaOYipQUv4evCAAcEjeJMzu/8h 62Ej+GCj/axiUYMTB93GUlgJIAT8Un9EV2I+SHks3NnyYycUk7jdKrUx9XyU1m1QOUSh Bv9T4/Usxe8RjJ9NAJfoZ+kOKryOVYdk2uTgQ+goK/8JhfVkGNG8Wvd362SZOy92xQaL V89IveL8RckTmjDOEbyNu3G5Tyj67YVAAczI3g/G3UmDYBlMSyrnnIbg3PzhGD8LFwMj DgIoOQvoJMCYS99TOkNJnjQ0IeXABHbzYKmD+2ink7I//2+i+SXltDrppC4ZmthT8YdA HJpg== X-Gm-Message-State: ALoCoQlkinfsU66EKMgP+nO+QNBqZg8BH9Hsxms0SQjtnOdrnRYKbq40JnKV+6aRcg+wXMFuicOB X-Received: by 10.14.251.204 with SMTP id b52mr31544946ees.36.1395499035875; Sat, 22 Mar 2014 07:37:15 -0700 (PDT) Received: from phenom.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id m8sm19347761eeg.11.2014.03.22.07.37.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 22 Mar 2014 07:37:15 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Sat, 22 Mar 2014 15:37:09 +0100 Message-Id: <1395499029-3883-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.5.2 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] tests/kms_cursor_crc: Fix up breakage X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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 I've accidentally broken the new cursor size extensions, but it wasn't quite correct before already: Variables which are set in igt_fixtures _must_ be outside of the stackframe of the igt_fixture block. Signed-off-by: Daniel Vetter --- tests/kms_cursor_crc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c index 7423f51409fb..f95448f47356 100644 --- a/tests/kms_cursor_crc.c +++ b/tests/kms_cursor_crc.c @@ -341,11 +341,12 @@ static void run_test_generic(data_t *data, int cursor_max_size) } +uint64_t cursor_width, cursor_height; + igt_main { data_t data = {}; - int cursor_max_size, ret; - uint64_t cursor_width, cursor_height; + int ret; igt_skip_on_simulation(); @@ -371,7 +372,7 @@ igt_main } - run_test_generic(&data, cursor_max_size); + run_test_generic(&data, cursor_width); igt_fixture { free(data.pipe_crc);