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

Commit 42be79e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (76 commits)
  drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.
  drm/radeon/kms: rs400/480 should set common registers.
  drm/radeon/kms: add sanity check to wptr.
  drm/radeon/kms/evergreen: get DP working
  drm/radeon/kms: add hw_i2c module option
  drm/radeon/kms: use new pre/post_xfer i2c bit algo hooks
  drm/radeon/kms: disable MSI on IGP chips
  drm/radeon/kms: display watermark updates (v2)
  drm/radeon/kms/dp: disable training pattern on the sink at the end of link training
  drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)
  drm/radeon/kms/dp: remove extraneous training complete call
  drm/radeon/kms/atom: minor fixes to transmitter setup
  drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.
  drm: fix build error when SYSRQ is disabled
  drm/radeon/kms: fix macbookpro connector quirk
  drm/radeon/r6xx/r7xx: further safe reg clean up
  drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer support
  drm/radeon/kms: bump the version for r6xx/r7xx const buffer support
  drm/radeon/r6xx/r7xx: CS parser fixes
  drm/radeon/kms: fix some typos in r6xx/r7xx hpd setup
  ...

Fix up MSI-related conflicts in drivers/gpu/drm/radeon/radeon_irq_kms.c
parents 445c682b d668046c

drivers/gpu/drm/drm_crtc_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
	if (connector->status == connector_status_disconnected) {

		DRM_DEBUG_KMS("%s is disconnected\n",

			  drm_get_connector_name(connector));

		drm_mode_connector_update_edid_property(connector, NULL);

		goto prune;

	}

drivers/gpu/drm/drm_edid.c

+0 −9
Original line number Diff line number Diff line
@@ -707,15 +707,6 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, 
	mode->vsync_end = mode->vsync_start + vsync_pulse_width;

	mode->vtotal = mode->vdisplay + vblank;



	/* perform the basic check for the detailed timing */

	if (mode->hsync_end > mode->htotal ||

		mode->vsync_end > mode->vtotal) {

		drm_mode_destroy(dev, mode);

		DRM_DEBUG_KMS("Incorrect detailed timing. "

				"Sync is beyond the blank.\n");

		return NULL;

	}



	/* Some EDIDs have bogus h/vtotal values */

	if (mode->hsync_end > mode->htotal)

		mode->htotal = mode->hsync_end + 1;

drivers/gpu/drm/drm_fb_helper.c

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { 
	.help_msg = "force-fb(V)",

	.action_msg = "Restore framebuffer console",

};

#else

static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { };

#endif



static void drm_fb_helper_on(struct fb_info *info)

drivers/gpu/drm/drm_fops.c

+9 −7
Original line number Diff line number Diff line
@@ -140,14 +140,16 @@ int drm_open(struct inode *inode, struct file *filp) 
		spin_unlock(&dev->count_lock);

	}

out:

	if (!retcode) {

		mutex_lock(&dev->struct_mutex);

		if (minor->type == DRM_MINOR_LEGACY) {

		BUG_ON((dev->dev_mapping != NULL) &&

			(dev->dev_mapping != inode->i_mapping));

			if (dev->dev_mapping == NULL)

				dev->dev_mapping = inode->i_mapping;

			else if (dev->dev_mapping != inode->i_mapping)

				retcode = -ENODEV;

		}

		mutex_unlock(&dev->struct_mutex);

	}



	return retcode;

}

drivers/gpu/drm/nouveau/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nouveau_dp.o nouveau_grctx.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv40_fb.o \

             nv04_fb.o nv10_fb.o nv40_fb.o nv50_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o \