dri-devel May 2015

dri-devel@lists.freedesktop.org

191 participants
1132 discussions

[PATCH 07/98] radeon_drm.h: use __u32 and __u64 from linux/types.h
by Mikko Rapeli 30 May '15

30 May '15

Fixes userspace compiler error: drm/radeon_drm.h:794:2: error: unknown type name ‘uint64_t’ Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/drm/radeon_drm.h | 129 +++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 64 deletions(-) diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 871e73f..5127092 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -33,6 +33,7 @@ #ifndef __RADEON_DRM_H__ #define __RADEON_DRM_H__ +#include <linux/types.h> #include <drm/drm.h> /* WARNING: If you change any of these defines, make sure to change the @@ -793,9 +794,9 @@ typedef struct drm_radeon_surface_free { #define RADEON_GEM_DOMAIN_VRAM 0x4 struct drm_radeon_gem_info { - uint64_t gart_size; - uint64_t vram_size; - uint64_t vram_visible; + __u64 gart_size; + __u64 vram_size; + __u64 vram_visible; }; #define RADEON_GEM_NO_BACKING_STORE (1 << 0) @@ -807,11 +808,11 @@ struct drm_radeon_gem_info { #define RADEON_GEM_NO_CPU_ACCESS (1 << 4) struct drm_radeon_gem_create { - uint64_t size; - uint64_t alignment; - uint32_t handle; - uint32_t initial_domain; - uint32_t flags; + __u64 size; + __u64 alignment; + __u32 handle; + __u32 initial_domain; + __u32 flags; }; /* @@ -825,10 +826,10 @@ struct drm_radeon_gem_create { #define RADEON_GEM_USERPTR_REGISTER (1 << 3) struct drm_radeon_gem_userptr { - uint64_t addr; - uint64_t size; - uint32_t flags; - uint32_t handle; + __u64 addr; + __u64 size; + __u32 flags; + __u32 handle; }; #define RADEON_TILING_MACRO 0x1 @@ -850,72 +851,72 @@ struct drm_radeon_gem_userptr { #define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK 0xf struct drm_radeon_gem_set_tiling { - uint32_t handle; - uint32_t tiling_flags; - uint32_t pitch; + __u32 handle; + __u32 tiling_flags; + __u32 pitch; }; struct drm_radeon_gem_get_tiling { - uint32_t handle; - uint32_t tiling_flags; - uint32_t pitch; + __u32 handle; + __u32 tiling_flags; + __u32 pitch; }; struct drm_radeon_gem_mmap { - uint32_t handle; - uint32_t pad; - uint64_t offset; - uint64_t size; - uint64_t addr_ptr; + __u32 handle; + __u32 pad; + __u64 offset; + __u64 size; + __u64 addr_ptr; }; struct drm_radeon_gem_set_domain { - uint32_t handle; - uint32_t read_domains; - uint32_t write_domain; + __u32 handle; + __u32 read_domains; + __u32 write_domain; }; struct drm_radeon_gem_wait_idle { - uint32_t handle; - uint32_t pad; + __u32 handle; + __u32 pad; }; struct drm_radeon_gem_busy { - uint32_t handle; - uint32_t domain; + __u32 handle; + __u32 domain; }; struct drm_radeon_gem_pread { /** Handle for the object being read. */ - uint32_t handle; - uint32_t pad; + __u32 handle; + __u32 pad; /** Offset into the object to read from */ - uint64_t offset; + __u64 offset; /** Length of data to read */ - uint64_t size; + __u64 size; /** Pointer to write the data into. */ /* void *, but pointers are not 32/64 compatible */ - uint64_t data_ptr; + __u64 data_ptr; }; struct drm_radeon_gem_pwrite { /** Handle for the object being written to. */ - uint32_t handle; - uint32_t pad; + __u32 handle; + __u32 pad; /** Offset into the object to write to */ - uint64_t offset; + __u64 offset; /** Length of data to write */ - uint64_t size; + __u64 size; /** Pointer to read the data from. */ /* void *, but pointers are not 32/64 compatible */ - uint64_t data_ptr; + __u64 data_ptr; }; /* Sets or returns a value associated with a buffer. */ struct drm_radeon_gem_op { - uint32_t handle; /* buffer */ - uint32_t op; /* RADEON_GEM_OP_* */ - uint64_t value; /* input or return value */ + __u32 handle; /* buffer */ + __u32 op; /* RADEON_GEM_OP_* */ + __u64 value; /* input or return value */ }; #define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0 @@ -935,11 +936,11 @@ struct drm_radeon_gem_op { #define RADEON_VM_PAGE_SNOOPED (1 << 4) struct drm_radeon_gem_va { - uint32_t handle; - uint32_t operation; - uint32_t vm_id; - uint32_t flags; - uint64_t offset; + __u32 handle; + __u32 operation; + __u32 vm_id; + __u32 flags; + __u64 offset; }; #define RADEON_CHUNK_ID_RELOCS 0x01 @@ -961,29 +962,29 @@ struct drm_radeon_gem_va { /* 0 = normal, + = higher priority, - = lower priority */ struct drm_radeon_cs_chunk { - uint32_t chunk_id; - uint32_t length_dw; - uint64_t chunk_data; + __u32 chunk_id; + __u32 length_dw; + __u64 chunk_data; }; /* drm_radeon_cs_reloc.flags */ #define RADEON_RELOC_PRIO_MASK (0xf << 0) struct drm_radeon_cs_reloc { - uint32_t handle; - uint32_t read_domains; - uint32_t write_domain; - uint32_t flags; + __u32 handle; + __u32 read_domains; + __u32 write_domain; + __u32 flags; }; struct drm_radeon_cs { - uint32_t num_chunks; - uint32_t cs_id; - /* this points to uint64_t * which point to cs chunks */ - uint64_t chunks; + __u32 num_chunks; + __u32 cs_id; + /* this points to __u64 * which point to cs chunks */ + __u64 chunks; /* updates to the limits after this CS ioctl */ - uint64_t gart_limit; - uint64_t vram_limit; + __u64 gart_limit; + __u64 vram_limit; }; #define RADEON_INFO_DEVICE_ID 0x00 @@ -1040,9 +1041,9 @@ struct drm_radeon_cs { #define RADEON_INFO_READ_REG 0x24 struct drm_radeon_info { - uint32_t request; - uint32_t pad; - uint64_t value; + __u32 request; + __u32 pad; + __u64 value; }; /* Those correspond to the tile index to use, this is to explicitly state -- 2.1.4

