modesetting: Fix ifdefs s/HAVE_UDEV/CONFIG_UDEV_KMS/
We don't define HAVE_UDEV, that's a remnant from xf86-video-modesetting. But, we have CONFIG_UDEV_KMS. Signed-off-by: Daniel Martin <consume.noise@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
8a16620dcd
commit
c0ea476b9b
|
@ -1487,7 +1487,7 @@ drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_UDEV
|
#ifdef CONFIG_UDEV_KMS
|
||||||
static void
|
static void
|
||||||
drmmode_handle_uevents(int fd, void *closure)
|
drmmode_handle_uevents(int fd, void *closure)
|
||||||
{
|
{
|
||||||
|
@ -1507,7 +1507,7 @@ drmmode_handle_uevents(int fd, void *closure)
|
||||||
void
|
void
|
||||||
drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
|
drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_UDEV
|
#ifdef CONFIG_UDEV_KMS
|
||||||
struct udev *u;
|
struct udev *u;
|
||||||
struct udev_monitor *mon;
|
struct udev_monitor *mon;
|
||||||
|
|
||||||
|
@ -1540,7 +1540,7 @@ drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
|
||||||
void
|
void
|
||||||
drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
|
drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_UDEV
|
#ifdef CONFIG_UDEV_KMS
|
||||||
if (drmmode->uevent_handler) {
|
if (drmmode->uevent_handler) {
|
||||||
struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
|
struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#define DRMMODE_DISPLAY_H
|
#define DRMMODE_DISPLAY_H
|
||||||
|
|
||||||
#include "xf86drmMode.h"
|
#include "xf86drmMode.h"
|
||||||
#ifdef HAVE_UDEV
|
#ifdef CONFIG_UDEV_KMS
|
||||||
#include "libudev.h"
|
#include "libudev.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@ typedef struct {
|
||||||
drmModeFBPtr mode_fb;
|
drmModeFBPtr mode_fb;
|
||||||
int cpp;
|
int cpp;
|
||||||
ScrnInfoPtr scrn;
|
ScrnInfoPtr scrn;
|
||||||
#ifdef HAVE_UDEV
|
#ifdef CONFIG_UDEV_KMS
|
||||||
struct udev_monitor *uevent_monitor;
|
struct udev_monitor *uevent_monitor;
|
||||||
InputHandlerProc uevent_handler;
|
InputHandlerProc uevent_handler;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user