From patchwork Sat Mar 21 00:11:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chandra Konduru X-Patchwork-Id: 6062301 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 B206CBF910 for ; Sat, 21 Mar 2015 00:12:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8534220465 for ; Sat, 21 Mar 2015 00:12:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 346372041D for ; Sat, 21 Mar 2015 00:12:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9F4786E0DF; Fri, 20 Mar 2015 17:12:30 -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 BEE157A00C for ; Fri, 20 Mar 2015 17:12:28 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 20 Mar 2015 17:12:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,440,1422950400"; d="scan'208";a="683378792" Received: from cmkondur-desk2.fm.intel.com ([10.19.123.59]) by fmsmga001.fm.intel.com with ESMTP; 20 Mar 2015 17:12:28 -0700 From: Chandra Konduru To: intel-gfx@lists.freedesktop.org Date: Fri, 20 Mar 2015 17:11:51 -0700 Message-Id: <1426896711-23476-2-git-send-email-chandra.konduru@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1426896711-23476-1-git-send-email-chandra.konduru@intel.com> References: <1426896711-23476-1-git-send-email-chandra.konduru@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] =?utf-8?q?=5BPATCH_2/2=5D_i-g-t=3A_Adding_panel_fitti?= =?utf-8?q?ng_test_case?= 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=-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 From: chandra konduru This patch is adding i-g-t test case to test panel fitting usages. Signed-off-by: chandra konduru --- tests/.gitignore | 1 + tests/Android.mk | 1 + tests/Makefile.sources | 1 + tests/kms_panel_fitting.c | 270 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 273 insertions(+) create mode 100644 tests/kms_panel_fitting.c diff --git a/tests/.gitignore b/tests/.gitignore index d1381cd..ca588fa 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -139,6 +139,7 @@ kms_sink_crc_basic kms_universal_plane kms_crtc_background_color kms_plane_scaling +kms_panel_fitting multi-tests.txt pm_lpsp pm_psr diff --git a/tests/Android.mk b/tests/Android.mk index c024296..ee508ec 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -77,6 +77,7 @@ else kms_flip_event_leak \ kms_crtc_background_color \ kms_plane_scaling \ + kms_panel_fitting \ kms_pwrite_crc IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 endif diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 460df02..6e6cad0 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -79,6 +79,7 @@ TESTS_progs_M = \ kms_universal_plane \ kms_crtc_background_color \ kms_plane_scaling \ + kms_panel_fitting \ pm_lpsp \ pm_rpm \ pm_rps \ diff --git a/tests/kms_panel_fitting.c b/tests/kms_panel_fitting.c new file mode 100644 index 0000000..84e63d5 --- /dev/null +++ b/tests/kms_panel_fitting.c @@ -0,0 +1,270 @@ +/* + * Copyright © 2013,2014 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + */ + +#include + +#include "drmtest.h" +#include "igt_debugfs.h" +#include "igt_kms.h" +#include "igt_core.h" +#include "intel_chipset.h" +#include "igt_aux.h" + +IGT_TEST_DESCRIPTION("Test display panel fitting"); + +typedef struct { + uint32_t devid; + int drm_fd; + igt_display_t display; + igt_crc_t ref_crc; + igt_pipe_crc_t *pipe_crc; + + int image_w; + int image_h; + + int num_scalers; + + struct igt_fb fb1; + struct igt_fb fb2; + struct igt_fb fb3; + int fb_id1; + int fb_id2; + int fb_id3; + + igt_plane_t *plane1; + igt_plane_t *plane2; + igt_plane_t *plane3; + igt_plane_t *plane4; +} data_t; + +#define FILE_NAME "1080p-left.png" + +static void +paint_color(data_t *d, struct igt_fb *fb, uint16_t w, uint16_t h) +{ + cairo_t *cr; + + cr = igt_get_cairo_ctx(d->drm_fd, fb); + igt_paint_test_pattern(cr, w, h); + cairo_destroy(cr); +} + +static void +paint_image(data_t *d, struct igt_fb *fb, uint16_t w, uint16_t h) +{ + cairo_t *cr; + + cr = igt_get_cairo_ctx(d->drm_fd, fb); + igt_paint_image(cr, FILE_NAME, 0, 0, w, h); + cairo_destroy(cr); +} + +static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, + igt_plane_t *plane, drmModeModeInfo *mode, enum igt_commit_style s) +{ + igt_display_t *display = &data->display; + + igt_output_set_pipe(output, pipe); + + /* create the pipe_crc object for this pipe */ + igt_pipe_crc_free(data->pipe_crc); + data->pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + + /* before allocating, free if any older fb */ + if (data->fb_id1) { + igt_remove_fb(data->drm_fd, &data->fb1); + data->fb_id1 = 0; + } + + /* allocate fb for plane 1 */ + data->fb_id1 = igt_create_fb(data->drm_fd, + mode->hdisplay, mode->vdisplay, + DRM_FORMAT_XRGB8888, + true, /* tiled */ + &data->fb1); + igt_assert(data->fb_id1); + + paint_color(data, &data->fb1, mode->hdisplay, mode->vdisplay); + + /* + * We always set the primary plane to actually enable the pipe as + * there's no way (that works) to light up a pipe with only a sprite + * plane enabled at the moment. + */ + if (!plane->is_primary) { + igt_plane_t *primary; + + primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + igt_plane_set_fb(primary, &data->fb1); + } + + igt_plane_set_fb(plane, &data->fb1); + if (s == COMMIT_LEGACY) { + int ret; + ret = drmModeSetCrtc(data->drm_fd, + output->config.crtc->crtc_id, + data->fb_id1, + plane->pan_x, plane->pan_y, + &output->id, + 1, + mode); + igt_assert(ret == 0); + } else { + igt_display_commit2(display, s); + } +} + +static void cleanup_crtc(data_t *data, igt_output_t *output, igt_plane_t *plane) +{ + igt_display_t *display = &data->display; + + igt_pipe_crc_free(data->pipe_crc); + data->pipe_crc = NULL; + + if (data->fb_id1) { + igt_remove_fb(data->drm_fd, &data->fb1); + data->fb_id1 = 0; + } + if (data->fb_id2) { + igt_remove_fb(data->drm_fd, &data->fb2); + data->fb_id2 = 0; + } + if (data->fb_id3) { + igt_remove_fb(data->drm_fd, &data->fb3); + data->fb_id3 = 0; + } + + if (!plane->is_primary) { + igt_plane_t *primary; + + primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + igt_plane_set_fb(primary, NULL); + } + + igt_plane_set_fb(plane, NULL); + igt_output_set_pipe(output, PIPE_ANY); + + igt_display_commit2(display, COMMIT_UNIVERSAL); +} + +static void test_panel_fitting(data_t *d) +{ + igt_display_t *display = &d->display; + igt_output_t *output; + cairo_surface_t *image; + enum pipe pipe; + int valid_tests = 0; + + igt_require(d->display.has_universal_planes); + igt_require(d->num_scalers); + igt_require(d->num_scalers); + + for_each_connected_output(display, output) { + drmModeModeInfo *mode, native_mode; + + igt_require(output->config.connector->connector_type == + DRM_MODE_CONNECTOR_eDP); + + pipe = output->config.pipe; + igt_output_set_pipe(output, pipe); + + mode = igt_output_get_mode(output); + native_mode = *mode; + + /* allocate fb2 with image size */ + image = cairo_image_surface_create_from_png(FILE_NAME); + igt_assert(cairo_surface_status(image) == CAIRO_STATUS_SUCCESS); + d->image_w = cairo_image_surface_get_width(image); + d->image_h = cairo_image_surface_get_height(image); + cairo_surface_destroy(image); + + d->fb_id2 = igt_create_fb(d->drm_fd, + d->image_w, d->image_h, + DRM_FORMAT_XRGB8888, + true, /* tiled */ + &d->fb2); + igt_assert(d->fb_id2); + paint_image(d, &d->fb2, d->fb2.width, d->fb2.height); + + /* Set up display to enable panel fitting */ + mode->hdisplay = 640; + mode->vdisplay = 480; + d->plane1 = igt_output_get_plane(output, IGT_PLANE_PRIMARY); + prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_LEGACY); + + /* disable panel fitting */ + prepare_crtc(d, output, pipe, d->plane1, &native_mode, COMMIT_LEGACY); + + /* enable panel fitting */ + mode->hdisplay = 800; + mode->vdisplay = 600; + prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_LEGACY); + + /* disable panel fitting */ + prepare_crtc(d, output, pipe, d->plane1, &native_mode, COMMIT_LEGACY); + + /* Set up fb2->plane2 mapping. */ + d->plane2 = igt_output_get_plane(output, IGT_PLANE_2); + igt_plane_set_fb(d->plane2, &d->fb2); + + /* enable sprite plane */ + igt_fb_set_position(&d->fb2, d->plane2, 100, 100); + igt_fb_set_size(&d->fb2, d->plane2, d->fb2.width-200, d->fb2.height-200); + igt_plane_set_position(d->plane2, 100, 100); + igt_plane_set_size(d->plane2, mode->hdisplay-200, mode->vdisplay-200); + igt_display_commit2(display, COMMIT_UNIVERSAL); + + /* enable panel fitting along with sprite scaling */ + mode->hdisplay = 1024; + mode->vdisplay = 768; + prepare_crtc(d, output, pipe, d->plane1, mode, COMMIT_LEGACY); + + /* back to single plane mode */ + igt_plane_set_fb(d->plane2, NULL); + igt_display_commit2(display, COMMIT_UNIVERSAL); + + valid_tests++; + cleanup_crtc(d, output, d->plane1); + } + igt_require_f(valid_tests, "no valid crtc/connector combinations found\n"); +} + +igt_main +{ + data_t data = {}; + + igt_skip_on_simulation(); + + data.drm_fd = drm_open_any(); + igt_require_pipe_crc(); + igt_display_init(&data.display, data.drm_fd); + data.devid = intel_get_drm_devid(data.drm_fd); + + data.num_scalers = intel_gen(data.devid) >= 9 ? 2 : 0; + + igt_subtest("panel-fitting") + test_panel_fitting(&data); + + igt_display_fini(&data.display); +}