forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag 'v2.6.35-rc6' into drm-radeon-next

Browse source 
Need this to avoid conflicts with future radeon fixes
This commit is contained in:
Dave Airlie 2010-08-02 10:05:18 +10:00
commit d656ae53f6
597 changed files with 6200 additions and 198259 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/gpu/drm/radeon/radeon_kms.c
View file

@ -134,7 +134,8 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
for (i = 0, found = 0; i < rdev->num_crtc; i++) {
crtc = (struct drm_crtc *)minfo->crtcs[i];
if (crtc && crtc->base.id == value) {
value = i;
struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
value = radeon_crtc->crtc_id;
found = 1;
break;
}