On Tue, Aug 26, 2008 at 06:20:43PM -0700, Dave Airlie wrote:
>  linux-core/radeon_encoders.c |   15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> New commits:
> commit a4167e7b572859a998710ee599298e5131f51620
> Author: Dave Airlie <[EMAIL PROTECTED]>
> Date:   Wed Aug 27 11:12:19 2008 +1000
> 
>     radeon: avoid oops on encoders with no crtc set
> 
> diff --git a/linux-core/radeon_encoders.c b/linux-core/radeon_encoders.c
> index ec36e43..f662872 100644
> --- a/linux-core/radeon_encoders.c
> +++ b/linux-core/radeon_encoders.c
> @@ -863,11 +863,18 @@ static void radeon_atom_tmds_dpms(struct drm_encoder 
> *encoder, int mode)
>       struct drm_device *dev = encoder->dev;
>       struct drm_radeon_private *dev_priv = dev->dev_private;
>       struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> -     struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
> +     struct radeon_crtc *radeon_crtc = NULL;
> +     int crtc_id = 0;
>       int atom_type = -1;
>       int index = -1;
>       uint32_t bios_2_scratch, bios_3_scratch;
>  
> +     if (radeon_crtc) {
> +             radeon_crtc = to_radeon_crtc(encoder->crtc);
> +             crtc_id = radeon_crtc->crtc_id;
> +     } else if (mode == DRM_MODE_DPMS_ON)
> +             return;
> +

That doesn't look right. Now it will never get the crtc_id.

-- 
Ville Syrjälä
[EMAIL PROTECTED]
http://www.sci.fi/~syrjala/

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

Reply via email to