diff mbox series

[1/4] drm/i915: Remove the "pf" crc source

Message ID 20190214192219.3858-1-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915: Remove the "pf" crc source | expand

Commit Message

Ville Syrjälä Feb. 14, 2019, 7:22 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

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>
---
 drivers/gpu/drm/i915/i915_drv.h       | 1 -
 drivers/gpu/drm/i915/intel_pipe_crc.c | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

Comments

Rodrigo Vivi Feb. 14, 2019, 8:33 p.m. UTC | #1 
On Thu, Feb 14, 2019 at 09:22:16PM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> 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>

I wonder where this came from....

Anyway, just by looking the current code:

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>



> ---
>  drivers/gpu/drm/i915/i915_drv.h       | 1 -
>  drivers/gpu/drm/i915/intel_pipe_crc.c | 6 ++----
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 17fe942eaafa..4e11d970cbcf 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1196,7 +1196,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 a8554dc4f196..a3a3ad760158 100644
> --- 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:
> -- 
> 2.19.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Dhinakaran Pandiyan Feb. 15, 2019, 1:32 a.m. UTC | #2 
On Thu, 2019-02-14 at 21:22 +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> The "pipe" and "pf" crc sources are in fact the same thing.
> Remove the "pf" one.

And BDW+ seem to call it DMUX output.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h       | 1 -
>  drivers/gpu/drm/i915/intel_pipe_crc.c | 6 ++----
>  2 files changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h
> b/drivers/gpu/drm/i915/i915_drv.h
> index 17fe942eaafa..4e11d970cbcf 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1196,7 +1196,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 a8554dc4f196..a3a3ad760158 100644
> --- 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:

Ah, source == "pipe" would have returned a failure here
although ivb_crc_source_valid() considers it a valid source. This
patch fixes that too.

Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>

>  		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:
Dhinakaran Pandiyan Feb. 15, 2019, 1:45 a.m. UTC | #3 
On Thu, 2019-02-14 at 17:32 -0800, Dhinakaran Pandiyan wrote:
> On Thu, 2019-02-14 at 21:22 +0200, Ville Syrjala wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > The "pipe" and "pf" crc sources are in fact the same thing.
> > Remove the "pf" one.
> 
> And BDW+ seem to call it DMUX output.

Oh, we need to remove this in IGT too.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
Ville Syrjälä Feb. 15, 2019, 12:50 p.m. UTC | #4 
On Thu, Feb 14, 2019 at 05:45:31PM -0800, Dhinakaran Pandiyan wrote:
> On Thu, 2019-02-14 at 17:32 -0800, Dhinakaran Pandiyan wrote:
> > On Thu, 2019-02-14 at 21:22 +0200, Ville Syrjala wrote:
> > > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > > 
> > > The "pipe" and "pf" crc sources are in fact the same thing.
> > > Remove the "pf" one.
> > 
> > And BDW+ seem to call it DMUX output.
> 
> Oh, we need to remove this in IGT too.

Hrm. I wonder why we even have any hardcoded names in igt. It should
only really care about "auto", and if there is any test that wants
something more specific it could just hardocode the string.
Ville Syrjälä Feb. 18, 2019, 9:07 p.m. UTC | #5 
On Fri, Feb 15, 2019 at 04:16:46AM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/4] drm/i915: Remove the "pf" crc source
> URL   : https://patchwork.freedesktop.org/series/56692/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_5602_full -> Patchwork_12224_full
> ====================================================
> 
> Summary
> -------
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_12224_full absolutely need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the changes
>   introduced in Patchwork_12224_full, please notify your bug team to allow them
>   to document this new failure mode, which will reduce false positives in CI.
> 
>   
> 
> Possible new issues
> -------------------
> 
>   Here are the unknown changes that may have been introduced in Patchwork_12224_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>   * igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
>     - shard-apl:          PASS -> FAIL +2

I still don't understand what this is telling me. Two things in fact
failed, but they were not the same subtest like this is indicating,
nor even the same machine.

igt@kms_atomic_transition@1x-modeset-transitions-nonblocking failed on shard-apl
igt@kms_atomic_transition@1x-modeset-transitions-fencing failed on shard-skl

Anyways...


CRC fail on skl:
(kms_atomic_transition:1179) igt_debugfs-DEBUG: CRC mismatch at index 0: 0x1f69e314 != 0x4fb7c284
(kms_atomic_transition:1179) igt_debugfs-CRITICAL: Test assertion failure function igt_assert_crc_equal, file ../lib/igt_debugfs.c:419:
(kms_atomic_transition:1179) igt_debugfs-CRITICAL: Failed assertion: !mismatch

Can't really be due to this series on account of
#define   PIPE_CRC_SOURCE_DMUX_SKL     (4 << 28)
==
#define   PIPE_CRC_SOURCE_PF_IVB        (2 << 29)

and probably all crc test should have failed in case I made
a mistake with those. Or else the tests aren't testing anything.


