* [PATCH] adapt to HAS_DIRTYTRACKING_DRAWABLE_SRC changes
@ 2019-01-20 18:51 Ilia Mirkin
[not found] ` <20190120185151.5065-1-imirkin-FrUbXkNCsVf2fBVCVOL8/A@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Ilia Mirkin @ 2019-01-20 18:51 UTC (permalink / raw)
To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Apparently it now wants a drawable.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
---
No idea about whether this is correct. Saw the new warnings though.
src/drmmode_display.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2480122..f677e24 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -697,7 +697,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
int c, total_width = 0, max_height = 0, this_x = 0;
if (!ppix) {
if (crtc->randr_crtc->scanout_pixmap) {
- PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
+ PixmapStopDirtyTracking(
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+ &crtc->randr_crtc->scanout_pixmap->drawable,
+#else
+ crtc->randr_crtc->scanout_pixmap,
+#endif
+ screenpix);
if (drmmode && drmmode->fb_id) {
drmModeRmFB(drmmode->fd, drmmode->fb_id);
drmmode->fb_id = 0;
@@ -744,7 +750,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
}
drmmode_crtc->scanout_pixmap_x = this_x;
#ifdef HAS_DIRTYTRACKING_ROTATION
- PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
+ PixmapStartDirtyTracking(
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+ &ppix->drawable,
+#else
+ ppix,
+#endif
+ screenpix, 0, 0, this_x, 0, RR_Rotate_0);
#elif defined(HAS_DIRTYTRACKING2)
PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
#else
--
2.19.2
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] adapt to HAS_DIRTYTRACKING_DRAWABLE_SRC changes
[not found] ` <20190120185151.5065-1-imirkin-FrUbXkNCsVf2fBVCVOL8/A@public.gmane.org>
@ 2019-01-20 18:58 ` Ilia Mirkin
0 siblings, 0 replies; 2+ messages in thread
From: Ilia Mirkin @ 2019-01-20 18:58 UTC (permalink / raw)
To: nouveau
Probably needs more investigation. The relevant patch for amdgpu is
https://lists.x.org/archives/xorg-devel/2017-April/053439.html --
needs checking to see what this is all talking about.
On Sun, Jan 20, 2019 at 1:51 PM Ilia Mirkin <imirkin@alum.mit.edu> wrote:
>
> Apparently it now wants a drawable.
>
> Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
> ---
>
> No idea about whether this is correct. Saw the new warnings though.
>
> src/drmmode_display.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/src/drmmode_display.c b/src/drmmode_display.c
> index 2480122..f677e24 100644
> --- a/src/drmmode_display.c
> +++ b/src/drmmode_display.c
> @@ -697,7 +697,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
> int c, total_width = 0, max_height = 0, this_x = 0;
> if (!ppix) {
> if (crtc->randr_crtc->scanout_pixmap) {
> - PixmapStopDirtyTracking(crtc->randr_crtc->scanout_pixmap, screenpix);
> + PixmapStopDirtyTracking(
> +#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
> + &crtc->randr_crtc->scanout_pixmap->drawable,
> +#else
> + crtc->randr_crtc->scanout_pixmap,
> +#endif
> + screenpix);
> if (drmmode && drmmode->fb_id) {
> drmModeRmFB(drmmode->fd, drmmode->fb_id);
> drmmode->fb_id = 0;
> @@ -744,7 +750,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
> }
> drmmode_crtc->scanout_pixmap_x = this_x;
> #ifdef HAS_DIRTYTRACKING_ROTATION
> - PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
> + PixmapStartDirtyTracking(
> +#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
> + &ppix->drawable,
> +#else
> + ppix,
> +#endif
> + screenpix, 0, 0, this_x, 0, RR_Rotate_0);
> #elif defined(HAS_DIRTYTRACKING2)
> PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
> #else
> --
> 2.19.2
>
_______________________________________________
Nouveau mailing list
Nouveau@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/nouveau
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-20 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-20 18:51 [PATCH] adapt to HAS_DIRTYTRACKING_DRAWABLE_SRC changes Ilia Mirkin
[not found] ` <20190120185151.5065-1-imirkin-FrUbXkNCsVf2fBVCVOL8/A@public.gmane.org>
2019-01-20 18:58 ` Ilia Mirkin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.