[PULL] -next for 1.15

[Peter Hutterer]

On Mon, Mar 18, 2013 at 09:38:10PM +0100, Geert Uytterhoeven wrote:
> On Mon, 18 Mar 2013, Keith Packard wrote:
> > Peter Hutterer <peter.hutterer at who-t.net> writes:
> > > Peter Hutterer (13):
> > >       kdrive: fix "set but not used" warnings
> > 
> > Merged.
> >    cf89aa5..116f020  master -> master
> 
> Is 4149ee8ec0193acbf3812c7ee2627b93b9a89997 the right fix for this?
> I had locally committed the patch below, but I don't know how to test
> it...

yeah, looks correct and given that no-one has fixed this since 2003 when
the original code was added I don't mind not having a test right now.
merged locally, will go in with the next pull request.

Cheers,
   Peter
> 
> From df9b47ee3e07b99d013926080963104098f2d319 Mon Sep 17 00:00:00 2001
> From: Geert Uytterhoeven <geert at linux-m68k.org>
> Date: Fri, 22 Feb 2013 13:28:28 +0100
> Subject: [PATCH] Xfbdev: revive randr new screen size logic
> 
> hw/kdrive/fbdev/fbdev.c: In function 'fbdevRandRSetConfig':
> hw/kdrive/fbdev/fbdev.c:470:19: warning: variable 'newheight' set but not used [-Wunused-but-set-variable]
> hw/kdrive/fbdev/fbdev.c:470:9: warning: variable 'newwidth' set but not used [-Wunused-but-set-variable]
> 
> Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
> ---
>  hw/kdrive/fbdev/fbdev.c |   10 +++++++++-
>  1 files changed, 9 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
> index a913f87..a8d36c6 100644
> --- a/hw/kdrive/fbdev/fbdev.c
> +++ b/hw/kdrive/fbdev/fbdev.c
> @@ -465,15 +465,19 @@ fbdevRandRSetConfig(ScreenPtr pScreen,
>      int oldheight;
>      int oldmmwidth;
>      int oldmmheight;
> -    int newwidth, newheight;
> +    int newwidth, newheight, newmmwidth, newmmheight;
>  
>      if (screen->randr & (RR_Rotate_0 | RR_Rotate_180)) {
>          newwidth = pSize->width;
>          newheight = pSize->height;
> +        newmmwidth = pSize->mmWidth;
> +        newmmheight = pSize->mmHeight;
>      }
>      else {
>          newwidth = pSize->height;
>          newheight = pSize->width;
> +        newmmwidth = pSize->mmHeight;
> +        newmmheight = pSize->mmWidth;
>      }
>  
>      if (wasEnabled)
> @@ -491,6 +495,10 @@ fbdevRandRSetConfig(ScreenPtr pScreen,
>       */
>  
>      scrpriv->randr = KdAddRotation(screen->randr, randr);
> +    pScreen->width = newwidth;
> +    pScreen->height = newheight;
> +    pScreen->mmWidth = newmmwidth;
> +    pScreen->mmHeight = newmmheight;
>  
>      fbdevUnmapFramebuffer(screen);
>  
> -- 
> 1.7.0.4
> 
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds