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

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

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



- Track all runtime-PM wakerefs and other rpm improvements (Chris)
- Fix ILK-IVB primary plane enable delays (Juha-Pekka)
- Differentiate between gtt->mutex and ppgtt->mutex (Chris)
- Prevent concurrent GGTT update and use on Braswell (Chris)
- Fix CNL macros for DDI vswing (Aditya)
- Fix static code analysis warning (RK)
- Only dump GPU state on set-wedged if interesting (Chris)
- Port F detection improvements (Imre)
- userptr mutex lock fixes (Chris)
- Fix on MST allocation by propagating error value at compute_config (Lyude)
- Serialise concurrent calls to set_wedge (Chris)
- Unify reset functionality into i915_reset.c (Chris)
- Switch to kernel fixed size types (Jani)
- Limit the for_each_set_bit to the valid range (Chris)
- Fix wakeref cooie handling (Tvrtko)
- IRQs handling improvements (Chris)
- Selftests improvements (Chris)
- Remove superfluous PANEL_POWER_OFF macro (Jani)
- Global seqno fix (Chris)
- DSI fixes (Hans)
- Refactor out intel_context_init() (Chris)
- Show all active engines on hangcheck (Chris)
- PSR2 fixes and improvements (Jose)
- Do a posting read after irq install on Ice Lake (Daniele)
- Add few more device IDs for Ice Lake (Rodrigo)
- Mark up priority boost on preemption (Chris)
- Add color management LUT validation helper (Matt)
- Split out intel_crt_present to platform specific setup (Jani)
- LVDS and TV clean up and improvements (Jani)
- Simplify CRT VBT check for per-VLV/DDI (Jani)
- De-inline intel_context_init() (Chris)
- Backlight fixes (Maarten)
- Enable fastset for non-boot modesets (Maarten)
- Make HW readout mark CRTC scaler as in use (Maarten)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190128181000.GA5284@intel.com
parents e09191d3 85baa5db

drivers/gpu/drm/drm_color_mgmt.c

+44 −0
Original line number Diff line number Diff line
@@ -462,3 +462,47 @@ int drm_plane_create_color_properties(struct drm_plane *plane, 
	return 0;

}

EXPORT_SYMBOL(drm_plane_create_color_properties);



/**

 * drm_color_lut_check - check validity of lookup table

 * @lut: property blob containing LUT to check

 * @tests: bitmask of tests to run

 *

 * Helper to check whether a userspace-provided lookup table is valid and

 * satisfies hardware requirements.  Drivers pass a bitmask indicating which of

 * the tests in &drm_color_lut_tests should be performed.

 *

 * Returns 0 on success, -EINVAL on failure.

 */

int drm_color_lut_check(struct drm_property_blob *lut,

			uint32_t tests)

{

	struct drm_color_lut *entry;

	int i;



	if (!lut || !tests)

		return 0;



	entry = lut->data;

	for (i = 0; i < drm_color_lut_size(lut); i++) {

		if (tests & DRM_COLOR_LUT_EQUAL_CHANNELS) {

			if (entry[i].red != entry[i].blue ||

			    entry[i].red != entry[i].green) {

				DRM_DEBUG_KMS("All LUT entries must have equal r/g/b\n");

				return -EINVAL;

			}

		}



		if (i > 0 && tests & DRM_COLOR_LUT_NON_DECREASING) {

			if (entry[i].red < entry[i - 1].red ||

			    entry[i].green < entry[i - 1].green ||

			    entry[i].blue < entry[i - 1].blue) {

				DRM_DEBUG_KMS("LUT entries must never decrease.\n");

				return -EINVAL;

			}

		}

	}



	return 0;

}

EXPORT_SYMBOL(drm_color_lut_check);

drivers/gpu/drm/i915/Kconfig.debug

