fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2025-12-20 03:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert drm_i915_flip_t braindamage

Browse source 
I should not have renamed this field.
I should not have renamed this field.
I should not have renamed this field.

On the plus side, it was at least binary compatible.
This commit is contained in:
Jesse Barnes 2007-09-28 10:10:08 -07:00 • committed by Michel Dänzer
parent bc5423f168
commit b3134ddf50
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shared-core/i915_dma.c
View file

@ -755,13 +755,14 @@ static int i915_flip_bufs(struct drm_device *dev, void *data, struct drm_file *f
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (param->planes & ~0x3) { /* This is really planes */
if (param->pipes & ~0x3) {
DRM_ERROR("Invalid planes 0x%x, only <= 0x3 is valid\n", DRM_ERROR("Invalid planes 0x%x, only <= 0x3 is valid\n",
param->planes); param->pipes);
return -EINVAL; return -EINVAL;
} }
i915_dispatch_flip(dev, param->planes, 0); i915_dispatch_flip(dev, param->pipes, 0);
return 0; return 0;
} }

8
shared-core/i915_drm.h
View file

@ -182,7 +182,13 @@ typedef struct _drm_i915_sarea {
/* Asynchronous page flipping: /* Asynchronous page flipping:
*/ */
typedef struct drm_i915_flip { typedef struct drm_i915_flip {
int planes; /*
* This is really talking about planes, and we could rename it
* except for the fact that some of the duplicated i915_drm.h files
* out there check for HAVE_I915_FLIP and so might pick up this
* version.
*/
int pipes;
} drm_i915_flip_t; } drm_i915_flip_t;
/* Allow drivers to submit batchbuffers directly to hardware, relying /* Allow drivers to submit batchbuffers directly to hardware, relying