Some kind of event delivery fail on bxt:
(kms_atomic_transition:5786) DEBUG: Event mask: 4, waiting for 1 events
(kms_atomic_transition:5786) igt_core-INFO: Timed out: Timed out while
reading drm_fd

No idea about that one.

> 
>   * igt@pm_rpm@gem-evict-pwrite:
>     - shard-apl:          PASS -> DMESG-WARN

<3> [969.472585] [drm:intel_hdcp_auth [i915]] *ERROR* Timed out waiting for R0 ready

No clue about hdcp.

> 
>   
> #### Suppressed ####
> 
>   The following results come from untrusted machines, tests, or statuses.
>   They do not affect the overall result.
> 
>   * {igt@kms_psr2_su@page_flip}:
>     - shard-iclb:         NOTRUN -> {SKIP}
> 
>   * {igt@runner@aborted}:
>     - shard-apl:          NOTRUN -> FAIL
> 
>   
> Known issues
> ------------
> 
>   Here are the changes found in Patchwork_12224_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>   * igt@gem_eio@in-flight-suspend:
>     - shard-snb:          PASS -> FAIL [fdo#103375]
> 
>   * igt@gem_exec_reloc@basic-cpu-gtt-noreloc:
>     - shard-apl:          PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] / [fdo#109373]
> 
>   * igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
>     - shard-apl:          NOTRUN -> DMESG-WARN [fdo#107956]
> 
>   * igt@kms_color@pipe-c-legacy-gamma:
>     - shard-glk:          PASS -> FAIL [fdo#104782]
> 
>   * igt@kms_cursor_crc@cursor-128x42-onscreen:
>     - shard-apl:          PASS -> FAIL [fdo#103232] +2
> 
>   * igt@kms_cursor_crc@cursor-128x42-sliding:
>     - shard-iclb:         NOTRUN -> FAIL [fdo#103232] +1
> 
>   * igt@kms_cursor_crc@cursor-64x64-suspend:
>     - shard-apl:          PASS -> FAIL [fdo#103191] / [fdo#103232]
> 
>   * igt@kms_fbcon_fbt@psr:
>     - shard-iclb:         NOTRUN -> FAIL [fdo#103833]
> 
>   * igt@kms_flip@modeset-vs-vblank-race-interruptible:
>     - shard-glk:          PASS -> FAIL [fdo#103060]
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
>     - shard-apl:          PASS -> FAIL [fdo#103167] +2
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
>     - shard-glk:          PASS -> FAIL [fdo#103167] +1
> 
>   * igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen:
>     - shard-iclb:         PASS -> FAIL [fdo#103167] +2
> 
>   * igt@kms_plane@pixel-format-pipe-a-planes:
>     - shard-iclb:         NOTRUN -> FAIL [fdo#103166]
> 
>   * igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
>     - shard-iclb:         PASS -> FAIL [fdo#103166]
> 
>   * igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
>     - shard-glk:          PASS -> FAIL [fdo#103166]
> 
>   * igt@kms_plane_scaling@pipe-a-scaler-with-pixel-format:
>     - shard-iclb:         NOTRUN -> DMESG-WARN [fdo#107724] +1
> 
>   * igt@kms_psr@no_drrs:
>     - shard-iclb:         PASS -> FAIL [fdo#108341]
> 
>   * igt@kms_rotation_crc@multiplane-rotation:
>     - shard-kbl:          PASS -> FAIL [fdo#109016]
> 
>   * igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
>     - shard-kbl:          PASS -> DMESG-FAIL [fdo#105763]
> 
>   * igt@kms_universal_plane@universal-plane-pipe-a-functional:
>     - shard-apl:          NOTRUN -> FAIL [fdo#103166]
> 
>   * igt@kms_universal_plane@universal-plane-pipe-b-functional:
>     - shard-apl:          PASS -> FAIL [fdo#103166] +2
> 
>   * igt@kms_vblank@pipe-c-ts-continuation-suspend:
>     - shard-apl:          PASS -> FAIL [fdo#104894]
> 
>   * igt@pm_rpm@cursor:
>     - shard-iclb:         PASS -> DMESG-WARN [fdo#107724]
> 
>   
> #### Possible fixes ####
> 
>   * igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
>     - shard-apl:          FAIL [fdo#106510] / [fdo#108145] -> PASS
> 
>   * igt@kms_chv_cursor_fail@pipe-b-64x64-bottom-edge:
>     - shard-kbl:          DMESG-WARN [fdo#103558] / [fdo#105602] -> PASS +18
> 
>   * igt@kms_color@pipe-b-degamma:
>     - shard-apl:          FAIL [fdo#104782] -> PASS
> 
>   * igt@kms_color@pipe-b-legacy-gamma:
>     - shard-glk:          FAIL [fdo#104782] -> PASS
> 
>   * igt@kms_color@pipe-c-ctm-max:
>     - shard-apl:          FAIL [fdo#108147] -> PASS
> 
>   * igt@kms_cursor_crc@cursor-64x21-random:
>     - shard-apl:          FAIL [fdo#103232] -> PASS +2
> 
>   * igt@kms_cursor_crc@cursor-alpha-opaque:
>     - shard-apl:          FAIL [fdo#109350] -> PASS
> 
>   * igt@kms_cursor_crc@cursor-size-change:
>     - shard-glk:          FAIL [fdo#103232] -> PASS
> 
>   * igt@kms_flip@flip-vs-expired-vblank-interruptible:
>     - shard-glk:          FAIL [fdo#102887] / [fdo#105363] -> PASS
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
>     - shard-apl:          FAIL [fdo#103167] -> PASS
> 
>   * igt@kms_frontbuffer_tracking@fbc-1p-rte:
>     - shard-glk:          FAIL [fdo#103167] / [fdo#105682] -> PASS
> 
>   * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-wc:
>     - shard-glk:          FAIL [fdo#103167] -> PASS
> 
>   * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
>     - shard-iclb:         FAIL [fdo#103167] -> PASS +2
> 
>   * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
>     - shard-kbl:          DMESG-WARN [fdo#103558] / [fdo#105079] / [fdo#105602] -> PASS +1
> 
>   * igt@kms_plane@plane-position-covered-pipe-a-planes:
>     - shard-apl:          FAIL [fdo#103166] -> PASS +1
> 
>   * igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
>     - shard-iclb:         FAIL [fdo#103166] -> PASS +1
> 
>   * igt@pm_rpm@basic-rte:
>     - shard-iclb:         DMESG-WARN [fdo#107724] -> PASS +3
> 
>   * igt@pm_rpm@legacy-planes:
>     - shard-iclb:         INCOMPLETE [fdo#108840] / [fdo#109369] -> PASS
> 
>   
> #### Warnings ####
> 
>   * igt@i915_selftest@live_contexts:
>     - shard-iclb:         DMESG-FAIL [fdo#108569] -> INCOMPLETE [fdo#108569] / [fdo#109226]
> 
>   * igt@i915_suspend@shrink:
>     - shard-snb:          INCOMPLETE [fdo#105411] / [fdo#106886] -> DMESG-WARN [fdo#109244]
> 
>   * igt@kms_cursor_crc@cursor-128x128-onscreen:
>     - shard-kbl:          DMESG-FAIL [fdo#103232] / [fdo#103558] / [fdo#105602] -> FAIL [fdo#103232] +1
> 
>   * igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
>     - shard-kbl:          DMESG-FAIL [fdo#103558] / [fdo#105602] / [fdo#108145] -> FAIL [fdo#108145] / [fdo#108590]
> 
>   
>   {name}: This element is suppressed. This means it is ignored when computing
>           the status of the difference (SUCCESS, WARNING, or FAILURE).
> 
>   [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
>   [fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
>   [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
>   [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>   [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
>   [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
>   [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
>   [fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
>   [fdo#103833]: https://bugs.freedesktop.org/show_bug.cgi?id=103833
>   [fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
>   [fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
>   [fdo#105079]: https://bugs.freedesktop.org/show_bug.cgi?id=105079
>   [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>   [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
>   [fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
>   [fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
>   [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
>   [fdo#106510]: https://bugs.freedesktop.org/show_bug.cgi?id=106510
>   [fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
>   [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
>   [fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
>   [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
>   [fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
>   [fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
>   [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
>   [fdo#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
>   [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
>   [fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
>   [fdo#109226]: https://bugs.freedesktop.org/show_bug.cgi?id=109226
>   [fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
>   [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>   [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
>   [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>   [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
>   [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
>   [fdo#109281]: https://bugs.freedesktop.org/show_bug.cgi?id=109281
>   [fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
>   [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
>   [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
>   [fdo#109287]: https://bugs.freedesktop.org/show_bug.cgi?id=109287
>   [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
>   [fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
>   [fdo#109293]: https://bugs.freedesktop.org/show_bug.cgi?id=109293
>   [fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
>   [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
>   [fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
>   [fdo#109369]: https://bugs.freedesktop.org/show_bug.cgi?id=109369
>   [fdo#109373]: https://bugs.freedesktop.org/show_bug.cgi?id=109373
>   [fdo#109625]: https://bugs.freedesktop.org/show_bug.cgi?id=109625
> 
> 
> Participating hosts (7 -> 6)
> ------------------------------
> 
>   Missing    (1): shard-skl 
> 
> 
> Build changes
> -------------
> 
>     * Linux: CI_DRM_5602 -> Patchwork_12224
> 
>   CI_DRM_5602: 570d4d9a80d29c77155979e5fdfb2e1ba76057c7 @ git://anongit.freedesktop.org/gfx-ci/linux
>   IGT_4827: 395eaffd7e1390c9d6043c2980dc14ce3e08b154 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>   Patchwork_12224: 0434615d44ce8f4dc908e836f6981eceb17903dc @ git://anongit.freedesktop.org/gfx-ci/linux
>   piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12224/
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 17fe942eaafa..4e11d970cbcf 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1196,7 +1196,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 a8554dc4f196..a3a3ad760158 100644
--- 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: