Commit e285c174 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/vblank: update recently added vbl interface to be more future proof.
  drm radeon: Return -EINVAL on wrong pm sysfs access
  drm/radeon/kms: fix hardcoded EDID handling
  Revert "drm/i915: Don't save/restore hardware status page address register"
  drm/i915: Avoid unmapping pages from a NULL address space
  drm/i915: Fix use after free within tracepoint
  drm/i915: Restore missing command flush before interrupt on BLT ring
  drm/i915: Disable pagefaults along execbuffer relocation fast path
  drm/i915: Fix computation of pitch for dumb bo creator
  drm/i915: report correct render clock frequencies on SNB
  drm/i915/dp: Correct the order of deletion for ghost eDP devices
  drm/i915: Fix tiling corruption from pipelined fencing
  drm/i915: Re-enable self-refresh
  drm/i915: Prevent racy removal of request from client list
  drm/i915: skip redundant operations whilst enabling pipes and planes
  drm/i915: Remove surplus POSTING_READs before wait_for_vblank
  drm/radeon/kms: prefer legacy pll algo for tv-out
  drm: check for modesetting on modeset ioctls
  drm/kernel: vblank wait on crtc > 1
  drm: Fix use-after-free in drm_gem_vm_close()
parents 6c510389 51eab416

drivers/gpu/drm/drm_crtc.c

+51 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,9 @@ int drm_mode_getresources(struct drm_device *dev, void *data, 
	uint32_t __user *encoder_id;

	struct drm_mode_group *mode_group;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);



	/*
@@ -1244,6 +1247,9 @@ int drm_mode_getcrtc(struct drm_device *dev, 
	struct drm_mode_object *obj;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);



	obj = drm_mode_object_find(dev, crtc_resp->crtc_id,
@@ -1312,6 +1318,9 @@ int drm_mode_getconnector(struct drm_device *dev, void *data, 
	uint64_t __user *prop_values;

	uint32_t __user *encoder_ptr;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	memset(&u_mode, 0, sizeof(struct drm_mode_modeinfo));



	DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);
@@ -1431,6 +1440,9 @@ int drm_mode_getencoder(struct drm_device *dev, void *data, 
	struct drm_encoder *encoder;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, enc_resp->encoder_id,

				   DRM_MODE_OBJECT_ENCODER);
@@ -1486,6 +1498,9 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, 
	int ret = 0;

	int i;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, crtc_req->crtc_id,

				   DRM_MODE_OBJECT_CRTC);
@@ -1603,6 +1618,9 @@ int drm_mode_cursor_ioctl(struct drm_device *dev, 
	struct drm_crtc *crtc;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	if (!req->flags) {

		DRM_ERROR("no operation set\n");

		return -EINVAL;
@@ -1667,6 +1685,9 @@ int drm_mode_addfb(struct drm_device *dev, 
	struct drm_framebuffer *fb;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	if ((config->min_width > r->width) || (r->width > config->max_width)) {

		DRM_ERROR("mode new framebuffer width not within limits\n");

		return -EINVAL;
@@ -1724,6 +1745,9 @@ int drm_mode_rmfb(struct drm_device *dev, 
	int ret = 0;

	int found = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, *id, DRM_MODE_OBJECT_FB);

	/* TODO check that we realy get a framebuffer back. */
