From patchwork Tue Nov 12 16:10:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 3173611 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 472819F3A0 for ; Tue, 12 Nov 2013 16:11:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1EA89205BA for ; Tue, 12 Nov 2013 16:11:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EDAEC205B8 for ; Tue, 12 Nov 2013 16:11:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 45E7DFAB99; Tue, 12 Nov 2013 08:11:13 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 79CD6FAB99 for ; Tue, 12 Nov 2013 08:11:12 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 12 Nov 2013 08:10:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,685,1378882800"; d="scan'208";a="426292983" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.60]) by fmsmga001.fm.intel.com with ESMTP; 12 Nov 2013 08:10:36 -0800 Received: by rosetta (Postfix, from userid 1000) id 17D2B8006F; Tue, 12 Nov 2013 18:10:36 +0200 (EET) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Tue, 12 Nov 2013 18:10:29 +0200 Message-Id: <1384272629-13515-1-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Intel-gfx] [PATCH 1/2] tests/pm_pc8: fix compilation errors X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.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 Signed-off-by: Mika Kuoppala --- tests/pm_pc8.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/pm_pc8.c b/tests/pm_pc8.c index e17be1b..75f30cf 100644 --- a/tests/pm_pc8.c +++ b/tests/pm_pc8.c @@ -248,8 +248,7 @@ static void enable_one_screen(struct mode_set_data *data) igt_assert(enable_one_screen_with_type(data, SCREEN_TYPE_ANY)); } -static drmModePropertyBlobPtr get_connector_edid(drmModeConnectorPtr connector, - int index) +static drmModePropertyBlobPtr get_connector_edid(drmModeConnectorPtr connector) { unsigned int i; drmModeObjectPropertiesPtr props; @@ -287,7 +286,7 @@ static void init_mode_set_data(struct mode_set_data *data) for (i = 0; i < data->res->count_connectors; i++) { data->connectors[i] = drmModeGetConnector(drm_fd, data->res->connectors[i]); - data->edids[i] = get_connector_edid(data->connectors[i], i); + data->edids[i] = get_connector_edid(data->connectors[i]); } data->devid = intel_get_drm_devid(drm_fd); @@ -320,7 +319,7 @@ static void get_drm_info(struct compare_data *data) for (i = 0; i < data->res->count_connectors; i++) { data->connectors[i] = drmModeGetConnector(drm_fd, data->res->connectors[i]); - data->edids[i] = get_connector_edid(data->connectors[i], i); + data->edids[i] = get_connector_edid(data->connectors[i]); } for (i = 0; i < data->res->count_encoders; i++) data->encoders[i] = drmModeGetEncoder(drm_fd, @@ -1015,9 +1014,9 @@ static void submit_blt_cmd(uint32_t dst_handle, uint32_t x, uint32_t y, objs[1].handle = batch_handle; objs[1].relocation_count = 1; - objs[1].relocs_ptr = (uint64_t) relocs; + objs[1].relocs_ptr = (uintptr_t) relocs; - execbuf.buffers_ptr = (uint64_t) objs; + execbuf.buffers_ptr = (uintptr_t) objs; execbuf.buffer_count = 2; execbuf.batch_len = batch_size; execbuf.flags = I915_EXEC_BLT; @@ -1160,7 +1159,7 @@ static void gem_execbuf_stress_subtest(void) objs[0].handle = handle; - execbuf.buffers_ptr = (uint64_t) objs; + execbuf.buffers_ptr = (uintptr_t) objs; execbuf.buffer_count = 1; execbuf.batch_len = batch_size; execbuf.flags = I915_EXEC_RENDER;