Hello community,
here is the log from the commit of package xf86-video-freedreno for
openSUSE:Factory checked in at 2014-05-05 21:14:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-freedreno (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-freedreno.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-freedreno"
Changes:
--------
---
/work/SRC/openSUSE:Factory/xf86-video-freedreno/xf86-video-freedreno.changes
2014-02-02 22:24:16.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xf86-video-freedreno.new/xf86-video-freedreno.changes
2014-05-05 21:14:34.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 29 21:42:38 UTC 2014 - [email protected]
+
+- Fix build with recent X.org versions
+ U_kms-fb-fix-load_cursor_argb-for-the-new-Xorg-ABI.patch
+
+-------------------------------------------------------------------
New:
----
U_kms-fb-fix-load_cursor_argb-for-the-new-Xorg-ABI.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-freedreno.spec ++++++
--- /var/tmp/diff_new_pack.nprbHl/_old 2014-05-05 21:14:35.000000000 +0200
+++ /var/tmp/diff_new_pack.nprbHl/_new 2014-05-05 21:14:35.000000000 +0200
@@ -26,6 +26,7 @@
Url: https://github.com/freedreno/xf86-video-freedreno
Source0:
http://xorg.freedesktop.org/releases/individual/driver/xf86-video-freedreno-%{version}.tar.bz2
Patch0: U_drop-drm_mode-include.patch
+Patch1: U_kms-fb-fix-load_cursor_argb-for-the-new-Xorg-ABI.patch
Requires: xorg-x11-server
BuildRequires: autoconf
BuildRequires: automake
@@ -48,6 +49,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export CFLAGS="%{optflags}"
++++++ U_kms-fb-fix-load_cursor_argb-for-the-new-Xorg-ABI.patch ++++++
>From c747229b81ecebd06526ee86127ebc9b00228b54 Mon Sep 17 00:00:00 2001
From: Rob Clark <[email protected]>
Date: Sun, 27 Apr 2014 12:23:18 -0400
Subject: [PATCH] kms/fb: fix load_cursor_argb for the new Xorg ABI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Patch-mainline: Upstream
Git-commit: 1727d268841139661619681fcef2ac36cf1b0978
Signed-off-by: Rob Clark <[email protected]>
(cherry picked from commit 1727d268841139661619681fcef2ac36cf1b0978)
Signed-off-by: Andreas Färber <[email protected]>
---
src/drmmode_display.c | 23 ++++++++++++++++++++---
src/fbmode_display.c | 26 +++++++++++++++++++++++---
2 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index cd205db..6cdaa34 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -323,21 +323,38 @@ convert_cursor(CARD32 *dst, CARD32 *src, int dw, int sw)
}
}
-static void
-drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
+static Bool
+load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
{
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
struct fd_bo *cursor = drmmode_crtc->cursor;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
void *ptr = fd_bo_map(cursor);
+ int ret = 0;
convert_cursor(ptr, image, 64, 64);
if (drmmode_crtc->cursor_visible) {
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
+ ret = drmModeSetCursor(drmmode->fd,
drmmode_crtc->mode_crtc->crtc_id,
fd_bo_handle(cursor), 64, 64);
}
+
+ return ret == 0;
+}
+
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0)
+static Bool
+drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
+{
+ return load_cursor_argb(crtc, image);
+}
+#else
+static void
+drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
+{
+ load_cursor_argb(crtc, image);
}
+#endif
static void
drmmode_hide_cursor (xf86CrtcPtr crtc)
diff --git a/src/fbmode_display.c b/src/fbmode_display.c
index 357c16e..3cbf647 100644
--- a/src/fbmode_display.c
+++ b/src/fbmode_display.c
@@ -315,8 +315,8 @@ MSMCrtcHideCursor(xf86CrtcPtr crtc)
_enable_cursor(crtc->driver_private, FALSE);
}
-static void
-MSMCrtcLoadCursorARGB(xf86CrtcPtr crtc, CARD32 * image)
+static Bool
+load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image)
{
#ifdef MSMFB_CURSOR
fbmode_ptr fbmode = crtc->driver_private;
@@ -333,11 +333,31 @@ MSMCrtcLoadCursorARGB(xf86CrtcPtr crtc, CARD32 * image)
/* Per pixel alpha on */
cursor.image.fg_color = 0;
- if (ioctl(fbmode->fd, MSMFB_CURSOR, &cursor))
+ if (ioctl(fbmode->fd, MSMFB_CURSOR, &cursor)) {
ErrorF("%s: Error calling MSMBF_CURSOR\n", __FUNCTION__);
+ return FALSE;
+ }
+ return TRUE;
+#else
+ return FALSE;
#endif
}
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0)
+static Bool
+MSMCrtcLoadCursorARGB(xf86CrtcPtr crtc, CARD32 * image)
+{
+ return load_cursor_argb(crtc, image);
+}
+#else
+static void
+MSMCrtcLoadCursorARGB(xf86CrtcPtr crtc, CARD32 * image)
+{
+ load_cursor_argb(crtc, image);
+}
+#endif
+
+
static const xf86CrtcFuncsRec MSMCrtcFuncs = {
.dpms = MSMCrtcDPMS,
.lock = MSMCrtcLock,
--
1.9.2
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
