Attachment 38044 Details for Bug 29726 – Patch against 2.6.35.3 to remove the offending code

[patch] Patch against 2.6.35.3 to remove the offending code

crtc-id-query-remove.patch (text/plain), 1.31 KB, created by James Le Cuirot on 2010-08-21 08:36:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Le Cuirot

Created: 2010-08-21 08:36:53 UTC

Size: 1.31 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
>index ab389f8..fce9551 100644
>--- a/drivers/gpu/drm/radeon/radeon_kms.c
>+++ b/drivers/gpu/drm/radeon/radeon_kms.c
>@@ -98,15 +98,11 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
> {
> 	struct radeon_device *rdev = dev->dev_private;
> 	struct drm_radeon_info *info;
>-	struct radeon_mode_info *minfo = &rdev->mode_info;
> 	uint32_t *value_ptr;
> 	uint32_t value;
>-	struct drm_crtc *crtc;
>-	int i, found;
> 
> 	info = data;
> 	value_ptr = (uint32_t *)((unsigned long)info->value);
>-	value = *value_ptr;
> 	switch (info->request) {
> 	case RADEON_INFO_DEVICE_ID:
> 		value = dev->pci_device;
>@@ -124,21 +120,6 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
> 		else
> 			value = rdev->accel_working;
> 		break;
>-	case RADEON_INFO_CRTC_FROM_ID:
>-		for (i = 0, found = 0; i < rdev->num_crtc; i++) {
>-			crtc = (struct drm_crtc *)minfo->crtcs[i];
>-			if (crtc && crtc->base.id == value) {
>-				struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
>-				value = radeon_crtc->crtc_id;
>-				found = 1;
>-				break;
>-			}
>-		}
>-		if (!found) {
>-			DRM_DEBUG("unknown crtc id %d\n", value);
>-			return -EINVAL;
>-		}
>-		break;
> 	case RADEON_INFO_ACCEL_WORKING2:
> 		value = rdev->accel_working;
> 		break;

Actions: View | Splinter Review

Attachments on bug 29726: 38044

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.