From patchwork Fri Jun 26 13:53:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chandra Konduru X-Patchwork-Id: 6681101 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 18ADDC05AC for ; Fri, 26 Jun 2015 13:55:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 330A82063B for ; Fri, 26 Jun 2015 13:54:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5306720630 for ; Fri, 26 Jun 2015 13:54:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5F877A13B; Fri, 26 Jun 2015 06:54:57 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 66D156E554 for ; Fri, 26 Jun 2015 06:54:52 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP; 26 Jun 2015 06:54:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,685,1427785200"; d="scan'208";a="718161359" Received: from cmkondur-desk2.fm.intel.com ([10.1.130.102]) by orsmga001.jf.intel.com with ESMTP; 26 Jun 2015 06:54:51 -0700 From: Chandra Konduru To: intel-gfx@lists.freedesktop.org Date: Fri, 26 Jun 2015 06:53:49 -0700 Message-Id: <1435326829-12458-3-git-send-email-chandra.konduru@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1435326829-12458-1-git-send-email-chandra.konduru@intel.com> References: <1435326829-12458-1-git-send-email-chandra.konduru@intel.com> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: In DBUF/WM calcs for 90/270, swap w & h 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=-5.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 This patch swaps src width and height for dbuf/wm calculations when rotation is 90/270 as per hw requirements. Signed-off-by: Chandra Konduru Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/intel_pm.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index ea3e435..767313b 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -2913,6 +2913,8 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, enum pipe pipe = intel_crtc->pipe; struct drm_plane *plane; struct drm_framebuffer *fb; + struct intel_plane_state *plane_state; + int src_w, src_h; int i = 1; /* Index for sprite planes start */ p->active = intel_crtc->active; @@ -2921,6 +2923,7 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, p->pixel_rate = skl_pipe_pixel_rate(intel_crtc->config); fb = crtc->primary->state->fb; + plane_state = to_intel_plane_state(crtc->primary->state); /* For planar: Bpp is for uv plane, y_Bpp is for y plane */ if (fb) { p->plane[0].enabled = true; @@ -2935,8 +2938,22 @@ static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, p->plane[0].y_bytes_per_pixel = 0; p->plane[0].tiling = DRM_FORMAT_MOD_NONE; } - p->plane[0].horiz_pixels = intel_crtc->config->pipe_src_w; - p->plane[0].vert_pixels = intel_crtc->config->pipe_src_h; + + if (drm_rect_width(&plane_state->src)) { + src_w = drm_rect_width(&plane_state->src) >> 16; + src_h = drm_rect_height(&plane_state->src) >> 16; + } else { + src_w = intel_crtc->config->pipe_src_w; + src_h = intel_crtc->config->pipe_src_h; + } + + if (intel_rotation_90_or_270(crtc->primary->state->rotation)) { + p->plane[0].horiz_pixels = src_h; + p->plane[0].vert_pixels = src_w; + } else { + p->plane[0].horiz_pixels = src_w; + p->plane[0].vert_pixels = src_h; + } p->plane[0].rotation = crtc->primary->state->rotation; fb = crtc->cursor->state->fb; @@ -3468,8 +3485,15 @@ skl_update_sprite_wm(struct drm_plane *plane, struct drm_crtc *crtc, intel_plane->wm.enabled = enabled; intel_plane->wm.scaled = scaled; - intel_plane->wm.horiz_pixels = sprite_width; - intel_plane->wm.vert_pixels = sprite_height; + + if (intel_rotation_90_or_270(plane->state->rotation)) { + intel_plane->wm.horiz_pixels = sprite_height; + intel_plane->wm.vert_pixels = sprite_width; + } else { + intel_plane->wm.horiz_pixels = sprite_width; + intel_plane->wm.vert_pixels = sprite_height; + } + intel_plane->wm.tiling = DRM_FORMAT_MOD_NONE; /* For planar: Bpp is for UV plane, y_Bpp is for Y plane */