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

Commit 78ec75cd 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/ttm: Read buffer overflow
  drm/radeon: Read buffer overflow
  drm/ttm: Fix a sync object leak.
  drm/radeon/kms: fix memory leak in radeon_driver_load_kms
  drm/radeon/kms: fix nomodeset.
  drm/ttm: Fix a potential comparison of structs.
  drm/radeon/kms: fix rv515 VRAM initialisation.
  drm/radeon: add some new r7xx pci ids
  drm: Catch stop possible NULL pointer reference
  drm: Small logic fix in drm_mode_setcrtc
parents 1ee5332c c96e7c7a

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
		goto out;

	}



	if (crtc_req->count_connectors > 0 && !mode && !fb) {

	if (crtc_req->count_connectors > 0 && (!mode || !fb)) {

		DRM_DEBUG("Count connectors is %d but no mode or fb set\n",

			  crtc_req->count_connectors);

		ret = -EINVAL;

drivers/gpu/drm/drm_crtc_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -706,8 +706,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
	struct drm_encoder **save_encoders, *new_encoder;

	struct drm_framebuffer *old_fb = NULL;

	bool save_enabled;

	bool mode_changed = false;

	bool fb_changed = false;

	bool mode_changed = false; /* if true do a full mode set */

	bool fb_changed = false; /* if true and !mode_changed just do a flip */

	struct drm_connector *connector;

	int count = 0, ro, fail = 0;

	struct drm_crtc_helper_funcs *crtc_funcs;
@@ -758,6 +758,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
		if (set->crtc->fb == NULL) {

			DRM_DEBUG("crtc has no fb, full mode set\n");

			mode_changed = true;

		} else if (set->fb == NULL) {

			mode_changed = true;

		} else if ((set->fb->bits_per_pixel !=

			 set->crtc->fb->bits_per_pixel) ||

			 set->fb->depth != set->crtc->fb->depth)

drivers/gpu/drm/radeon/r100.c

+2 −1
Original line number Diff line number Diff line
@@ -722,13 +722,14 @@ int r100_cs_packet_parse(struct radeon_cs_parser *p, 
			 unsigned idx)

{

	struct radeon_cs_chunk *ib_chunk = &p->chunks[p->chunk_ib_idx];

	uint32_t header = ib_chunk->kdata[idx];

	uint32_t header;



	if (idx >= ib_chunk->length_dw) {

		DRM_ERROR("Can not parse packet at %d after CS end %d !\n",

			  idx, ib_chunk->length_dw);

		return -EINVAL;

	}

	header = ib_chunk->kdata[idx];

	pkt->idx = idx;

	pkt->type = CP_PACKET_GET_TYPE(header);

	pkt->count = CP_PACKET_GET_COUNT(header);

drivers/gpu/drm/radeon/radeon_drv.c

+8 −9
Original line number Diff line number Diff line
@@ -318,6 +318,14 @@ static int __init radeon_init(void) 
	driver = &driver_old;

	driver->num_ioctls = radeon_max_ioctl;

#if defined(CONFIG_DRM_RADEON_KMS)

#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force() && radeon_modeset == -1) {

		DRM_INFO("VGACON disable radeon kernel modesetting.\n");

		driver = &driver_old;

		driver->driver_features &= ~DRIVER_MODESET;

		radeon_modeset = 0;

	}

#endif

	/* if enabled by default */

	if (radeon_modeset == -1) {

		DRM_INFO("radeon default to kernel modesetting.\n");
@@ -329,17 +337,8 @@ static int __init radeon_init(void) 
		driver->driver_features |= DRIVER_MODESET;

		driver->num_ioctls = radeon_max_kms_ioctl;

	}



	/* if the vga console setting is enabled still

	 * let modprobe override it */

#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force() && radeon_modeset == -1) {

		DRM_INFO("VGACON disable radeon kernel modesetting.\n");

		driver = &driver_old;

		driver->driver_features &= ~DRIVER_MODESET;

		radeon_modeset = 0;

	}

#endif

#endif

	return drm_init(driver);

}

drivers/gpu/drm/radeon/radeon_kms.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags) 
	if (r) {

		DRM_ERROR("Failed to initialize radeon, disabling IOCTL\n");

		radeon_device_fini(rdev);

		kfree(rdev);

		dev->dev_private = NULL;

		return r;

	}

	return 0;