1 0

[PATCH 06/98] nouveau_drm.h: use __u32 and __u64 from linux/types.h
by Mikko Rapeli 30 May '15

30 May '15

Fixes userspace compilation errors like: drm/nouveau_drm.h:41:2: error: unknown type name ‘uint32_t’ Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/drm/nouveau_drm.h | 86 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h index 5507eea..638aa50 100644 --- a/include/uapi/drm/nouveau_drm.h +++ b/include/uapi/drm/nouveau_drm.h @@ -35,6 +35,8 @@ #define NOUVEAU_ABI16_DEVICE 0xdddddddd #define NOUVEAU_ABI16_CHAN(n) (0xcccc0000 | (n)) +#include <linux/types.h> + #define NOUVEAU_GEM_DOMAIN_CPU (1 << 0) #define NOUVEAU_GEM_DOMAIN_VRAM (1 << 1) #define NOUVEAU_GEM_DOMAIN_GART (1 << 2) @@ -49,34 +51,34 @@ #define NOUVEAU_GEM_TILE_NONCONTIG 0x00000008 struct drm_nouveau_gem_info { - uint32_t handle; - uint32_t domain; - uint64_t size; - uint64_t offset; - uint64_t map_handle; - uint32_t tile_mode; - uint32_t tile_flags; + __u32 handle; + __u32 domain; + __u64 size; + __u64 offset; + __u64 map_handle; + __u32 tile_mode; + __u32 tile_flags; }; struct drm_nouveau_gem_new { struct drm_nouveau_gem_info info; - uint32_t channel_hint; - uint32_t align; + __u32 channel_hint; + __u32 align; }; #define NOUVEAU_GEM_MAX_BUFFERS 1024 struct drm_nouveau_gem_pushbuf_bo_presumed { - uint32_t valid; - uint32_t domain; - uint64_t offset; + __u32 valid; + __u32 domain; + __u64 offset; }; struct drm_nouveau_gem_pushbuf_bo { - uint64_t user_priv; - uint32_t handle; - uint32_t read_domains; - uint32_t write_domains; - uint32_t valid_domains; + __u64 user_priv; + __u32 handle; + __u32 read_domains; + __u32 write_domains; + __u32 valid_domains; struct drm_nouveau_gem_pushbuf_bo_presumed presumed; }; @@ -85,46 +87,46 @@ struct drm_nouveau_gem_pushbuf_bo { #define NOUVEAU_GEM_RELOC_OR (1 << 2) #define NOUVEAU_GEM_MAX_RELOCS 1024 struct drm_nouveau_gem_pushbuf_reloc { - uint32_t reloc_bo_index; - uint32_t reloc_bo_offset; - uint32_t bo_index; - uint32_t flags; - uint32_t data; - uint32_t vor; - uint32_t tor; + __u32 reloc_bo_index; + __u32 reloc_bo_offset; + __u32 bo_index; + __u32 flags; + __u32 data; + __u32 vor; + __u32 tor; }; #define NOUVEAU_GEM_MAX_PUSH 512 struct drm_nouveau_gem_pushbuf_push { - uint32_t bo_index; - uint32_t pad; - uint64_t offset; - uint64_t length; + __u32 bo_index; + __u32 pad; + __u64 offset; + __u64 length; }; struct drm_nouveau_gem_pushbuf { - uint32_t channel; - uint32_t nr_buffers; - uint64_t buffers; - uint32_t nr_relocs; - uint32_t nr_push; - uint64_t relocs; - uint64_t push; - uint32_t suffix0; - uint32_t suffix1; - uint64_t vram_available; - uint64_t gart_available; + __u32 channel; + __u32 nr_buffers; + __u64 buffers; + __u32 nr_relocs; + __u32 nr_push; + __u64 relocs; + __u64 push; + __u32 suffix0; + __u32 suffix1; + __u64 vram_available; + __u64 gart_available; }; #define NOUVEAU_GEM_CPU_PREP_NOWAIT 0x00000001 #define NOUVEAU_GEM_CPU_PREP_WRITE 0x00000004 struct drm_nouveau_gem_cpu_prep { - uint32_t handle; - uint32_t flags; + __u32 handle; + __u32 flags; }; struct drm_nouveau_gem_cpu_fini { - uint32_t handle; + __u32 handle; }; #define DRM_NOUVEAU_GETPARAM 0x00 /* deprecated */ -- 2.1.4

