Skip to content

Commit

Permalink
Add missing libdrm bits from upstream after 6cafa0b
Browse files Browse the repository at this point in the history
In file included from cmrtlib/linux/hardware/cm_device_os.cpp:24:
cmrtlib/linux/../linux/hardware/drm_device.h:254:19: error: use of undeclared identifier 'DRM_MAJOR'
    return maj == DRM_MAJOR;
                  ^
  • Loading branch information
jbeich committed Mar 15, 2020
1 parent 718ae1d commit 1792489
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions cmrtlib/linux/hardware/drm_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,26 @@
#define MAP_FAILED ((void *)-1)
#endif

#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#define DRM_MAJOR 145
#endif

#ifdef __NetBSD__
#define DRM_MAJOR 34
#endif

#ifdef __OpenBSD__
#ifdef __i386__
#define DRM_MAJOR 88
#else
#define DRM_MAJOR 87
#endif
#endif /* __OpenBSD__ */

#ifndef DRM_MAJOR
#define DRM_MAJOR 226 /* Linux */
#endif

#define DRM_DEV_UID 0
#define DRM_DEV_GID 0
/* Default /dev/dri directory permissions 0755 */
Expand Down Expand Up @@ -514,6 +534,7 @@ get_pci_path(int maj, int min, char *pci_path)
*term = 0;
}

#ifdef __linux__
static int parse_separate_sysfs_files(int maj, int min,
drmPciDeviceInfoPtr device,
bool ignore_revision)
Expand Down Expand Up @@ -650,19 +671,19 @@ static int parse_config_sysfs_file(int maj, int min,

return 0;
}
#endif

static int drmParsePciDeviceInfo(int maj, int min,
drmPciDeviceInfoPtr device,
uint32_t flags)
{
//#ifdef __linux__
#ifdef __linux__
if (!(flags & DRM_DEVICE_GET_PCI_REVISION))
return parse_separate_sysfs_files(maj, min, device, true);

if (parse_separate_sysfs_files(maj, min, device, false))
return parse_config_sysfs_file(maj, min, device);
return 0;
/*
#elif defined(__OpenBSD__) || defined(__DragonFly__)
struct drm_pciinfo pinfo;
int fd, type;
Expand Down Expand Up @@ -692,7 +713,6 @@ static int drmParsePciDeviceInfo(int maj, int min,
#warning "Missing implementation of drmParsePciDeviceInfo"
return -EINVAL;
#endif
*/
}

static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
Expand Down

0 comments on commit 1792489

Please sign in to comment.