geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-gem

main
Jerome Glisse 2008-10-27 19:33:56 +01:00
parent 7617d1fef7 389b7617b5
commit 3b17b50e9c
3 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdrm/xf86drmMode.c
View File

@ -308,7 +308,7 @@ int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t width
struct drm_mode_cursor arg; struct drm_mode_cursor arg;
arg.flags = DRM_MODE_CURSOR_BO; arg.flags = DRM_MODE_CURSOR_BO;
arg.crtc = crtcId; arg.crtc_id = crtcId;
arg.width = width; arg.width = width;
arg.height = height; arg.height = height;
arg.handle = bo_handle; arg.handle = bo_handle;
@ -321,7 +321,7 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
struct drm_mode_cursor arg; struct drm_mode_cursor arg;
arg.flags = DRM_MODE_CURSOR_MOVE; arg.flags = DRM_MODE_CURSOR_MOVE;
arg.crtc = crtcId; arg.crtc_id = crtcId;
arg.x = x; arg.x = x;
arg.y = y; arg.y = y;

4
linux-core/drm_crtc.c
View File

@ -1448,9 +1448,9 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
} }
mutex_lock(&dev->mode_config.mutex); mutex_lock(&dev->mode_config.mutex);
obj = drm_mode_object_find(dev, req->crtc, DRM_MODE_OBJECT_CRTC); obj = drm_mode_object_find(dev, req->crtc_id, DRM_MODE_OBJECT_CRTC);
if (!obj) { if (!obj) {
DRM_DEBUG("Unknown CRTC ID %d\n", req->crtc); DRM_DEBUG("Unknown CRTC ID %d\n", req->crtc_id);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }

82
shared-core/drm_mode.h
View File

@ -81,14 +81,14 @@
#define DRM_MODE_DITHERING_ON 1 #define DRM_MODE_DITHERING_ON 1
struct drm_mode_modeinfo { struct drm_mode_modeinfo {
unsigned int clock; uint32_t clock;
unsigned short hdisplay, hsync_start, hsync_end, htotal, hskew; uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew;
unsigned short vdisplay, vsync_start, vsync_end, vtotal, vscan; uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan;
unsigned int vrefresh; /* vertical refresh * 1000 */ uint32_t vrefresh; /* vertical refresh * 1000 */
unsigned int flags; uint32_t flags;
unsigned int type; uint32_t type;
char name[DRM_DISPLAY_MODE_LEN]; char name[DRM_DISPLAY_MODE_LEN];
}; };
@ -97,25 +97,25 @@ struct drm_mode_card_res {
uint64_t crtc_id_ptr; uint64_t crtc_id_ptr;
uint64_t connector_id_ptr; uint64_t connector_id_ptr;
uint64_t encoder_id_ptr; uint64_t encoder_id_ptr;
int count_fbs; uint32_t count_fbs;
int count_crtcs; uint32_t count_crtcs;
int count_connectors; uint32_t count_connectors;
int count_encoders; uint32_t count_encoders;
int min_width, max_width; uint32_t min_width, max_width;
int min_height, max_height; uint32_t min_height, max_height;
}; };
struct drm_mode_crtc { struct drm_mode_crtc {
uint64_t set_connectors_ptr; uint64_t set_connectors_ptr;
int count_connectors; uint32_t count_connectors;
unsigned int crtc_id; /**< Id */ unsigned int crtc_id; /**< Id */
unsigned int fb_id; /**< Id of framebuffer */ unsigned int fb_id; /**< Id of framebuffer */
int x, y; /**< Position on the frameuffer */ uint32_t x, y; /**< Position on the frameuffer */
uint32_t gamma_size; uint32_t gamma_size;
int mode_valid; uint32_t mode_valid;
struct drm_mode_modeinfo mode; struct drm_mode_modeinfo mode;
}; };
@ -126,12 +126,11 @@ struct drm_mode_crtc {
#define DRM_MODE_ENCODER_TVDAC 4 #define DRM_MODE_ENCODER_TVDAC 4
struct drm_mode_get_encoder { struct drm_mode_get_encoder {
unsigned int encoder_type;
unsigned int encoder_id; unsigned int encoder_id;
unsigned int crtc_id; /**< Id of crtc */ unsigned int crtc_id; /**< Id of crtc */
uint32_t encoder_type;
uint32_t possible_crtcs; uint32_t possible_crtcs;
uint32_t possible_clones; uint32_t possible_clones;
}; };
@ -167,18 +166,18 @@ struct drm_mode_get_connector {
uint64_t props_ptr; uint64_t props_ptr;
uint64_t prop_values_ptr; uint64_t prop_values_ptr;
int count_modes; uint32_t count_modes;
int count_props; uint32_t count_props;
int count_encoders; uint32_t count_encoders;
unsigned int encoder_id; /**< Current Encoder */ unsigned int encoder_id; /**< Current Encoder */
unsigned int connector_id; /**< Id */ unsigned int connector_id; /**< Id */
unsigned int connector_type; unsigned int connector_type;
unsigned int connector_type_id; unsigned int connector_type_id;
unsigned int connection; uint32_t connection;
unsigned int mm_width, mm_height; /**< HxW in millimeters */ uint32_t mm_width, mm_height; /**< HxW in millimeters */
unsigned int subpixel; uint32_t subpixel;
}; };
#define DRM_MODE_PROP_PENDING (1<<0) #define DRM_MODE_PROP_PENDING (1<<0)
@ -197,11 +196,11 @@ struct drm_mode_get_property {
uint64_t enum_blob_ptr; /* enum and blob id ptrs */ uint64_t enum_blob_ptr; /* enum and blob id ptrs */
unsigned int prop_id; unsigned int prop_id;
unsigned int flags; uint32_t flags;
unsigned char name[DRM_PROP_NAME_LEN]; unsigned char name[DRM_PROP_NAME_LEN];
int count_values; uint32_t count_values;
int count_enum_blobs; uint32_t count_enum_blobs;
}; };
struct drm_mode_connector_set_property { struct drm_mode_connector_set_property {
@ -218,11 +217,12 @@ struct drm_mode_get_blob {
struct drm_mode_fb_cmd { struct drm_mode_fb_cmd {
unsigned int buffer_id; unsigned int buffer_id;
unsigned int width, height; uint32_t width, height;
unsigned int pitch; uint32_t pitch;
unsigned int bpp; uint32_t bpp;
unsigned int handle; uint32_t handle;
unsigned int depth; uint32_t depth;
}; };
struct drm_mode_mode_cmd { struct drm_mode_mode_cmd {
@ -230,8 +230,8 @@ struct drm_mode_mode_cmd {
struct drm_mode_modeinfo mode; struct drm_mode_modeinfo mode;
}; };
#define DRM_MODE_CURSOR_BO 0x01 #define DRM_MODE_CURSOR_BO (1<<0)
#define DRM_MODE_CURSOR_MOVE 0x02 #define DRM_MODE_CURSOR_MOVE (1<<1)
/* /*
* depending on the value in flags diffrent members are used. * depending on the value in flags diffrent members are used.
@ -248,13 +248,14 @@ struct drm_mode_mode_cmd {
* y * y
*/ */
struct drm_mode_cursor { struct drm_mode_cursor {
unsigned int flags; uint32_t flags;
unsigned int crtc; unsigned int crtc_id;
int x; int32_t x;
int y; int32_t y;
uint32_t width; uint32_t width;
uint32_t height; uint32_t height;
unsigned int handle; /* driver specific handle */
uint32_t handle;
}; };
/* /*
@ -265,8 +266,7 @@ struct drm_mode_hotplug {
}; };
struct drm_mode_crtc_lut { struct drm_mode_crtc_lut {
unsigned int crtc_id;
uint32_t crtc_id;
uint32_t gamma_size; uint32_t gamma_size;
/* pointers to arrays */ /* pointers to arrays */