On Wed, 2008-12-17 at 14:08 -0800, Eric Anholt wrote:
> The values are really going to continue meaning pipe, not plane, and that's
> what they're called in the kernel copy of the header. Userland hasn't ever
> made the switch to pipe!=plane, since userland checks are based on DRM
> version, which is still stuck at 1.6. However, Mesa did start using
> plane[AB] names, so provide a compat define.
> ---
> shared-core/i915_drm.h | 27 +++++++++++++++++++--------
> 1 files changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
> index 628f7f8..04ab4cf 100644
> --- a/shared-core/i915_drm.h
> +++ b/shared-core/i915_drm.h
> @@ -111,14 +111,25 @@ typedef struct drm_i915_sarea {
> unsigned int rotated_tiled;
> unsigned int rotated2_tiled;
>
> - int planeA_x;
> - int planeA_y;
> - int planeA_w;
> - int planeA_h;
> - int planeB_x;
> - int planeB_y;
> - int planeB_w;
> - int planeB_h;
> + /* compat defines for the period of time when pipeA_* got renamed
> + * to planeA_*. They mean pipe, really.
> + */
> +#define planeA_x pipeA_x
> +#define planeA_y pipeA_y
> +#define planeA_w pipeA_w
> +#define planeA_h pipeA_h
> +#define planeB_x pipeB_x
> +#define planeB_y pipeB_y
> +#define planeB_w pipeB_w
> +#define planeB_h pipeB_h
> + int pipeA_x;
> + int pipeA_y;
> + int pipeA_w;
> + int pipeA_h;
> + int pipeB_x;
> + int pipeB_y;
> + int pipeB_w;
> + int pipeB_h;
>
> /* Triple buffering */
> drm_handle_t third_handle;Looks fine to me... I've already made this change in my tree. robert. -- Robert Noland <rnol...@2hip.net> 2Hip Networks
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
-- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
