From patchwork Tue Apr 5 13:13:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lionel Landwerlin X-Patchwork-Id: 8751421 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 E5036C0553 for ; Tue, 5 Apr 2016 13:14:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E717120390 for ; Tue, 5 Apr 2016 13:14:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E21DA202D1 for ; Tue, 5 Apr 2016 13:14:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65BEE6E7A4; Tue, 5 Apr 2016 13:14:24 +0000 (UTC) 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 05DA26E7A2 for ; Tue, 5 Apr 2016 13:14:22 +0000 (UTC) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 05 Apr 2016 06:14:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,444,1455004800"; d="scan'208";a="681116499" Received: from akorczak-mobl.ger.corp.intel.com (HELO ivy.ger.corp.intel.com) ([10.252.37.167]) by FMSMGA003.fm.intel.com with ESMTP; 05 Apr 2016 06:13:59 -0700 From: Lionel Landwerlin To: intel-gfx@lists.freedesktop.org Date: Tue, 5 Apr 2016 14:13:53 +0100 Message-Id: <1459862033-17614-1-git-send-email-lionel.g.landwerlin@intel.com> X-Mailer: git-send-email 2.8.0.rc3 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] lib: kms: move framebuffer scanout offset/size to plane 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.2 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 fixes potential crashes when the framebuffer is unset from a given plane. v2: s/with/within/ typo in header Signed-off-by: Lionel Landwerlin Cc: Maarten Lankhorst Cc: Marius Vlad Cc: Ville Syrjälä --- lib/igt_fb.h | 4 ---- lib/igt_kms.c | 32 ++++++++++++++++---------------- lib/igt_kms.h | 8 ++++++++ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/lib/igt_fb.h b/lib/igt_fb.h index e8fe3ac..0a06899 100644 --- a/lib/igt_fb.h +++ b/lib/igt_fb.h @@ -55,10 +55,6 @@ struct igt_fb { unsigned size; cairo_surface_t *cairo_surface; unsigned domain; - uint32_t src_x; - uint32_t src_y; - uint32_t src_w; - uint32_t src_h; }; enum igt_text_align { diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 82257a6..b63a59d 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1586,10 +1586,10 @@ igt_atomic_prepare_plane_commit(igt_plane_t *plane, igt_output_t *output, } if (plane->position_changed || plane->size_changed) { - uint32_t src_x = IGT_FIXED(plane->fb->src_x, 0); /* src_x */ - uint32_t src_y = IGT_FIXED(plane->fb->src_y, 0); /* src_y */ - uint32_t src_w = IGT_FIXED(plane->fb->src_w, 0); /* src_w */ - uint32_t src_h = IGT_FIXED(plane->fb->src_h, 0); /* src_h */ + uint32_t src_x = IGT_FIXED(plane->src_x, 0); /* src_x */ + uint32_t src_y = IGT_FIXED(plane->src_y, 0); /* src_y */ + uint32_t src_w = IGT_FIXED(plane->src_w, 0); /* src_w */ + uint32_t src_h = IGT_FIXED(plane->src_h, 0); /* src_h */ int32_t crtc_x = plane->crtc_x; int32_t crtc_y = plane->crtc_y; uint32_t crtc_w = plane->crtc_w; @@ -1677,10 +1677,10 @@ static int igt_drm_plane_commit(igt_plane_t *plane, CHECK_RETURN(ret, fail_on_error); } else if (plane->fb_changed || plane->position_changed || plane->size_changed) { - src_x = IGT_FIXED(plane->fb->src_x,0); /* src_x */ - src_y = IGT_FIXED(plane->fb->src_y,0); /* src_y */ - src_w = IGT_FIXED(plane->fb->src_w,0); /* src_w */ - src_h = IGT_FIXED(plane->fb->src_h,0); /* src_h */ + src_x = IGT_FIXED(plane->src_x,0); /* src_x */ + src_y = IGT_FIXED(plane->src_y,0); /* src_y */ + src_w = IGT_FIXED(plane->src_w,0); /* src_w */ + src_h = IGT_FIXED(plane->src_h,0); /* src_h */ crtc_x = plane->crtc_x; crtc_y = plane->crtc_y; crtc_w = plane->crtc_w; @@ -2201,10 +2201,10 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb) plane->crtc_h = fb->height; /* set default src pos/size as fb size */ - fb->src_x = 0; - fb->src_y = 0; - fb->src_w = fb->width; - fb->src_h = fb->height; + plane->src_x = 0; + plane->src_y = 0; + plane->src_w = fb->width; + plane->src_h = fb->height; } else { plane->crtc_w = 0; plane->crtc_h = 0; @@ -2271,8 +2271,8 @@ void igt_fb_set_position(struct igt_fb *fb, igt_plane_t *plane, LOG(display, "%s.%d: fb_set_position(%d,%d)\n", kmstest_pipe_name(pipe->pipe), plane->index, x, y); - fb->src_x = x; - fb->src_y = y; + plane->src_x = x; + plane->src_y = y; plane->fb_changed = true; } @@ -2297,8 +2297,8 @@ void igt_fb_set_size(struct igt_fb *fb, igt_plane_t *plane, LOG(display, "%s.%d: fb_set_size(%dx%d)\n", kmstest_pipe_name(pipe->pipe), plane->index, w, h); - fb->src_w = w; - fb->src_h = h; + plane->src_w = w; + plane->src_h = h; plane->fb_changed = true; } diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 8ae1192..b763120 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -243,6 +243,14 @@ typedef struct { int crtc_x, crtc_y; /* size within pipe_src_w x pipe_src_h */ int crtc_w, crtc_h; + + /* position within the framebuffer */ + uint32_t src_x; + uint32_t src_y; + /* size within the framebuffer*/ + uint32_t src_w; + uint32_t src_h; + /* panning offset within the fb */ unsigned int pan_x, pan_y; igt_rotation_t rotation;