search for: scrn

Dear Rexperts, Given, aar <-function(command) { switch(command, {scrn = cat("scrn :Screening","\n")} {dx = cat("dx :Diagnosis","\n")} {df = cat("df :Don't Forget","\n")} ) } I want to be able to do: aar("dx") # function does cat("dx :Diagnosis","\n") aar...

Here are a few patches adding some missing functions in NvPlatformProbe, which iirc is being used as of xserver 1.13 First patch adds a nouveau_kernel_mode_enabled helper, similar to xf86-video-radeon Second and third use the function in Nv{Pci,Platform}Probe And last one ensures we can still use ZaphodHead and relative head positioning via xorg.conf The coding style may be a bit off, despite my

...(+), 11 deletions(-) diff --git a/src/amdgpu_drv.h b/src/amdgpu_drv.h index e5c44dc36..9e088e71a 100644 --- a/src/amdgpu_drv.h +++ b/src/amdgpu_drv.h @@ -170,6 +170,32 @@ typedef enum { #define AMDGPU_PIXMAP_SHARING 1 #define amdgpu_is_gpu_screen(screen) (screen)->isGPU #define amdgpu_is_gpu_scrn(scrn) (scrn)->is_gpu + +static inline ScreenPtr +amdgpu_dirty_master(PixmapDirtyUpdatePtr dirty) +{ +#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC + ScreenPtr screen = dirty->src->pScreen; +#else + ScreenPtr screen = dirty->src->drawable.pScreen; +#endif + + if (screen->current_master) +...

...op_ptr props; + char *backlight_iface; + int32_t backlight_active_level; + int32_t backlight_max; + int dpms_mode; } drmmode_output_private_rec, *drmmode_output_private_ptr; static void drmmode_output_dpms(xf86OutputPtr output, int mode); @@ -160,6 +182,155 @@ drmmode_ConvertToKMode(ScrnInfoPtr scrn, drmModeModeInfo *kmode, } static void +drmmode_backlight_set(xf86OutputPtr output, int level) +{ + drmmode_output_private_ptr drmmode_output = output->driver_private; + char path[BACKLIGHT_PATH_LEN], val[BACKLIGHT_VALUE_LEN]; + int fd, len, ret; + + if (level > drmmode_output...

...rtc_id; } +Bool +drmmode_crtc_on(xf86CrtcPtr crtc) +{ + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + + return crtc->enabled && drmmode_crtc->dpms_mode == DPMSModeOn; +} + int drmmode_head(xf86CrtcPtr crtc) { @@ -313,9 +322,10 @@ drmmode_ConvertToKMode(ScrnInfoPtr scrn, drmModeModeInfo *kmode, } static void -drmmode_crtc_dpms(xf86CrtcPtr drmmode_crtc, int mode) +drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode) { - + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + drmmode_crtc->dpms_mode = mode; } void diff --git a/src/nouve...

We don't really expect to have too many events in the queue. If there are, then the algorithm we use isn't appropriate. Add a warning when the queue gets very long, as it's an indication of something having gone wrong. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/drmmode_display.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git

...+++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 323 insertions(+), 54 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index e748574..512c60a 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -46,7 +46,6 @@ static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height); typedef struct { int fd; uint32_t fb_id; - drmModeResPtr mode_res; int cpp; drmEventContext event_context; #ifdef HAVE_LIBUDEV @@ -83,6 +82,7 @@ typedef struct { drmModeConnectorPtr mode_output; drmModeEncoderPtr mode_encoder;...

...++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 335 insertions(+), 55 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 04a0b57..6b8e3f3 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -46,7 +46,6 @@ static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height); typedef struct { int fd; uint32_t fb_id; - drmModeResPtr mode_res; int cpp; drmEventContext event_context; #ifdef HAVE_LIBUDEV @@ -83,6 +82,7 @@ typedef struct { drmModeConnectorPtr mode_output; drmModeEncoderPtr mode_encoder;...

Hi, here a set of patches against the nouveau-ddx. This is an extended and revised set, based on Francisco Jerez feedback from autumn last year. [1/9] Makes pageflipping work again on X-Server 1.12rc. It apparently stopped working somewhere around Xorg 1.11+. [2/9] Implements handling of pageflip completion events from the kernel. Francisco Jerez argument against including it was that the

...deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index ce0a573..8c29eca 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -248,9 +248,13 @@ static uint64_t dri2_sequence; static Bool update_front(DrawablePtr draw, DRI2BufferPtr front) { - int r; - PixmapPtr pixmap; + ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen); + NVPtr pNv = NVPTR(scrn); struct nouveau_dri2_buffer *nvbuf = nouveau_dri2_buffer(front); + struct nouveau_bo *pixmap_bo; + + PixmapPtr pixmap; + int r; if (draw->type == DRAWABLE_PIXMAP) pixmap = (PixmapPtr)draw; @@ -259,8 +263,16 @@ u...

...INT32 atom_range[2]; + + atom_range[0] = min; + atom_range[1] = max; + + *atom = MakeAtom(name, strlen(name), TRUE); + err = RRConfigureOutputProperty(output->randr_output, *atom, + FALSE, TRUE, immutable, + 2, atom_range); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, + "RRConfigureOutputProperty error, %d\n", err); + } + err = RRChangeOutputProperty(output->randr_output, *atom, + XA_INTEGER, 32, PropModeReplace, 1, &value, FALSE, TRUE); + if (err != 0) { + xf86DrvMsg(output->scrn->scrnIndex, X_ERRO...

...ivers/modesetting/driver.c | 10 +++++----- hw/xfree86/drivers/modesetting/drmmode_display.c | 5 +++-- hw/xfree86/drivers/modesetting/drmmode_display.h | 2 +- include/pixmap.h | 5 +++-- include/pixmapstr.h | 3 ++- include/scrnintstr.h | 6 +++--- randr/randrstr.h | 2 +- randr/rrcrtc.c | 20 +++++++++----------- 9 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dix/pixmap.c b/dix/pixmap.c index b67a2e8a6..81ac5e...

...+++ b/src/drmmode_display.c @@ -1556,6 +1556,15 @@ drmmode_udev_notify(int fd, int notify, void *data) } #endif +static bool has_randr(void) +{ +#if HAS_DIXREGISTERPRIVATEKEY + return dixPrivateKeyRegistered(rrPrivKey); +#else + return *rrPrivKey; +#endif +} + static void drmmode_uevent_init(ScrnInfoPtr scrn) { @@ -1564,6 +1573,12 @@ drmmode_uevent_init(ScrnInfoPtr scrn) struct udev *u; struct udev_monitor *mon; + /* RandR will be disabled if Xinerama is active, and so generating + * RR hotplug events is then forbidden. + */ + if (!has_randr()) + return; + u = udev_new(); if (...

...(at least so far), but the nouveau is still crashing the xserver. I still has to apply the following patch: diff --git a/src/drmmode_display.c b/src/drmmode_display.c index dd9fa27..a468223 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -1542,7 +1542,7 @@ drmmode_handle_uevents(ScrnInfoPtr scrn) if (!dev) return; - RRGetInfo(xf86ScrnToScreen(scrn), TRUE); + //RRGetInfo(xf86ScrnToScreen(scrn), TRUE); udev_device_unref(dev); } #endif Otherwise - when I turn on the TV on other Xorg instance (with intel driver), the xorg is crashing....

...t xf86_reload_cursors does (and more), so we don't need to call the latter anymore. Avoids gcc 8.2 warning: drmmode_display.c: In function ‘drmmode_set_mode_major’: drmmode_display.c:525:2: warning: ‘xf86_reload_cursors’ is deprecated [-Wdeprecated-declarations] xf86_reload_cursors(crtc->scrn->pScreen); ^~~~~~~~~~~~~~~~~~~ In file included from nv_type.h:10, from nv_include.h:69, from drmmode_display.c:36: /usr/include/xorg/xf86Crtc.h:1068:37: note: declared here static _X_INLINE _X_DEPRECATED void xf86_reload_cursors(ScreenPtr screen) {}...

...nouveau_present.c +++ b/src/nouveau_present.c @@ -46,9 +46,6 @@ nouveau_present_crtc(WindowPtr window) if (!crtc) return NULL; - if (crtc->rotatedData) - return NULL; - return crtc->randr_crtc; } @@ -152,7 +149,7 @@ nouveau_present_flip_check(RRCrtcPtr rrcrtc, WindowPtr window, ScrnInfoPtr scrn = xf86ScreenToScrn(window->drawable.pScreen); xf86CrtcPtr crtc = rrcrtc->devPrivate; - if (!scrn->vtSema || !drmmode_crtc_on(crtc)) + if (!scrn->vtSema || !drmmode_crtc_on(crtc) || crtc->rotatedData) return FALSE; return TRUE; -- 2.19.2

...il.l.velikov at gmail.com> --- src/nv_accel_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c index 4484c1c..eebb0ab 100644 --- a/src/nv_accel_common.c +++ b/src/nv_accel_common.c @@ -37,7 +37,7 @@ nouveau_allocate_surface(ScrnInfoPtr scrn, int width, int height, int bpp, Bool tiled = (usage_hint & NOUVEAU_CREATE_PIXMAP_TILED); Bool shared = FALSE; union nouveau_bo_config cfg = {}; - int flags = NOUVEAU_BO_MAP | (bpp >= 8 ? NOUVEAU_BO_VRAM : 0); + int flags; int cpp = bpp / 8, ret; #ifdef NOUVEAU_PIXMAP_...

...+), 40 deletions(-) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index f2fe0e8..7acddf1 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -333,7 +333,14 @@ done: static void drmmode_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg) { + NVPtr pNv = NVPTR(crtc->scrn); + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + struct nouveau_bo *bo = drmmode_crtc->cursor; + nouveau_bo_map(bo, NOUVEAU_BO_WR); + nv_cursor_convert_cursor(pNv->curImage, bo->map, nv_cursor_width(pNv), + 64, 32, fg | (0xff << 24), bg | (0xff << 24...

...+++ 3 files changed, 188 insertions(+), 14 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 3785956..2ad9932 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -267,7 +267,7 @@ can_exchange(DrawablePtr draw, PixmapPtr dst_pix, PixmapPtr src_pix) NVPtr pNv = NVPTR(scrn); int i; - if (!xf86_config->num_crtc) + if (xorgMir || !xf86_config->num_crtc) return FALSE; for (i = 0; i < xf86_config->num_crtc; i++) { @@ -290,7 +290,7 @@ can_sync_to_vblank(DrawablePtr draw) ScrnInfoPtr scrn = xf86ScreenToScrn(draw->pScreen); NVPtr pNv = NVPTR(sc...

[PATCH 1/3] kms: Don't hardcode the output properties [PATCH 2/3] kms: Implement output->get_property when RandR1.3 is available. [PATCH 3/3] kms: Add TV-out support src/drmmode_display.c | 403 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 261 insertions(+), 142 deletions(-)