1 0

[PATCH 04/98] drm_mode.h: use __u32 and __u64 from linux/types.h
by Mikko Rapeli 30 May '15

30 May '15

Fixes userspace compilation error: drm/drm_mode.h:472:2: error: unknown type name ‘uint32_t’ Signed-off-by: Mikko Rapeli <mikko.rapeli(a)iki.fi> --- include/uapi/drm/drm_mode.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index dbeba94..03e4d75 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -508,14 +508,14 @@ struct drm_mode_crtc_page_flip { /* create a dumb scanout buffer */ struct drm_mode_create_dumb { - uint32_t height; - uint32_t width; - uint32_t bpp; - uint32_t flags; + __u32 height; + __u32 width; + __u32 bpp; + __u32 flags; /* handle, pitch, size will be returned */ - uint32_t handle; - uint32_t pitch; - uint64_t size; + __u32 handle; + __u32 pitch; + __u64 size; }; /* set up for mmap of a dumb scanout buffer */ @@ -532,7 +532,7 @@ struct drm_mode_map_dumb { }; struct drm_mode_destroy_dumb { - uint32_t handle; + __u32 handle; }; /* page-flip flags are valid, plus: */ -- 2.1.4

1 0

[PATCH libdrm] Revert "Add device enumeration interface (v4)"
by Emil Velikov 30 May '15

30 May '15

This reverts commit fde4969176822fe54197b6baa78f8b0ef900baba. The commit adds an API that does not seem flexible enough to be used in current open-source projects. Additionally it adds a hidden dependency of libudev, which when used in mesa caused grief when combined with Steam('s runtime). Let's revert this for now and add a tweaked API later on that can be used in mesa/xserver. Cc: Frank Min <frank.min(a)amd.com> Cc: Christian König <christian.koenig(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Jammy Zhou <Jammy.Zhou(a)amd.com> --- Makefile.am | 7 ++--- xf86drm.c | 100 ------------------------------------------------------------ xf86drm.h | 19 ------------ 3 files changed, 2 insertions(+), 124 deletions(-) diff --git a/Makefile.am b/Makefile.am index ffd334a..13df80c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,15 +95,12 @@ SUBDIRS = \ libdrm_la_LTLIBRARIES = libdrm.la libdrm_ladir = $(libdir) libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined -libdrm_la_LIBADD = \ - @CLOCK_LIB@ \ - @LIBUDEV_LIBS@ +libdrm_la_LIBADD = @CLOCK_LIB@ libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm AM_CFLAGS = \ $(WARN_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - $(LIBUDEV_CFLAGS) + $(VALGRIND_CFLAGS) libdrm_la_SOURCES = $(LIBDRM_FILES) diff --git a/xf86drm.c b/xf86drm.c index 49da9c7..2c17d11 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -63,7 +63,6 @@ #include "xf86drm.h" #include "libdrm_macros.h" -#include "libudev.h" #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #define DRM_MAJOR 145 @@ -2816,102 +2815,3 @@ char *drmGetRenderDeviceNameFromFd(int fd) { return drmGetMinorNameForFD(fd, DRM_NODE_RENDER); } - -/** -* Enumerate the GPU devices on the system -* -* \param devs device array set to return the device information -* (if NULL, the number of device is returned) -* \param vendor the vendor ID for GPU devices to list -* (optional, if not specified, all GPU devices are returned) -* -* \return the number of GPU devices -*/ -int drmGetPciDevices(drmPciDevicePtr devSet, uint16_t vendorId) -{ - struct udev *udev = NULL; - struct udev_enumerate *udev_enumerate; - struct udev_list_entry *list_entry; - struct udev_device *device; - int drmDevCount = 0; - int vendor = 0; - int devid = 0; - int subvendor = 0; - int subdevid = 0; - int revid = 0xff; - int domain = 0; - int bus = 0; - int dev = 0; - int func = 0; - char config[64] = {0}; - char node[128] = {'\0'}; - char slot[] = "0000:00:00.0"; - const char *info = NULL; - int fd = 0; - int ret = 0; - - udev = udev_new(); - if (udev == NULL) { - fprintf(stderr, "no context\n"); - return -EINVAL; - } - udev_enumerate = udev_enumerate_new(udev); - if (udev_enumerate == NULL) - return -EINVAL; - udev_enumerate_add_match_subsystem(udev_enumerate, "drm"); - udev_enumerate_add_match_property(udev_enumerate, "DEVTYPE", "drm_minor"); - - udev_enumerate_scan_devices(udev_enumerate); - - udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(udev_enumerate)) { - device = udev_device_new_from_syspath(udev_enumerate_get_udev(udev_enumerate), - udev_list_entry_get_name(list_entry)); - if (device != NULL) { - info = udev_device_get_property_value(device, "MINOR"); - if (!strcmp(info, "0")) { - strcpy(node, udev_device_get_syspath(device)); - info = strstr(node, "/drm"); - strncpy(slot, info - strlen(slot), strlen(slot)); - if (sscanf(slot, "%4x:%2x:%2x.%1x", &domain, &bus, &dev, &func) != 4) { - domain = 0; - bus = 0; - dev = 0; - func = 0; - } - strcpy(node + strlen(node), "/device/config"); - - fd = open(node, O_RDONLY); - if (fd >= 0) { - ret = read(fd, config, 64); - if (ret == 64) { - vendor = config[0] + (config[1] << 8); - devid = config[2] + (config[3] << 8); - revid = config[8]; - subdevid = config[44] + (config[45] << 8); - } - close(fd); - } - - if((vendorId == 0) || (vendorId == vendor)) { - if(devSet != NULL) { - devSet[drmDevCount].domain = domain; - devSet[drmDevCount].bus = bus; - devSet[drmDevCount].dev = dev; - devSet[drmDevCount].func = func; - devSet[drmDevCount].vendor_id = vendor; - devSet[drmDevCount].device_id = devid; - devSet[drmDevCount].subdevice_id = subdevid; - devSet[drmDevCount].subvendor_id = subvendor; - devSet[drmDevCount].revision_id = revid; - } - drmDevCount++; - } - } - } - udev_device_unref(device); - } - udev_enumerate_unref(udev_enumerate); - udev_unref(udev); - - return drmDevCount; -} diff --git a/xf86drm.h b/xf86drm.h index 2610934..40c55c9 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -342,24 +342,6 @@ typedef struct _drmSetVersion { int drm_dd_minor; } drmSetVersion, *drmSetVersionPtr; -/** - * Structure to a general pci gpu device - * - * \sa drmGetDevices() - * -*/ -typedef struct _drmPciDevice { - uint16_t domain; - uint8_t bus; - uint8_t dev; - uint8_t func; - uint16_t vendor_id; - uint16_t device_id; - uint16_t subvendor_id; - uint16_t subdevice_id; - uint8_t revision_id; -} drmPciDevice, *drmPciDevicePtr; - #define __drm_dummy_lock(lock) (*(__volatile__ unsigned int *)lock) #define DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ @@ -570,7 +552,6 @@ do { register unsigned int __old __asm("o0"); \ /* General user-level programmer's API: unprivileged */ extern int drmAvailable(void); extern int drmOpen(const char *name, const char *busid); -extern int drmGetPciDevices(drmPciDevicePtr devSet, uint16_t vendorId); #define DRM_NODE_PRIMARY 0 #define DRM_NODE_CONTROL 1 -- 2.3.5

1 0

[Bug 86320] Monitor on DisplayPort doesn't wake up
by bugzilla-daemon＠freedesktop.org 30 May '15

30 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=86320 --- Comment #11 from Niels Ole Salscheider <niels_ole(a)salscheider-online.de> --- [I hit enter too fast] I mean, does your screen come back on when you enter the bios and then turn it off and on again? It does not for me (with two different mainboards) and it would be interesting to know if this is a common problem or not. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 86320] Monitor on DisplayPort doesn't wake up
by bugzilla-daemon＠freedesktop.org 30 May '15

30 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=86320 Niels Ole Salscheider <niels_ole(a)salscheider-online.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |niels_ole@salscheider-onlin | |e.de --- Comment #10 from Niels Ole Salscheider <niels_ole(a)salscheider-online.de> --- (In reply to Wolfgang Rupprecht from comment #9) > I can't tell if comment #8 was addressed to me or not. My bios screen is > fine as is the display during early stages of booting. The display was > also fine under the previous version of fedora. I don't believe it is a > hardware problem. It was addressed to anyone in this report who has this problem... -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 86320] Monitor on DisplayPort doesn't wake up
by bugzilla-daemon＠freedesktop.org 30 May '15

30 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=86320 --- Comment #9 from Wolfgang Rupprecht <wolfgang.rupprecht(a)gmail.com> --- I can't tell if comment #8 was addressed to me or not. My bios screen is fine as is the display during early stages of booting. The display was also fine under the previous version of fedora. I don't believe it is a hardware problem. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 86320] Monitor on DisplayPort doesn't wake up
by bugzilla-daemon＠freedesktop.org 30 May '15

30 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=86320 --- Comment #8 from Niels Ole Salscheider <niels_ole(a)salscheider-online.de> --- This sounds similar to https://bugs.freedesktop.org/show_bug.cgi?id=90340. Maybe you could try if the problem also occurs in your BIOS screen? I have found similar reports by windows users and it might really be some hw / cable issue. Apart from that it seems that most (all?) setups that cause problems have a screen with a 2560x1600 resolution... -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 86320] Monitor on DisplayPort doesn't wake up
by bugzilla-daemon＠freedesktop.org 29 May '15

29 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=86320 --- Comment #7 from Wolfgang Rupprecht <wolfgang.rupprecht(a)gmail.com> --- typo. That should be ATI Firepro 2460. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 86320] Monitor on DisplayPort doesn't wake up
by bugzilla-daemon＠freedesktop.org 29 May '15

29 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=86320 Wolfgang Rupprecht <wolfgang.rupprecht(a)gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |wolfgang.rupprecht(a)gmail.co | |m --- Comment #6 from Wolfgang Rupprecht <wolfgang.rupprecht(a)gmail.com> --- Created attachment 116162 --> https://bugs.freedesktop.org/attachment.cgi?id=116162&action=edit xorg log via journalctl -b0 | grep gdm I see a similar failure with two Samsung Syncmaster SA850 monitors on an ATI Firepro 2260 quad displayport framebuffer and 4.x kernels on Fedora-22. Fedora-21 and 3.x kernels worked fine. -- You are receiving this mail because: You are the assignee for the bug.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2015