@@ -1780,6 +1804,9 @@ int drm_mode_getfb(struct drm_device *dev, 
	struct drm_framebuffer *fb;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);

	if (!obj) {
@@ -1813,6 +1840,9 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, 
	int num_clips;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, r->fb_id, DRM_MODE_OBJECT_FB);

	if (!obj) {
@@ -1996,6 +2026,9 @@ int drm_mode_attachmode_ioctl(struct drm_device *dev, 
	struct drm_mode_modeinfo *umode = &mode_cmd->mode;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);



	obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
@@ -2042,6 +2075,9 @@ int drm_mode_detachmode_ioctl(struct drm_device *dev, 
	struct drm_mode_modeinfo *umode = &mode_cmd->mode;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);



	obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
@@ -2211,6 +2247,9 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev, 
	uint64_t __user *values_ptr;

	uint32_t __user *blob_length_ptr;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, out_resp->prop_id, DRM_MODE_OBJECT_PROPERTY);

	if (!obj) {
@@ -2333,6 +2372,9 @@ int drm_mode_getblob_ioctl(struct drm_device *dev, 
	int ret = 0;

	void *blob_ptr;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, out_resp->blob_id, DRM_MODE_OBJECT_BLOB);

	if (!obj) {
@@ -2393,6 +2435,9 @@ int drm_mode_connector_property_set_ioctl(struct drm_device *dev, 
	int ret = -EINVAL;

	int i;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);



	obj = drm_mode_object_find(dev, out_resp->connector_id, DRM_MODE_OBJECT_CONNECTOR);
@@ -2509,6 +2554,9 @@ int drm_mode_gamma_set_ioctl(struct drm_device *dev, 
	int size;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);

	if (!obj) {
@@ -2560,6 +2608,9 @@ int drm_mode_gamma_get_ioctl(struct drm_device *dev, 
	int size;

	int ret = 0;



	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -EINVAL;



	mutex_lock(&dev->mode_config.mutex);

	obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);

	if (!obj) {

drivers/gpu/drm/drm_gem.c

+3 −2
Original line number Diff line number Diff line
@@ -499,11 +499,12 @@ EXPORT_SYMBOL(drm_gem_vm_open); 
void drm_gem_vm_close(struct vm_area_struct *vma)

{

	struct drm_gem_object *obj = vma->vm_private_data;

	struct drm_device *dev = obj->dev;



	mutex_lock(&obj->dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);

	drm_vm_close_locked(vma);

	drm_gem_object_unreference(obj);

	mutex_unlock(&obj->dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);

}

EXPORT_SYMBOL(drm_gem_vm_close);

drivers/gpu/drm/drm_ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -280,6 +280,9 @@ int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_priv) 
		if (dev->driver->dumb_create)

			req->value = 1;

		break;

	case DRM_CAP_VBLANK_HIGH_CRTC:

		req->value = 1;

		break;

	default:

		return -EINVAL;

	}

drivers/gpu/drm/drm_irq.c

+10 −5
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ int drm_wait_vblank(struct drm_device *dev, void *data, 
{

	union drm_wait_vblank *vblwait = data;

	int ret = 0;

	unsigned int flags, seq, crtc;

	unsigned int flags, seq, crtc, high_crtc;



	if ((!drm_dev_to_irq(dev)) || (!dev->irq_enabled))

		return -EINVAL;
@@ -1134,16 +1134,21 @@ int drm_wait_vblank(struct drm_device *dev, void *data, 
		return -EINVAL;



	if (vblwait->request.type &

	    ~(_DRM_VBLANK_TYPES_MASK | _DRM_VBLANK_FLAGS_MASK)) {

	    ~(_DRM_VBLANK_TYPES_MASK | _DRM_VBLANK_FLAGS_MASK |

	      _DRM_VBLANK_HIGH_CRTC_MASK)) {

		DRM_ERROR("Unsupported type value 0x%x, supported mask 0x%x\n",

			  vblwait->request.type,

			  (_DRM_VBLANK_TYPES_MASK | _DRM_VBLANK_FLAGS_MASK));

			  (_DRM_VBLANK_TYPES_MASK | _DRM_VBLANK_FLAGS_MASK |

			   _DRM_VBLANK_HIGH_CRTC_MASK));

		return -EINVAL;

	}



	flags = vblwait->request.type & _DRM_VBLANK_FLAGS_MASK;

	high_crtc = (vblwait->request.type & _DRM_VBLANK_HIGH_CRTC_MASK);

	if (high_crtc)

		crtc = high_crtc >> _DRM_VBLANK_HIGH_CRTC_SHIFT;

	else

		crtc = flags & _DRM_VBLANK_SECONDARY ? 1 : 0;



	if (crtc >= dev->num_crtcs)

		return -EINVAL;

drivers/gpu/drm/i915/i915_debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) 
		seq_printf(m, "Render p-state limit: %d\n",

			   rp_state_limits & 0xff);

		seq_printf(m, "CAGF: %dMHz\n", ((rpstat & GEN6_CAGF_MASK) >>

						GEN6_CAGF_SHIFT) * 100);

						GEN6_CAGF_SHIFT) * 50);

		seq_printf(m, "RP CUR UP EI: %dus\n", rpupei &

			   GEN6_CURICONT_MASK);

		seq_printf(m, "RP CUR UP: %dus\n", rpcurup &
@@ -908,15 +908,15 @@ static int i915_cur_delayinfo(struct seq_file *m, void *unused) 


		max_freq = (rp_state_cap & 0xff0000) >> 16;

		seq_printf(m, "Lowest (RPN) frequency: %dMHz\n",

			   max_freq * 100);

			   max_freq * 50);



		max_freq = (rp_state_cap & 0xff00) >> 8;

		seq_printf(m, "Nominal (RP1) frequency: %dMHz\n",

			   max_freq * 100);

			   max_freq * 50);



		max_freq = rp_state_cap & 0xff;

		seq_printf(m, "Max non-overclocked (RP0) frequency: %dMHz\n",

			   max_freq * 100);

			   max_freq * 50);



		__gen6_gt_force_wake_put(dev_priv);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE