From patchwork Fri Jun 5 14:23:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sedat Dilek X-Patchwork-Id: 6554701 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 A9C83C0020 for ; Fri, 5 Jun 2015 14:23:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E43A8206FF for ; Fri, 5 Jun 2015 14:23:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0F80E206FD for ; Fri, 5 Jun 2015 14:23:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88F576ECAB; Fri, 5 Jun 2015 07:23:49 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTP id D5F876ECAB for ; Fri, 5 Jun 2015 07:23:48 -0700 (PDT) Received: by wiga1 with SMTP id a1so22649556wig.0 for ; Fri, 05 Jun 2015 07:23:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=UBoSGGiHV1cBcgYkTEzgFmA/HiqQgXz1qF5rw5Kvka0=; b=Ar6GQnXSt9z3QafZY4YVsGKImLILJHffOGXzl8+7wiw0PN+lmG+P4/hLGyAQc9si80 BX6WTc4+5ih0GsWkikeaeKSA4nmWIw21HVWZM3X9FLPGabF4KTJR13TgydmPGd4tmXJb xev1fcbktZT/EtUOqqgr0JaPtbjETxF1CFlNLZjDWetwQxChRB5akmJRkMrZNojzxclK 0f1bIw/ncypa4DJawVSPtR0Nvfhn2oVGJe+61QAmZlrqPclhviGT8mnrGBwOlq+uUe2B X1ENNzqP8dkL7B42zNSd+zerPi7SuZ5l2+A1B7zqSTtOkgqHiY2LYB/QvOy/t1eIr3d7 R64Q== X-Received: by 10.195.11.3 with SMTP id ee3mr6987162wjd.89.1433514227926; Fri, 05 Jun 2015 07:23:47 -0700 (PDT) Received: from fambox.fambox-domain ([176.4.82.32]) by mx.google.com with ESMTPSA id v3sm3656607wiz.14.2015.06.05.07.23.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 07:23:47 -0700 (PDT) From: Sedat Dilek To: Chris Wilson , intel-gfx Date: Fri, 5 Jun 2015 16:23:36 +0200 Message-Id: <1433514216-2854-1-git-send-email-sedat.dilek@gmail.com> X-Mailer: git-send-email 2.4.2 Cc: Sedat Dilek Subject: [Intel-gfx] [PATCH] sna: Partly revert "sna: Compilation fixes for stable distros" 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Fixes a problem having no mouse cursor in the LightDM login-screen on Ubuntu/precise (see [1]). [1] http://lists.freedesktop.org/archives/intel-gfx/2015-June/068096.html Fixes: 7d30ccea214b ("sna: Compilation fixes for stable distros") Signed-off-by: Sedat Dilek --- src/sna/kgem.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sna/kgem.c b/src/sna/kgem.c index de604b0f3d77..720644b26750 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -140,7 +140,6 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags); #define LOCAL_I915_PARAM_HAS_WT 27 #define LOCAL_I915_PARAM_MMAP_VERSION 30 -#define LOCAL_I915_EXEC_BLT (2<<0) #define LOCAL_I915_EXEC_IS_PINNED (1<<10) #define LOCAL_I915_EXEC_NO_RELOC (1<<11) #define LOCAL_I915_EXEC_HANDLE_LUT (1<<12) @@ -1400,7 +1399,7 @@ static bool test_can_blt_y(struct kgem *kgem) memset(&execbuf, 0, sizeof(execbuf)); execbuf.buffers_ptr = (uintptr_t)&object; execbuf.buffer_count = 1; - execbuf.flags = LOCAL_I915_EXEC_BLT; + execbuf.flags = I915_EXEC_BLT; ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2,