+2 −1
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ config DRM_I915_DEBUG 
        select DEBUG_FS

        select PREEMPT_COUNT

        select I2C_CHARDEV

        select STACKDEPOT

        select DRM_DP_AUX_CHARDEV

        select X86_MSR # used by igt/pm_rpm

        select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)

        select DRM_DEBUG_MM if DRM=y

        select STACKDEPOT if DRM=y # for DRM_DEBUG_MM

	select DRM_DEBUG_SELFTEST

	select SW_SYNC # signaling validation framework (igt/syncobj*)

	select DRM_I915_SW_FENCE_DEBUG_OBJECTS
@@ -173,6 +173,7 @@ config DRM_I915_DEBUG_RUNTIME_PM 
	bool "Enable extra state checking for runtime PM"

	depends on DRM_I915

	default n

	select STACKDEPOT

	help

	  Choose this option to turn on extra state checking for the

	  runtime PM functionality. This may introduce overhead during

drivers/gpu/drm/i915/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -40,9 +40,10 @@ i915-y := i915_drv.o \ 
	  i915_mm.o \

	  i915_params.o \

	  i915_pci.o \

	  i915_reset.o \

	  i915_suspend.o \

	  i915_syncmap.o \

	  i915_sw_fence.o \

	  i915_syncmap.o \

	  i915_sysfs.o \

	  intel_csr.o \

	  intel_device_info.o \
@@ -166,6 +167,7 @@ i915-$(CONFIG_DRM_I915_SELFTEST) += \ 
	selftests/i915_random.o \

	selftests/i915_selftest.o \

	selftests/igt_flush_test.o \

	selftests/igt_live_test.o \

	selftests/igt_reset.o \

	selftests/igt_spinner.o
@@ -198,3 +200,4 @@ endif 
i915-y += intel_lpe_audio.o



obj-$(CONFIG_DRM_I915) += i915.o

obj-$(CONFIG_DRM_I915_GVT_KVMGT) += gvt/kvmgt.o

drivers/gpu/drm/i915/gvt/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -7,4 +7,3 @@ GVT_SOURCE := gvt.o aperture_gm.o handlers.o vgpu.o trace_points.o firmware.o \ 


ccflags-y				+= -I$(src) -I$(src)/$(GVT_DIR)

i915-y					+= $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
 
obj-$(CONFIG_DRM_I915_GVT_KVMGT)	+= $(GVT_DIR)/kvmgt.o

drivers/gpu/drm/i915/gvt/aperture_gm.c

+4 −4
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void free_vgpu_fence(struct intel_vgpu *vgpu) 
	}

	mutex_unlock(&dev_priv->drm.struct_mutex);



	intel_runtime_pm_put(dev_priv);

	intel_runtime_pm_put_unchecked(dev_priv);

}



static int alloc_vgpu_fence(struct intel_vgpu *vgpu)
@@ -206,7 +206,7 @@ static int alloc_vgpu_fence(struct intel_vgpu *vgpu) 
	_clear_vgpu_fence(vgpu);



	mutex_unlock(&dev_priv->drm.struct_mutex);

	intel_runtime_pm_put(dev_priv);

	intel_runtime_pm_put_unchecked(dev_priv);

	return 0;

out_free_fence:

	gvt_vgpu_err("Failed to alloc fences\n");
@@ -219,7 +219,7 @@ static int alloc_vgpu_fence(struct intel_vgpu *vgpu) 
		vgpu->fence.regs[i] = NULL;

	}

	mutex_unlock(&dev_priv->drm.struct_mutex);

	intel_runtime_pm_put(dev_priv);

	intel_runtime_pm_put_unchecked(dev_priv);

	return -ENOSPC;

}
@@ -317,7 +317,7 @@ void intel_vgpu_reset_resource(struct intel_vgpu *vgpu) 


	intel_runtime_pm_get(dev_priv);

	_clear_vgpu_fence(vgpu);

	intel_runtime_pm_put(dev_priv);

	intel_runtime_pm_put_unchecked(dev_priv);

}



/**