← Back to team overview

gma500 team mailing list archive

[Merge] lp:~slonua/gma500/xrandr into lp:gma500

 

Vitaliy Kulikov has proposed merging lp:~slonua/gma500/xrandr into lp:gma500.

Requested reviews:
  GMA500 Team (gma500)
Related bugs:
  #586304 xrandr rotate crashes x.org using psb driver
  https://bugs.launchpad.net/bugs/586304


xrandr fix.
-- 
https://code.launchpad.net/~slonua/gma500/xrandr/+merge/26553
Your team GMA500 Team is requested to review the proposed merge of lp:~slonua/gma500/xrandr into lp:gma500.
=== modified file 'xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/src/psb_crtc.c'
--- xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/src/psb_crtc.c	2010-05-03 14:52:57 +0000
+++ xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/src/psb_crtc.c	2010-06-02 01:58:22 +0000
@@ -431,7 +431,11 @@
 			if (bPlaneBEnabled)
 			{   
 				//current mode dot clock, HZ
-				DotClockB = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+				if( output->crtc )
+				{
+				        DotClockB = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+				}
+				
 				BPPB = output->scrn->bitsPerPixel;
 			}
 		}
@@ -440,7 +444,11 @@
 		{
 			if (bPlaneAEnabled)
 			{
-				DotClockA = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+				if( output->crtc )
+				{
+    				        DotClockA = output->crtc->mode.Clock * 1000 / WM_DOTCLOCK_DIVISOR;
+                                }
+                
 				BPPA = output->scrn->bitsPerPixel;
 			}
 		}