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

modesetting: pass file_priv into cursor set functions

main
Dave Airlie 2008-07-26 08:41:01 +10:00
parent fb05c4d621
commit 11d3075087
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-core/drm_crtc.c
View File

@ -1445,7 +1445,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
if (req->flags & DRM_MODE_CURSOR_BO) {
/* Turn of the cursor if handle is 0 */
if (crtc->funcs->cursor_set) {
ret = crtc->funcs->cursor_set(crtc, req->handle, req->width, req->height);
ret = crtc->funcs->cursor_set(crtc, file_priv, req->handle, req->width, req->height);
} else {
DRM_ERROR("crtc does not support cursor\n");
ret = -EFAULT;

4
linux-core/drm_crtc.h
View File

@ -299,8 +299,8 @@ struct drm_crtc_funcs {
void (*restore)(struct drm_crtc *crtc); /* resume? */
/* cursor controls */
int (*cursor_set)(struct drm_crtc *crtc, uint32_t buffer_handle,
uint32_t width, uint32_t height);
int (*cursor_set)(struct drm_crtc *crtc, struct drm_file *file_priv,
uint32_t handle, uint32_t width, uint32_t height);
int (*cursor_move)(struct drm_crtc *crtc, int x, int y);
/* Set gamma on the CRTC */

1
linux-core/intel_display.c
View File

@ -975,6 +975,7 @@ void intel_crtc_load_lut(struct drm_crtc *crtc)
}
static int intel_crtc_cursor_set(struct drm_crtc *crtc,
struct drm_file *file_priv,
uint32_t handle,
uint32_t width, uint32_t height)
{

6
linux-core/nv50_kms_wrapper.c
View File

@ -236,8 +236,10 @@ static const struct drm_mode_config_funcs nv50_kms_mode_funcs = {
* CRTC functions.
*/
static int nv50_kms_crtc_cursor_set(struct drm_crtc *drm_crtc, uint32_t buffer_handle,
uint32_t width, uint32_t height)
static int nv50_kms_crtc_cursor_set(struct drm_crtc *drm_crtc,
struct drm_file *file_priv,
uint32_t buffer_handle,
uint32_t width, uint32_t height)
{
struct nv50_crtc *crtc = to_nv50_crtc(drm_crtc);
struct nv50_display *display = nv50_get_display(crtc->dev);