From patchwork Fri Sep 11 16:43:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandra Konduru X-Patchwork-Id: 7162561 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4653C9F380 for ; Fri, 11 Sep 2015 16:45:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63308206EB for ; Fri, 11 Sep 2015 16:45:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4E2B5206D7 for ; Fri, 11 Sep 2015 16:45:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 209FE6E0DF; Fri, 11 Sep 2015 09:44:59 -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 A50426E0DF for ; Fri, 11 Sep 2015 09:44:57 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 11 Sep 2015 09:44:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,511,1437462000"; d="scan'208";a="802542321" Received: from cmkondur-desk2.fm.intel.com ([10.19.83.171]) by orsmga002.jf.intel.com with ESMTP; 11 Sep 2015 09:44:56 -0700 From: Chandra Konduru To: intel-gfx@lists.freedesktop.org Date: Fri, 11 Sep 2015 09:43:15 -0700 Message-Id: <1441989795-4389-1-git-send-email-chandra.konduru@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1441420391-19109-5-git-send-email-chandra.konduru@intel.com> References: <1441420391-19109-5-git-send-email-chandra.konduru@intel.com> Cc: daniel.vetter@intel.com, ville.syrjala@intel.com Subject: [Intel-gfx] [PATCH 04/15] drm/i915: Stage scaler request for NV12 as src format 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 This patch stages a scaler request when input format is NV12. The same scaler does both chroma-upsampling and resolution scaling as needed. v2: -Added helper function for need_scaling (Ville) v3: -Rebased to current kernel version 4.2.0.rc4 (me) v4: -minor updates (Ville) v5: -updated scaler helper function (Ville) Signed-off-by: Chandra Konduru --- drivers/gpu/drm/i915/intel_display.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 356f071..cf6c31d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4345,20 +4345,33 @@ static void cpt_verify_modeset(struct drm_device *dev, int pipe) } } +static bool skl_need_scaling(int src_w, int src_h, int dst_w, int dst_h, + unsigned int rotation, uint32_t pixel_format) +{ + /* need a scaler for nv12 */ + if (pixel_format == DRM_FORMAT_NV12) + return true; + + /* need a scaler when sizes doesn't match */ + if (intel_rotation_90_or_270(rotation)) + return (src_h != dst_w || src_w != dst_h); + else + return (src_w != dst_w || src_h != dst_h); +} + static int skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, unsigned scaler_user, int *scaler_id, unsigned int rotation, - int src_w, int src_h, int dst_w, int dst_h) + int src_w, int src_h, int dst_w, int dst_h, uint32_t pixel_format) { struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc); - int need_scaling; + bool need_scaling; - need_scaling = intel_rotation_90_or_270(rotation) ? - (src_h != dst_w || src_w != dst_h): - (src_w != dst_w || src_h != dst_h); + need_scaling = skl_need_scaling(src_w, src_h, dst_w, dst_h, rotation, + pixel_format); /* * if plane is being disabled or scaler is no more required or force detach @@ -4427,7 +4440,7 @@ int skl_update_scaler_crtc(struct intel_crtc_state *state) return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX, &state->scaler_state.scaler_id, DRM_ROTATE_0, state->pipe_src_w, state->pipe_src_h, - adjusted_mode->hdisplay, adjusted_mode->vdisplay); + adjusted_mode->hdisplay, adjusted_mode->vdisplay, 0); } /** @@ -4463,7 +4476,8 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, drm_rect_width(&plane_state->src) >> 16, drm_rect_height(&plane_state->src) >> 16, drm_rect_width(&plane_state->dst), - drm_rect_height(&plane_state->dst)); + drm_rect_height(&plane_state->dst), + fb ? fb->pixel_format : 0); if (ret || plane_state->scaler_id < 0) return ret; @@ -4488,6 +4502,7 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, case DRM_FORMAT_YVYU: case DRM_FORMAT_UYVY: case DRM_FORMAT_VYUY: + case DRM_FORMAT_NV12: break; default: DRM_DEBUG_KMS("[PLANE:%d] FB:%d unsupported scaling format 0x%x\n",