[Intel-gfx] [PATCH] Use pipes, not planes for sarea geometry data

[Eric Anholt]

On Sun, 2008-10-19 at 14:37 -0700, Keith Packard wrote:
> Vblank in the kernel is far simpler if it deals with pipes instead of
> planes, so we're changing both user and kernel side. This is the user mode
> side. This fixes both i830_crtc_dpms and i830PipeSetBase, the two functions
> which copy geometry from the crtc to the sarea.

NAK -- i830_common.h should be fixed at the same time to call it pipe
not plane.  I understand (and agree with) not changing i915_drm.h's copy
of the sarea to fix the name, since it introduces API issues, but that's
not the case here.

> Signed-off-by: Keith Packard <keithp at keithp.com>
> ---
>  src/i830_display.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/i830_display.c b/src/i830_display.c
> index 0632f3a..ef8c887 100644
> --- a/src/i830_display.c
> +++ b/src/i830_display.c
> @@ -428,7 +428,7 @@ i830PipeSetBase(xf86CrtcPtr crtc, int x, int y)
>  	if (!sPriv)
>  	    return;
>  
> -	switch (plane) {
> +	switch (pipe) {
>  	case 0:
>  	    sPriv->planeA_x = x;
>  	    sPriv->planeA_y = y;
> @@ -756,7 +756,7 @@ static void i830_modeset_ctl(xf86CrtcPtr crtc, int pre)
>      if (!pI830->directRenderingEnabled)
>        return;
>  
> -    modeset.crtc = intel_crtc->plane;
> +    modeset.crtc = intel_crtc->pipe;
>  
>      /*
>       * DPMS will be called many times (especially off), but we only
> @@ -921,7 +921,7 @@ i830_crtc_dpms(xf86CrtcPtr crtc, int mode)
>  	if (!sPriv)
>  	    return;
>  
> -	switch (plane) {
> +	switch (pipe) {
>  	case 0:
>  	    sPriv->planeA_w = enabled ? crtc->mode.HDisplay : 0;
>  	    sPriv->planeA_h = enabled ? crtc->mode.VDisplay : 0;
-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20081019/01d06efa/attachment.sig>