drm/i915/crc: implement verify_crc_source callback (a8c20833) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_display.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -12865,6 +12865,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = {
		.atomic_duplicate_state = intel_crtc_duplicate_state,
		.atomic_destroy_state = intel_crtc_destroy_state,
		.set_crc_source = intel_crtc_set_crc_source,
		.verify_crc_source = intel_crtc_verify_crc_source,
		};

		struct wait_rps_boost {

drivers/gpu/drm/i915/intel_drv.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -2153,10 +2153,13 @@ int intel_pipe_crc_create(struct drm_minor *minor);
		#ifdef CONFIG_DEBUG_FS
		int intel_crtc_set_crc_source(struct drm_crtc crtc, const char source_name,
		size_t *values_cnt);
		int intel_crtc_verify_crc_source(struct drm_crtc *crtc,
		const char source_name, size_t values_cnt);
		void intel_crtc_disable_pipe_crc(struct intel_crtc *crtc);
		void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc);
		#else
		#define intel_crtc_set_crc_source NULL
		#define intel_crtc_verify_crc_source NULL
		static inline void intel_crtc_disable_pipe_crc(struct intel_crtc *crtc)
		{
		}

drivers/gpu/drm/i915/intel_pipe_crc.c

+108 −0

Original line number	Diff line number	Diff line
		@@ -913,6 +913,114 @@ int intel_pipe_crc_create(struct drm_minor *minor)
		return 0;
		}

		static int i8xx_crc_source_valid(struct drm_i915_private *dev_priv,
		const enum intel_pipe_crc_source source)
		{
		switch (source) {
		case INTEL_PIPE_CRC_SOURCE_PIPE:
		case INTEL_PIPE_CRC_SOURCE_NONE:
		return 0;
		default:
		return -EINVAL;
		}
		}

		static int i9xx_crc_source_valid(struct drm_i915_private *dev_priv,
		const enum intel_pipe_crc_source source)
		{
		switch (source) {
		case INTEL_PIPE_CRC_SOURCE_PIPE:
		case INTEL_PIPE_CRC_SOURCE_TV:
		case INTEL_PIPE_CRC_SOURCE_DP_B:
		case INTEL_PIPE_CRC_SOURCE_DP_C:
		case INTEL_PIPE_CRC_SOURCE_DP_D:
		case INTEL_PIPE_CRC_SOURCE_NONE:
		return 0;
		default:
		return -EINVAL;
		}
		}

		static int vlv_crc_source_valid(struct drm_i915_private *dev_priv,
		const enum intel_pipe_crc_source source)
		{
		switch (source) {
		case INTEL_PIPE_CRC_SOURCE_PIPE:
		case INTEL_PIPE_CRC_SOURCE_DP_B:
		case INTEL_PIPE_CRC_SOURCE_DP_C:
		case INTEL_PIPE_CRC_SOURCE_DP_D:
		case INTEL_PIPE_CRC_SOURCE_NONE:
		return 0;
		default:
		return -EINVAL;
		}
		}

		static int ilk_crc_source_valid(struct drm_i915_private *dev_priv,
		const enum intel_pipe_crc_source source)
		{
		switch (source) {
		case INTEL_PIPE_CRC_SOURCE_PIPE:
		case INTEL_PIPE_CRC_SOURCE_PLANE1:
		case INTEL_PIPE_CRC_SOURCE_PLANE2:
		case INTEL_PIPE_CRC_SOURCE_NONE:
		return 0;
		default:
		return -EINVAL;
		}
		}

		static int ivb_crc_source_valid(struct drm_i915_private *dev_priv,
		const enum intel_pipe_crc_source source)
		{
		switch (source) {
		case INTEL_PIPE_CRC_SOURCE_PIPE:
		case INTEL_PIPE_CRC_SOURCE_PLANE1:
		case INTEL_PIPE_CRC_SOURCE_PLANE2:
		case INTEL_PIPE_CRC_SOURCE_PF:
		case INTEL_PIPE_CRC_SOURCE_NONE:
		return 0;
		default:
		return -EINVAL;
		}
		}

		static int
		intel_is_valid_crc_source(struct drm_i915_private *dev_priv,
		const enum intel_pipe_crc_source source)
		{
		if (IS_GEN2(dev_priv))
		return i8xx_crc_source_valid(dev_priv, source);
		else if (INTEL_GEN(dev_priv) < 5)
		return i9xx_crc_source_valid(dev_priv, source);
		else if (IS_VALLEYVIEW(dev_priv) \|\| IS_CHERRYVIEW(dev_priv))
		return vlv_crc_source_valid(dev_priv, source);
		else if (IS_GEN5(dev_priv) \|\| IS_GEN6(dev_priv))
		return ilk_crc_source_valid(dev_priv, source);
		else
		return ivb_crc_source_valid(dev_priv, source);
		}

		int intel_crtc_verify_crc_source(struct drm_crtc crtc, const char source_name,
		size_t *values_cnt)
		{
		struct drm_i915_private *dev_priv = to_i915(crtc->dev);
		enum intel_pipe_crc_source source;

		if (display_crc_ctl_parse_source(source_name, &source) < 0) {
		DRM_DEBUG_DRIVER("unknown source %s\n", source_name);
		return -EINVAL;
		}

		if (source == INTEL_PIPE_CRC_SOURCE_AUTO \|\|
		intel_is_valid_crc_source(dev_priv, source) == 0) {
		*values_cnt = 5;
		return 0;
		}

		return -EINVAL;
		}

		int intel_crtc_set_crc_source(struct drm_crtc crtc, const char source_name,
		size_t *values_cnt)
		{

Admin message