Displaying 20 results from an estimated 93 matches for "scrninfoptr".
2007 May 30
0
[PATCH] added comments
...IMAGES_ALL] =
XVIMAGE_RGB
};
+/**
+ * NVSetPortDefaults
+ * set attributes of port "pPriv" to complied-in (except for colorKey) defaults
+ *
+ * @param pScrnInfo screen to get the default colorKey from
+ * @param pPriv port to reset to defaults
+ */
static void
NVSetPortDefaults (ScrnInfoPtr pScrnInfo, NVPortPrivPtr pPriv)
{
@@ -155,9 +171,12 @@ NVSetPortDefaults (ScrnInfoPtr pScrnInfo, NVPortPrivPtr pPriv)
pPriv->iturbt_709 = FALSE;
}
-
+/**
+ * NVResetVideo
+ * writes the current attributes from the overlay port to the hardware
+ */
void
-NVResetVideo (ScrnInfoPtr pScrnIn...
2012 Jul 27
1
[PATCH] nvc0: Add and enable vblank support
...(dst_pix, REGION_EXTENTS(0, ®));
+ else
if (pNv->Architecture >= NV_ARCH_50)
NV50SyncToVBlank(dst_pix, REGION_EXTENTS(0, ®));
else
diff --git a/src/nv_dma.c b/src/nv_dma.c
index d2a6d00..47c7e12 100644
--- a/src/nv_dma.c
+++ b/src/nv_dma.c
@@ -63,6 +63,18 @@ NVInitDma(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Opened GPU channel %d\n", fifo->channel);
+ if (pNv->Architecture >= NV_ARCH_C0) {
+ struct nvc0_fifo *data = (struct nvc0_fifo *)fifo;
+ ret = nouveau_bo_wrap(pNv->dev, data->notify,
+ &...
2015 Mar 21
0
[PATCH] use defined method names where available
...ccel_common.c | 6 +++---
src/nvc0_accel.c | 4 ++--
src/nvc0_exa.c | 2 +-
10 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/nv10_exa.c b/src/nv10_exa.c
index 78bc739..7daa281 100644
--- a/src/nv10_exa.c
+++ b/src/nv10_exa.c
@@ -697,9 +697,9 @@ NVAccelInitNV10TCL(ScrnInfoPtr pScrn)
PUSH_DATA (push, 0);
}
- BEGIN_NV04(push, SUBC_3D(0x290), 1);
+ BEGIN_NV04(push, NV10_3D(UNK0290), 1);
PUSH_DATA (push, (0x10<<16)|1);
- BEGIN_NV04(push, SUBC_3D(0x3f4), 1);
+ BEGIN_NV04(push, NV10_3D(UNK03F4), 1);
PUSH_DATA (push, 0);
BEGIN_NV04(push, NV04_GRAPH(3D, NOP...
2013 Jul 22
0
[RFC PATCH] Support running nested in a Mir compositor
...wablePtr 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(scrn);
- return pNv->glx_vblank &&
+ return pNv->glx_vblank && !xorgMir &&
nv_window_belongs_to_crtc(scrn, draw->x, draw->y,
draw->width, draw->height);
}
@@ -766,6 +766,19 @@ nouv...
2015 Jun 28
3
[PATCH] Take shift in crtc positions for ZaphodHeads configs into account.
...e at gmail.com>
---
src/drmmode_display.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c30cb3a..3679482 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1214,7 +1214,7 @@ drmmode_zaphod_match(ScrnInfoPtr pScrn, const char *s, char *output_name)
}
static unsigned int
-drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
+drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int crtcshift)
{
NVPtr pNv = NVPTR(pScrn);
xf86OutputPtr output;
@@ -1296,8 +1296,8 @@...
2012 May 23
1
[PATCH (nouveau)] Add xwayland support
...d.h>
+#endif
#if defined(DRI2) && DRI2INFOREC_VERSION >= 3
struct nouveau_dri2_buffer {
@@ -660,6 +664,32 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec,
free(flip);
}
+#ifdef XORG_WAYLAND
+static int nouveau_auth_magic(int fd, uint32_t magic)
+{
+ ScrnInfoPtr pScrn;
+ NVPtr pNv;
+ int i;
+
+ /* Not wayland, go stragight to drm */
+ if (!xorgWayland)
+ return drmAuthMagic(fd, magic);
+
+ /* Technically this should actually iterate over xf86Screens.
+ Since direct access to xf86Screens is going away, though,
+ we don't bother right now */
+ fo...
2018 Jan 13
0
[PATCH] drmmode: update logic for dynamic connectors, paths, and tiles
...+++++++++++++++++++++++++++++++++++++++--------
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;
dr...
2017 Apr 18
0
[PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr
...e amdgpu_is_gpu_scrn(scrn) 0
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 0182cbe0a..29d3d076f 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -448,7 +448,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
static void
redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
{
- ScrnInfoPtr scrn = xf86ScreenToScrn(dirty->src->drawable.pScreen);
+ ScrnInfoPtr scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
if (RegionNil(region))
goto out;
@@ -481,12 +481,12 @@ amdgpu_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
void
amdgpu_sync_shared...
2018 Oct 09
0
[PATCH] drmmode: update logic for dynamic connectors, paths, and tiles
...++++++++++++++++++++++++++++++++++++++++-------
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;
dr...
2015 Mar 14
1
[PATCH ddx] Add support for VRAM-less devices to the ddx
...ouveau_pixmap_bo(pdpix), NOUVEAU_BO_APER,
dst_pitch, pdpix->drawable.height, x, y))
goto memcpy;
diff --git a/src/nv_accel_common.c b/src/nv_accel_common.c
index 4484c1c..e1a8a12 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 = NOUVEAU_BO_MAP;
int cpp = bpp / 8, ret;
#ifdef NOUVE...
2012 Jul 04
0
[PATCH] Add xwayland support (v2)
...nouveau_dri2.c
index 0b3cc38..c7f769d 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -653,6 +653,21 @@ nouveau_dri2_flip_event_handler(unsigned int frame, unsigned int tv_sec,
free(flip);
}
+#ifdef XORG_WAYLAND
+static int nouveau_auth_magic(ScreenPtr pScreen, uint32_t magic)
+{
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
+ NVPtr pNv = NVPTR(pScrn);
+
+ /* Not wayland, go stragight to drm */
+ if (!xorgWayland)
+ return drmAuthMagic(pNv->dev->fd, magic);
+
+ /* Forward the request to our host */
+ return xwl_drm_authenticate(pNv->xwl_screen, magic);
+}
+#endif
+
Bool
no...
2012 Nov 01
5
[PATCH 0/4] nouveau: xserver 1.13 compat fixes
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
2017 Mar 04
0
[DDX PATCH] Consider CRTCs disabled when DPMS is off
...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/nouveau_dri2...
2010 Feb 09
1
[PATCH] Remove some UMS leftovers.
...)
return FALSE;
@@ -350,8 +345,6 @@ NVEnterVT(int scrnIndex, int flags)
/*
* This is called when VT switching away from the X server. Its job is
* to restore the previous (text) mode.
- *
- * We may wish to remap video/MMIO memory too.
*/
/* Mandatory */
@@ -586,24 +579,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
MessageType from;
int ret, i;
- if (flags & PROBE_DETECT) {
- EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
-
- if (!pEnt)
- return FALSE;
-
- i = pEnt->index;
- xfree(pEnt);
-
- if (xf86LoadSubModule(pScrn, "vbe")) {
- vbeInfoPtr...
2015 Aug 06
0
[PATCH] Take shift in crtc positions for ZaphodHeads configs into account.
...e_display.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/src/drmmode_display.c b/src/drmmode_display.c
> index c30cb3a..3679482 100644
> --- a/src/drmmode_display.c
> +++ b/src/drmmode_display.c
> @@ -1214,7 +1214,7 @@ drmmode_zaphod_match(ScrnInfoPtr pScrn, const char *s, char *output_name)
> }
>
> static unsigned int
> -drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
> +drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int crtcshift)
> {
> NVPtr pNv = NVPTR(pScrn);
>...
2010 Apr 20
1
[PATCH] nv30/exa : cleanup from nv40 exa
...nt i = 0;
- for(i=0;i<sizeof(NV30SurfaceFormat)/sizeof(NV30SurfaceFormat[0]);i++)
- {
+ while (NV30SurfaceFormat[i].pict_fmt != -1) {
if (NV30SurfaceFormat[i].pict_fmt == format)
return &NV30SurfaceFormat[i];
+ i++;
}
return NULL;
@@ -123,106 +125,72 @@ NV30EXAHackupA8Shaders(ScrnInfoPtr pScrn)
}
}
-/* should be in nouveau_reg.h at some point.. */
-#define NV34TCL_TX_SWIZZLE_UNIT_S0_X_ZERO 0
-#define NV34TCL_TX_SWIZZLE_UNIT_S0_X_ONE 1
-#define NV34TCL_TX_SWIZZLE_UNIT_S0_X_S1 2
-
-#define NV34TCL_TX_SWIZZLE_UNIT_S0_X_SHIFT 14
-#define NV34TCL_TX_SWIZZLE_UNIT_S0_Y_SHIFT 12
-...
2009 Jun 10
0
[PATCH] Use nanosleep instead of usleep when waiting the hardware.
...2 +-
src/nv_include.h | 1 +
src/nv_output.c | 10 +++++-----
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/nouveau_hw.c b/src/nouveau_hw.c
index 7d210d7..c2cad37 100644
--- a/src/nouveau_hw.c
+++ b/src/nouveau_hw.c
@@ -208,7 +208,7 @@ static void setPLL_single(ScrnInfoPtr pScrn, uint32_t reg,
if (chip_version < 0x17 && chip_version != 0x11)
/* wait a bit on older chips */
- usleep(64000);
+ nouveau_usleep(64000);
NVReadRAMDAC(pNv, 0, reg);
/* then write the other half as well */
diff --git a/src/nouveau_local.h b/src/nouveau_local.h
index d...
2009 Feb 26
2
[PATCH 1/2] exa: turn WaitMarker into a NOP.
- map should handle this.
---
src/nouveau_exa.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
index b656ca7..20ad380 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -259,7 +259,7 @@ nouveau_exa_mark_sync(ScreenPtr pScreen)
static void
nouveau_exa_wait_marker(ScreenPtr pScreen, int marker)
{
-
2010 Feb 05
1
[PATCH] nv50/accel: Fix mangled A8+A8 shader.
...remaining G, B outputs aren't actually used.
---
src/nv50_accel.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/nv50_accel.c b/src/nv50_accel.c
index 5fa539c..1218e18 100644
--- a/src/nv50_accel.c
+++ b/src/nv50_accel.c
@@ -291,7 +291,7 @@ NVAccelInitNV50TCL(ScrnInfoPtr pScrn)
OUT_RING (chan, (0 << NV50TCL_CB_DEF_SET_BUFFER_SHIFT) | 0x4000);
BEGIN_RING(chan, tesla, NV50TCL_CB_ADDR, 1);
OUT_RING (chan, 0);
- BEGIN_RING_NI(chan, tesla, NV50TCL_CB_DATA(0), 15);
+ BEGIN_RING_NI(chan, tesla, NV50TCL_CB_DATA(0), 16);
OUT_RING (chan, 0x80000000);
OUT_R...
2009 Mar 08
4
[PATCH 1/5] nv50: implement wfb
...git a/src/nouveau_exa.c b/src/nouveau_exa.c
index 93fc3c5..074a226 100644
--- a/src/nouveau_exa.c
+++ b/src/nouveau_exa.c
@@ -259,7 +259,11 @@ nouveau_exa_mark_sync(ScreenPtr pScreen)
static void
nouveau_exa_wait_marker(ScreenPtr pScreen, int marker)
{
- NVSync(xf86Screens[pScreen->myNum]);
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ NVPtr pNv = NVPTR(pScrn);
+
+ if (!pNv->exa_driver_pixmaps)
+ NVSync(xf86Screens[pScreen->myNum]);
}
static Bool
@@ -351,17 +355,16 @@ nouveau_exa_modify_pixmap_header(PixmapPtr ppix, int width, int height,
if (!nvpix->bo && nvpix-...