blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split DRM internal interface to its own header

This commit is contained in:
Scott Anderson 2017-09-30 19:11:41 +13:00
parent 610b0493ac
commit d0708b1a3a
5 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/drm/drm.c
View File

@ -21,12 +21,10 @@
#include <wlr/render/gles2.h> #include <wlr/render/gles2.h>
#include <wlr/render.h> #include <wlr/render.h>
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "backend/drm/iface.h"
#include "backend/drm/util.h" #include "backend/drm/util.h"
bool wlr_drm_check_features(struct wlr_drm_backend *backend) { bool wlr_drm_check_features(struct wlr_drm_backend *backend) {
extern const struct wlr_drm_interface iface_legacy;
extern const struct wlr_drm_interface iface_atomic;
if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) { if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
wlr_log(L_ERROR, "DRM universal planes unsupported"); wlr_log(L_ERROR, "DRM universal planes unsupported");
return false; return false;

1
backend/drm/iface_atomic.c
View File

@ -3,6 +3,7 @@
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "backend/drm/iface.h"
#include "backend/drm/util.h" #include "backend/drm/util.h"
struct atomic { struct atomic {

1
backend/drm/iface_legacy.c
View File

@ -3,6 +3,7 @@
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "backend/drm/iface.h"
#include "backend/drm/util.h" #include "backend/drm/util.h"
static bool legacy_crtc_pageflip(struct wlr_drm_backend *backend, static bool legacy_crtc_pageflip(struct wlr_drm_backend *backend,

18
include/backend/drm/drm.h
View File

@ -15,6 +15,7 @@
#include <wlr/egl.h> #include <wlr/egl.h>
#include <wlr/util/list.h> #include <wlr/util/list.h>
#include "iface.h"
#include "properties.h" #include "properties.h"
struct wlr_drm_plane { struct wlr_drm_plane {
@ -156,23 +157,6 @@ struct wlr_drm_output {
struct wl_event_source *retry_pageflip; struct wl_event_source *retry_pageflip;
}; };
// Used to provide atomic or legacy DRM functions
struct wlr_drm_interface {
// Enable or disable DPMS for output
void (*conn_enable)(struct wlr_drm_backend *backend,
struct wlr_drm_output *output, bool enable);
// Pageflip on crtc. If mode is non-NULL perform a full modeset using it.
bool (*crtc_pageflip)(struct wlr_drm_backend *backend,
struct wlr_drm_output *output, struct wlr_drm_crtc *crtc,
uint32_t fb_id, drmModeModeInfo *mode);
// Enable the cursor buffer on crtc. Set bo to NULL to disable
bool (*crtc_set_cursor)(struct wlr_drm_backend *backend,
struct wlr_drm_crtc *crtc, struct gbm_bo *bo);
// Move the cursor on crtc
bool (*crtc_move_cursor)(struct wlr_drm_backend *backend,
struct wlr_drm_crtc *crtc, int x, int y);
};
bool wlr_drm_check_features(struct wlr_drm_backend *drm); bool wlr_drm_check_features(struct wlr_drm_backend *drm);
bool wlr_drm_resources_init(struct wlr_drm_backend *drm); bool wlr_drm_resources_init(struct wlr_drm_backend *drm);
void wlr_drm_resources_free(struct wlr_drm_backend *drm); void wlr_drm_resources_free(struct wlr_drm_backend *drm);

35
include/backend/drm/iface.h Normal file
View File

@ -0,0 +1,35 @@
#ifndef BACKEND_DRM_IFACE_H
#define BACKEND_DRM_IFACE_H
#include <stdbool.h>
#include <stdint.h>
#include <gbm.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
struct wlr_drm_backend;
struct wlr_drm_output;
struct wlr_drm_crtc;
// Used to provide atomic or legacy DRM functions
struct wlr_drm_interface {
// Enable or disable DPMS for output
void (*conn_enable)(struct wlr_drm_backend *backend,
struct wlr_drm_output *output, bool enable);
// Pageflip on crtc. If mode is non-NULL perform a full modeset using it.
bool (*crtc_pageflip)(struct wlr_drm_backend *backend,
struct wlr_drm_output *output, struct wlr_drm_crtc *crtc,
uint32_t fb_id, drmModeModeInfo *mode);
// Enable the cursor buffer on crtc. Set bo to NULL to disable
bool (*crtc_set_cursor)(struct wlr_drm_backend *backend,
struct wlr_drm_crtc *crtc, struct gbm_bo *bo);
// Move the cursor on crtc
bool (*crtc_move_cursor)(struct wlr_drm_backend *backend,
struct wlr_drm_crtc *crtc, int x, int y);
};
extern const struct wlr_drm_interface iface_atomic;
extern const struct wlr_drm_interface iface_legacy;
#endif