From patchwork Wed Apr 9 22:24:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 3957811 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 7C0499F371 for ; Wed, 9 Apr 2014 22:24:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 59EC32063B for ; Wed, 9 Apr 2014 22:24:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7C3F920637 for ; Wed, 9 Apr 2014 22:24:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE09D6E154; Wed, 9 Apr 2014 15:24:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from annarchy.freedesktop.org (annarchy.freedesktop.org [131.252.210.176]) by gabe.freedesktop.org (Postfix) with ESMTP id 194DD6EBDC; Wed, 9 Apr 2014 15:24:24 -0700 (PDT) Received: from eliezer.anholt.net (annarchy.freedesktop.org [127.0.0.1]) by annarchy.freedesktop.org (Postfix) with ESMTP id 046041831A; Wed, 9 Apr 2014 15:24:24 -0700 (PDT) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 1ED42F0443D; Wed, 9 Apr 2014 15:24:23 -0700 (PDT) From: Eric Anholt To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Apr 2014 15:24:23 -0700 Message-Id: <1397082263-21043-3-git-send-email-eric@anholt.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1397082263-21043-1-git-send-email-eric@anholt.net> References: <1397082263-21043-1-git-send-email-eric@anholt.net> Subject: [Intel-gfx] [PATCH 3/3] uxa: Fix load_cursor_argb for the new Xorg ABI. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.5 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 Returning an undefined value meant we might get sw cursors. --- src/uxa/intel_display.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c index 39d8507..23eb2c7 100644 --- a/src/uxa/intel_display.c +++ b/src/uxa/intel_display.c @@ -606,6 +606,21 @@ intel_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y) drmModeMoveCursor(mode->fd, crtc_id(intel_crtc), x, y); } +#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) +static Bool +intel_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) +{ + struct intel_crtc *intel_crtc = crtc->driver_private; + int ret; + + ret = dri_bo_subdata(intel_crtc->cursor, 0, 64*64*4, image); + if (ret) + xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, + "failed to set cursor: %s\n", strerror(-ret)); + + return !ret; +} +#else static void intel_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) { @@ -617,6 +632,7 @@ intel_crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image) xf86DrvMsg(crtc->scrn->scrnIndex, X_ERROR, "failed to set cursor: %s\n", strerror(-ret)); } +#endif static void intel_crtc_hide_cursor(xf86CrtcPtr crtc)