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

Commit cbff1e91 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:
  vgaarb: trivial fix
  drm: radeon cleanup fixes...
  drm: fix trivial coding errors
  drm: ttm sparse fixes.
  drm/nouveau: fix panels using straps-based mode detection
  drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
  drm/radeon: don't allow device to be opened if powered down
parents acdc0d5e 201ba4c4

drivers/gpu/drm/drm_buffer.c

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(drm_buffer_alloc); 
 *   user_data: A pointer the data that is copied to the buffer.

 *   size: The Number of bytes to copy.

 */

extern int drm_buffer_copy_from_user(struct drm_buffer *buf,

int drm_buffer_copy_from_user(struct drm_buffer *buf,

			      void __user *user_data, int size)

{

	int nr_pages = size / PAGE_SIZE + 1;
@@ -163,7 +163,7 @@ void *drm_buffer_read_object(struct drm_buffer *buf, 
{

	int idx = drm_buffer_index(buf);

	int page = drm_buffer_page(buf);

	void *obj = 0;

	void *obj = NULL;



	if (idx + objsize <= PAGE_SIZE) {

		obj = &buf->data[page][idx];

drivers/gpu/drm/nouveau/nouveau_connector.c

+4 −2
Original line number Diff line number Diff line
@@ -558,8 +558,10 @@ nouveau_connector_get_modes(struct drm_connector *connector) 
	if (nv_encoder->dcb->type == OUTPUT_LVDS &&

	    (nv_encoder->dcb->lvdsconf.use_straps_for_mode ||

	     dev_priv->vbios.fp_no_ddc) && nouveau_bios_fp_mode(dev, NULL)) {

		nv_connector->native_mode = drm_mode_create(dev);

		nouveau_bios_fp_mode(dev, nv_connector->native_mode);

		struct drm_display_mode mode;



		nouveau_bios_fp_mode(dev, &mode);

		nv_connector->native_mode = drm_mode_duplicate(dev, &mode);

	}



	/* Find the native mode if this is a digital panel, if we didn't

drivers/gpu/drm/radeon/atombios.h

+1 −1
Original line number Diff line number Diff line
@@ -4999,7 +4999,7 @@ typedef struct _SW_I2C_IO_DATA_PARAMETERS 
#define SW_I2C_CNTL_WRITE1BIT 6



//==============================VESA definition Portion===============================

#define VESA_OEM_PRODUCT_REV			            '01.00'

#define VESA_OEM_PRODUCT_REV			            "01.00"

#define VESA_MODE_ATTRIBUTE_MODE_SUPPORT	     0xBB	//refer to VBE spec p.32, no TTY support

#define VESA_MODE_WIN_ATTRIBUTE						     7

#define VESA_WIN_SIZE											     64

drivers/gpu/drm/radeon/r600.c

+1 −1
Original line number Diff line number Diff line
@@ -2729,7 +2729,7 @@ int r600_ib_test(struct radeon_device *rdev) 
	if (i < rdev->usec_timeout) {

		DRM_INFO("ib test succeeded in %u usecs\n", i);

	} else {

		DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n",

		DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",

			  scratch, tmp);

		r = -EINVAL;

	}

drivers/gpu/drm/radeon/radeon_kms.c

+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
 */

int radeon_driver_firstopen_kms(struct drm_device *dev)

{

	struct radeon_device *rdev = dev->dev_private;



	if (rdev->powered_down)

		return -EINVAL;

	return 0;

}