forked from pool/xorg-x11-server
Stefan Dirsch
104e4d81f7
* fixes rotation in modesetting driver (regression with
xorg-server 1.20.0, fdo#106715)
* might also fix boo#1099812 ...
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=707
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From a85e94a50c94b07574c8701a3ff3c1243f4257f4 Mon Sep 17 00:00:00 2001
|
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
Date: Fri, 15 Jun 2018 08:57:12 +0200
|
|
Subject: [PATCH] modesetting: use drmmode_bo_import() for rotate_fb
|
|
|
|
drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if
|
|
the format is not as expected, preventing from using a rotated output.
|
|
|
|
Change it to use the new function drmmode_bo_import() which takes care
|
|
of calling the drmModeAddFB2() API.
|
|
|
|
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715
|
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
Tested-by: Tomas Pelka <tpelka@redhat.com>
|
|
Reviewed-by: Lyude Paul <lyude@redhat.com>
|
|
---
|
|
hw/xfree86/drivers/modesetting/drmmode_display.c | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
index 859a21a9d..ec11b3f56 100644
|
|
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
|
|
return NULL;
|
|
}
|
|
|
|
- ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth,
|
|
- drmmode->kbpp,
|
|
- drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo),
|
|
- drmmode_bo_get_handle(&drmmode_crtc->rotate_bo),
|
|
- &drmmode_crtc->rotate_fb_id);
|
|
+ ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo,
|
|
+ &drmmode_crtc->rotate_fb_id);
|
|
|
|
if (ret) {
|
|
ErrorF("failed to add rotate fb\n");
|
|
--
|
|
2.16.3
|
|
|