Commit 87c2b659 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Remove the "pf" crc source 



The "pipe" and "pf" crc sources are in fact the same thing.
Remove the "pf" one.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190214192219.3858-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 2a8862d2

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1198,7 +1198,6 @@ enum intel_pipe_crc_source { 
	INTEL_PIPE_CRC_SOURCE_NONE,

	INTEL_PIPE_CRC_SOURCE_PLANE1,

	INTEL_PIPE_CRC_SOURCE_PLANE2,

	INTEL_PIPE_CRC_SOURCE_PF,

	INTEL_PIPE_CRC_SOURCE_PIPE,

	/* TV/DP on pre-gen5/vlv can't use the pipe source. */

	INTEL_PIPE_CRC_SOURCE_TV,

drivers/gpu/drm/i915/intel_pipe_crc.c

+2 −4
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ static const char * const pipe_crc_sources[] = { 
	"none",

	"plane1",

	"plane2",

	"pf",

	"pipe",

	"TV",

	"DP-B",
@@ -396,7 +395,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, 
				bool set_wa)

{

	if (*source == INTEL_PIPE_CRC_SOURCE_AUTO)

		*source = INTEL_PIPE_CRC_SOURCE_PF;

		*source = INTEL_PIPE_CRC_SOURCE_PIPE;



	switch (*source) {

	case INTEL_PIPE_CRC_SOURCE_PLANE1:
@@ -405,7 +404,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, 
	case INTEL_PIPE_CRC_SOURCE_PLANE2:

		*val = PIPE_CRC_ENABLE | PIPE_CRC_SOURCE_SPRITE_IVB;

		break;

	case INTEL_PIPE_CRC_SOURCE_PF:

	case INTEL_PIPE_CRC_SOURCE_PIPE:

		if (set_wa && (IS_HASWELL(dev_priv) ||

		     IS_BROADWELL(dev_priv)) && pipe == PIPE_A)

			hsw_pipe_A_crc_wa(dev_priv, true);
@@ -532,7 +531,6 @@ static int ivb_crc_source_valid(struct drm_i915_private *dev_priv, 
	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:

CRA Git | Maintained and supported by SUSTech CRA and CCSE