Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dfd79e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon: add GET_PARAM/INFO support for Z pipes
  drm/radeon/kms: add r100/r200 OQ support.
  drm: Fix sysfs device confusion.
  drm/radeon/kms: implement the bo busy ioctl properly.
parents b57f9215 f779b3e5

drivers/gpu/drm/drm_sysfs.c

+29 −22
Original line number Diff line number Diff line
@@ -22,16 +22,21 @@ 
#define to_drm_minor(d) container_of(d, struct drm_minor, kdev)

#define to_drm_connector(d) container_of(d, struct drm_connector, kdev)



static struct device_type drm_sysfs_device_minor = {

	.name = "drm_minor"

};



/**

 * drm_sysfs_suspend - DRM class suspend hook

 * drm_class_suspend - DRM class suspend hook

 * @dev: Linux device to suspend

 * @state: power state to enter

 *

 * Just figures out what the actual struct drm_device associated with

 * @dev is and calls its suspend hook, if present.

 */

static int drm_sysfs_suspend(struct device *dev, pm_message_t state)

static int drm_class_suspend(struct device *dev, pm_message_t state)

{

	if (dev->type == &drm_sysfs_device_minor) {

		struct drm_minor *drm_minor = to_drm_minor(dev);

		struct drm_device *drm_dev = drm_minor->dev;
@@ -39,19 +44,20 @@ static int drm_sysfs_suspend(struct device *dev, pm_message_t state) 
		    !drm_core_check_feature(drm_dev, DRIVER_MODESET) &&

		    drm_dev->driver->suspend)

			return drm_dev->driver->suspend(drm_dev, state);



	}

	return 0;

}



/**

 * drm_sysfs_resume - DRM class resume hook

 * drm_class_resume - DRM class resume hook

 * @dev: Linux device to resume

 *

 * Just figures out what the actual struct drm_device associated with

 * @dev is and calls its resume hook, if present.

 */

static int drm_sysfs_resume(struct device *dev)

static int drm_class_resume(struct device *dev)

{

	if (dev->type == &drm_sysfs_device_minor) {

		struct drm_minor *drm_minor = to_drm_minor(dev);

		struct drm_device *drm_dev = drm_minor->dev;
@@ -59,7 +65,7 @@ static int drm_sysfs_resume(struct device *dev) 
		    !drm_core_check_feature(drm_dev, DRIVER_MODESET) &&

		    drm_dev->driver->resume)

			return drm_dev->driver->resume(drm_dev);



	}

	return 0;

}
@@ -99,8 +105,8 @@ struct class *drm_sysfs_create(struct module *owner, char *name) 
		goto err_out;

	}



	class->suspend = drm_sysfs_suspend;

	class->resume = drm_sysfs_resume;

	class->suspend = drm_class_suspend;

	class->resume = drm_class_resume;



	err = class_create_file(class, &class_attr_version);

	if (err)
@@ -480,6 +486,7 @@ int drm_sysfs_device_add(struct drm_minor *minor) 
	minor->kdev.class = drm_class;

	minor->kdev.release = drm_sysfs_device_release;

	minor->kdev.devt = minor->device;

	minor->kdev.type = &drm_sysfs_device_minor;

	if (minor->type == DRM_MINOR_CONTROL)

		minor_str = "controlD%d";

        else if (minor->type == DRM_MINOR_RENDER)

drivers/gpu/drm/radeon/r100.c

+10 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,16 @@ static int r100_packet0_check(struct radeon_cs_parser *p, 
			tmp |= tile_flags;

			ib[idx] = tmp;

			break;

		case RADEON_RB3D_ZPASS_ADDR:

			r = r100_cs_packet_next_reloc(p, &reloc);

			if (r) {

				DRM_ERROR("No reloc for ib[%d]=0x%04X\n",

					  idx, reg);

				r100_cs_dump_packet(p, pkt);

				return r;

			}

			ib[idx] = ib_chunk->kdata[idx] + ((u32)reloc->lobj.gpu_offset);

			break;

		default:

			/* FIXME: we don't want to allow anyothers packet */

			break;

drivers/gpu/drm/radeon/r300.c

+3 −1
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ void r300_gpu_init(struct radeon_device *rdev) 
		/* rv350,rv370,rv380 */

		rdev->num_gb_pipes = 1;

	}

	rdev->num_z_pipes = 1;

	gb_tile_config = (R300_ENABLE_TILING | R300_TILE_SIZE_16);

	switch (rdev->num_gb_pipes) {

	case 2:
@@ -486,7 +487,8 @@ void r300_gpu_init(struct radeon_device *rdev) 
		printk(KERN_WARNING "Failed to wait MC idle while "

		       "programming pipes. Bad things might happen.\n");

	}

	DRM_INFO("radeon: %d pipes initialized.\n", rdev->num_gb_pipes);

	DRM_INFO("radeon: %d quad pipes, %d Z pipes initialized.\n",

		 rdev->num_gb_pipes, rdev->num_z_pipes);

}



int r300_ga_reset(struct radeon_device *rdev)

drivers/gpu/drm/radeon/r420.c

+12 −1
Original line number Diff line number Diff line
@@ -165,7 +165,18 @@ void r420_pipes_init(struct radeon_device *rdev) 
		printk(KERN_WARNING "Failed to wait GUI idle while "

		       "programming pipes. Bad things might happen.\n");

	}

	DRM_INFO("radeon: %d pipes initialized.\n", rdev->num_gb_pipes);



	if (rdev->family == CHIP_RV530) {

		tmp = RREG32(RV530_GB_PIPE_SELECT2);

		if ((tmp & 3) == 3)

			rdev->num_z_pipes = 2;

		else

			rdev->num_z_pipes = 1;

	} else

		rdev->num_z_pipes = 1;



	DRM_INFO("radeon: %d quad pipes, %d z pipes initialized.\n",

		 rdev->num_gb_pipes, rdev->num_z_pipes);

}



void r420_gpu_init(struct radeon_device *rdev)

drivers/gpu/drm/radeon/r520.c

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ void r520_gpu_init(struct radeon_device *rdev) 
	 */

	/* workaround for RV530 */

	if (rdev->family == CHIP_RV530) {

		WREG32(0x4124, 1);

		WREG32(0x4128, 0xFF);

	}

	r420_pipes_init(rdev);