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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190214192219.3858-1-ville.syrjala@linux.intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1eaaf7079964dfb3a0864731a2fda36f4a9f85bc..a5a2f5b86b60deff19756604d3ca2608f29918db 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -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,

diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index a8554dc4f196fb7a626173a4e8714e4ca4fe78f3..a3a3ad760158aede65a8aee99de5168dd96ab4bc 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -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: