From patchwork Thu Sep 19 16:40:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lespiau, Damien" X-Patchwork-Id: 2912601 Return-Path: X-Original-To: patchwork-dri-devel@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 ECCB7BFF05 for ; Thu, 19 Sep 2013 17:05:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE6B420278 for ; Thu, 19 Sep 2013 17:05:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5D4D12024C for ; Thu, 19 Sep 2013 17:05:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48EEBE63FE for ; Thu, 19 Sep 2013 10:05:36 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 10ABBE6979; Thu, 19 Sep 2013 09:41:22 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 19 Sep 2013 09:41:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,937,1371106800"; d="scan'208";a="404212026" Received: from unknown (HELO strange.amr.corp.intel.com) ([10.255.15.46]) by fmsmga002.fm.intel.com with ESMTP; 19 Sep 2013 09:41:13 -0700 From: Damien Lespiau To: dri-devel@lists.freedesktop.org Subject: [PATCH 14/20] drm: Implement timings adjustments for frame packing Date: Thu, 19 Sep 2013 17:40:29 +0100 Message-Id: <1379608835-11760-15-git-send-email-damien.lespiau@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1379608835-11760-1-git-send-email-damien.lespiau@intel.com> References: <1379608835-11760-1-git-send-email-damien.lespiau@intel.com> Cc: intel-gfx@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.8 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 using the frame packing and a single big framebuffer, some hardware requires that we do everything like if we were scanning out the big buffer itself. Let's instrument drm_mode_set_crtcinfo() to be able to do this adjustement if the driver is asking for it. Suggested-by: Daniel Vetter Signed-off-by: Damien Lespiau --- drivers/gpu/drm/drm_modes.c | 51 ++++++++++++++++++++++++++++++++++++++++++++- include/drm/drm_crtc.h | 3 ++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index ef26eb2..d9c5a34 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -704,15 +704,47 @@ int drm_mode_vrefresh(const struct drm_display_mode *mode) } EXPORT_SYMBOL(drm_mode_vrefresh); +static bool drm_mode_is_ntsc(const struct drm_display_mode *mode) +{ + int ntsc_clock; + + ntsc_clock = DIV_ROUND_UP(mode->vtotal * mode->htotal * mode->vrefresh, + 1001); + + if (ntsc_clock == mode->clock) + return true; + + return false; +} + +static void drm_mode_reconstruct_crtc_clock(struct drm_display_mode *mode) +{ + int clock; + + clock = mode->crtc_vtotal * mode->crtc_htotal * + drm_mode_vrefresh(mode) / 1000; + + if (drm_mode_is_ntsc(mode)) + mode->crtc_clock = DIV_ROUND_UP(clock * 1000, 1001); + else + mode->crtc_clock = clock; +} + /** * drm_mode_set_crtcinfo - set CRTC modesetting parameters * @p: mode - * @adjust_flags: unused? (FIXME) + * @adjust_flags: a combination of adjustment flags * * LOCKING: * None. * * Setup the CRTC modesetting parameters for @p, adjusting if necessary. + * + * - The CRTC_INTERLACE_HALVE_V flag can be used to halve vertical timings of + * interlaced modes. + * - The CRTC_STEREO_DOUBLE flag can be used to compute the timings for + * buffers containing two eyes (only adjust the timings when needed, eg. for + * "frame packing" or "side by side full"). */ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags) { @@ -753,6 +785,23 @@ void drm_mode_set_crtcinfo(struct drm_display_mode *p, int adjust_flags) p->crtc_vtotal *= p->vscan; } + if (adjust_flags & CRTC_STEREO_DOUBLE) { + unsigned int layout = p->flags & DRM_MODE_FLAG_3D_MASK; + int vactive_space; + + switch (layout) { + case DRM_MODE_FLAG_3D_FRAME_PACKING: + vactive_space = p->vtotal - p->vdisplay; + + p->crtc_vdisplay += p->vdisplay + vactive_space; + p->crtc_vsync_start += p->vdisplay + vactive_space; + p->crtc_vsync_end += p->vdisplay + vactive_space; + p->crtc_vtotal += p->vdisplay + vactive_space; + drm_mode_reconstruct_crtc_clock(p); + break; + } + } + p->crtc_vblank_start = min(p->crtc_vsync_start, p->crtc_vdisplay); p->crtc_vblank_end = max(p->crtc_vsync_end, p->crtc_vtotal); p->crtc_hblank_start = min(p->crtc_hsync_start, p->crtc_hdisplay); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 73478bc..b2d08ca 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -125,7 +125,8 @@ enum drm_mode_status { .vscan = (vs), .flags = (f), \ .base.type = DRM_MODE_OBJECT_MODE -#define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */ +#define CRTC_INTERLACE_HALVE_V (1 << 0) /* halve V values for interlacing */ +#define CRTC_STEREO_DOUBLE (1 << 1) /* adjust timings for stereo modes */ struct drm_display_mode { /* Header */