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

Commit a18b29f0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2014-09-01' of git://anongit.freedesktop.org/drm-intel into drm-next 

drm-intel-next-2014-08-22:
- basic code for execlist, which is the fancy new cmd submission on gen8. Still
  disabled by default (Ben, Oscar Mateo, Thomas Daniel et al)
- remove the useless usage of console_lock for I915_FBDEV=n (Chris)
- clean up relations between ctx and ppgtt
- clean up ppgtt lifetime handling (Michel Thierry)
- various cursor code improvements from Ville
- execbuffer code cleanups and secure batch fixes (Chris)
- prep work for dev -> dev_priv transition (Chris)
- some of the prep patches for the seqno -> request object transition (Chris)
- various small improvements all over

* tag 'drm-intel-next-2014-09-01' of git://anongit.freedesktop.org/drm-intel: (86 commits)
  drm/i915: fix suspend/resume for GENs w/o runtime PM support
  drm/i915: Update DRIVER_DATE to 20140822
  drm: fix plane rotation when restoring fbdev configuration
  drm/i915/bdw: Disable execlists by default
  drm/i915/bdw: Enable Logical Ring Contexts (hence, Execlists)
  drm/i915/bdw: Document Logical Rings, LR contexts and Execlists
  drm/i915/bdw: Print context state in debugfs
  drm/i915/bdw: Display context backing obj & ringbuffer info in debugfs
  drm/i915/bdw: Display execlists info in debugfs
  drm/i915/bdw: Disable semaphores for Execlists
  drm/i915/bdw: Make sure gpu reset still works with Execlists
  drm/i915/bdw: Don't write PDP in the legacy way when using LRCs
  drm/i915: Track cursor changes as frontbuffer tracking flushes
  drm/i915/bdw: Help out the ctx switch interrupt handler
  drm/i915/bdw: Avoid non-lite-restore preemptions
  drm/i915/bdw: Handle context switch events
  drm/i915/bdw: Two-stage execlist submit process
  drm/i915/bdw: Write the tail pointer, LRC style
  drm/i915/bdw: Implement context switching (somewhat)
  drm/i915/bdw: Emission of requests with logical rings
  ...

Conflicts:
	drivers/gpu/drm/i915/i915_drv.c
parents 04cd2145 604effb7

Documentation/DocBook/drm.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -3919,6 +3919,11 @@ int num_ioctls;</synopsis> 
!Pdrivers/gpu/drm/i915/i915_cmd_parser.c batch buffer command parser

!Idrivers/gpu/drm/i915/i915_cmd_parser.c

      </sect2>

      <sect2>

        <title>Logical Rings, Logical Ring Contexts and Execlists</title>

!Pdrivers/gpu/drm/i915/intel_lrc.c Logical Rings, Logical Ring Contexts and Execlists

!Idrivers/gpu/drm/i915/intel_lrc.c

      </sect2>

    </sect1>

  </chapter>

</part>

drivers/gpu/drm/drm_crtc.c

+20 −5
Original line number Diff line number Diff line
@@ -4175,12 +4175,25 @@ static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj, 
	return ret;

}



static int drm_mode_plane_set_obj_prop(struct drm_mode_object *obj,

/**

 * drm_mode_plane_set_obj_prop - set the value of a property

 * @plane: drm plane object to set property value for

 * @property: property to set

 * @value: value the property should be set to

 *

 * This functions sets a given property on a given plane object. This function

 * calls the driver's ->set_property callback and changes the software state of

 * the property if the callback succeeds.

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_mode_plane_set_obj_prop(struct drm_plane *plane,

				struct drm_property *property,

				uint64_t value)

{

	int ret = -EINVAL;

	struct drm_plane *plane = obj_to_plane(obj);

	struct drm_mode_object *obj = &plane->base;



	if (plane->funcs->set_property)

		ret = plane->funcs->set_property(plane, property, value);
@@ -4189,6 +4202,7 @@ static int drm_mode_plane_set_obj_prop(struct drm_mode_object *obj, 


	return ret;

}

EXPORT_SYMBOL(drm_mode_plane_set_obj_prop);



/**

 * drm_mode_getproperty_ioctl - get the current value of a object's property
@@ -4327,7 +4341,8 @@ int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data, 
		ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);

		break;

	case DRM_MODE_OBJECT_PLANE:

		ret = drm_mode_plane_set_obj_prop(arg_obj, property, arg->value);

		ret = drm_mode_plane_set_obj_prop(obj_to_plane(arg_obj),

						  property, arg->value);

		break;

	}

drivers/gpu/drm/drm_fb_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static bool restore_fbdev_mode(struct drm_fb_helper *fb_helper) 
			drm_plane_force_disable(plane);



		if (dev->mode_config.rotation_property) {

			drm_object_property_set_value(&plane->base,

			drm_mode_plane_set_obj_prop(plane,

						    dev->mode_config.rotation_property,

						    BIT(DRM_ROTATE_0));

		}

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ i915-y += i915_cmd_parser.o \ 
	  i915_gpu_error.o \

	  i915_irq.o \

	  i915_trace_points.o \

	  intel_lrc.o \

	  intel_ringbuffer.o \

	  intel_uncore.o

drivers/gpu/drm/i915/i915_cmd_parser.c

+1 −3
Original line number Diff line number Diff line
@@ -842,8 +842,6 @@ static u32 *vmap_batch(struct drm_i915_gem_object *obj) 
 */

bool i915_needs_cmd_parser(struct intel_engine_cs *ring)

{

	struct drm_i915_private *dev_priv = ring->dev->dev_private;



	if (!ring->needs_cmd_parser)

		return false;
@@ -852,7 +850,7 @@ bool i915_needs_cmd_parser(struct intel_engine_cs *ring) 
	 * disabled. That will cause all of the parser's PPGTT checks to

	 * fail. For now, disable parsing when PPGTT is off.

	 */

	if (!dev_priv->mm.aliasing_ppgtt)

	if (USES_PPGTT(ring->dev))

		return false;



	return (i915.enable_cmd_parser == 1);