From patchwork Fri Sep 6 19:08:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2854951 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 94FF8BF43F for ; Fri, 6 Sep 2013 19:14:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 977F2202B1 for ; Fri, 6 Sep 2013 19:14:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A253C20290 for ; Fri, 6 Sep 2013 19:14:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EE70E7685 for ; Fri, 6 Sep 2013 12:14:55 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E3C78E736C for ; Fri, 6 Sep 2013 12:09:05 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 06 Sep 2013 12:06:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,856,1371106800"; d="scan'208";a="374564956" Received: from unknown (HELO strange.amr.corp.intel.com) ([10.255.14.105]) by orsmga001.jf.intel.com with ESMTP; 06 Sep 2013 12:09:04 -0700 From: Damien Lespiau To: intel-gfx@lists.freedesktop.org Date: Fri, 6 Sep 2013 20:08:39 +0100 Message-Id: <1378494530-3600-2-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1378494530-3600-1-git-send-email-damien.lespiau@intel.com> References: <1378494530-3600-1-git-send-email-damien.lespiau@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 01/12] lib: Dump information about the supported 3D stereo formats X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 When dumping the details of a mode, let's add the 3D formats the mode supports. Signed-off-by: Damien Lespiau --- lib/drmtest.c | 37 +++++++++++++++++++++++++++++++++++-- lib/drmtest.h | 9 +++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lib/drmtest.c b/lib/drmtest.c index 37a0e22..eca792c 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -1587,10 +1587,42 @@ struct type_name connector_type_names[] = { type_name_fn(connector_type) +#define DRM_MODE_FOR_EACH_3D_FLAG(func, sep) \ + func(DRM_MODE_FLAG_3D_FRAME_PACKING) sep \ + func(DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE) sep \ + func(DRM_MODE_FLAG_3D_LINE_ALTERNATIVE) sep \ + func(DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL) sep \ + func(DRM_MODE_FLAG_3D_L_DEPTH) sep \ + func(DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH) sep \ + func(DRM_MODE_FLAG_3D_TOP_AND_BOTTOM) sep \ + func(DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF) void kmstest_dump_mode(drmModeModeInfo *mode) { - printf(" %s %d %d %d %d %d %d %d %d %d 0x%x 0x%x %d\n", + bool stereo_3d = mode->flags & DRMTEST_MODE_FLAG_3D_MASK; + char flags_str[32]; + +#define PRINT_S(name) "%s" +#define SEP_EMPTY +#define PRINT_FLAG(flag, str) \ + mode->flags & DRM_MODE_FLAG_3D_ ## flag ? " "str : "" + + snprintf(flags_str, sizeof(flags_str), " (3D:" + DRM_MODE_FOR_EACH_3D_FLAG(PRINT_S, SEP_EMPTY) ")", + PRINT_FLAG(FRAME_PACKING, "FP"), + PRINT_FLAG(FIELD_ALTERNATIVE, "FA"), + PRINT_FLAG(LINE_ALTERNATIVE, "LA"), + PRINT_FLAG(SIDE_BY_SIDE_FULL, "SBSF"), + PRINT_FLAG(L_DEPTH, "LD"), + PRINT_FLAG(L_DEPTH_GFX_GFX_DEPTH, "LDGFX"), + PRINT_FLAG(TOP_AND_BOTTOM, "TB"), + PRINT_FLAG(SIDE_BY_SIDE_HALF, "SBSH")); + +#undef PRINT_S +#undef SEP_EMPTY +#undef PRINT_FLAG + + printf(" %s %d %d %d %d %d %d %d %d %d 0x%x 0x%x %d%s\n", mode->name, mode->vrefresh, mode->hdisplay, @@ -1603,7 +1635,8 @@ void kmstest_dump_mode(drmModeModeInfo *mode) mode->vtotal, mode->flags, mode->type, - mode->clock); + mode->clock, + stereo_3d ? flags_str : ""); fflush(stdout); } diff --git a/lib/drmtest.h b/lib/drmtest.h index f55825e..2a562f7 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -259,6 +259,15 @@ bool igt_run_in_simulation(void); */ void igt_skip_on_simulation(void); +#define DRMTEST_MODE_FLAG_3D_MASK (DRM_MODE_FLAG_3D_FRAME_PACKING | \ + DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE | \ + DRM_MODE_FLAG_3D_LINE_ALTERNATIVE | \ + DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL | \ + DRM_MODE_FLAG_3D_L_DEPTH | \ + DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH | \ + DRM_MODE_FLAG_3D_TOP_AND_BOTTOM | \ + DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF) + /* helpers based upon the libdrm buffer manager */ void igt_init_aperture_trashers(drm_intel_bufmgr *bufmgr); void igt_trash_aperture(void);