drm/i915: Nuke ORIGIN_GTT

There is no users of it, so no need to keep handling for it.

Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210815014346.373945-2-jose.souza@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index ddfc17e21668aebe0efe8fc57d5554ad434182e7..e4d412d395c3474c31e2f402f9bac790aec13617 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -1129,7 +1129,7 @@ void intel_fbc_invalidate(struct drm_i915_private *dev_priv,
        if (!HAS_FBC(dev_priv))
                return;
 
-       if (origin == ORIGIN_GTT || origin == ORIGIN_FLIP)
+       if (origin == ORIGIN_FLIP)
                return;
 
        mutex_lock(&fbc->lock);
@@ -1150,14 +1150,6 @@ void intel_fbc_flush(struct drm_i915_private *dev_priv,
        if (!HAS_FBC(dev_priv))
                return;
 
-       /*
-        * GTT tracking does not nuke the entire cfb
-        * so don't clear busy_bits set for some other
-        * reason.
-        */
-       if (origin == ORIGIN_GTT)
-               return;
-
        mutex_lock(&fbc->lock);
 
        fbc->busy_bits &= ~frontbuffer_bits;

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
index 6d41f539442508b373bed76d584ca08657cddcec..4b977c1e4d52b683c9d385a7545dc22bfd66fb92 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.h
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
@@ -33,8 +33,7 @@
 struct drm_i915_private;
 
 enum fb_op_origin {
-       ORIGIN_GTT,
-       ORIGIN_CPU,
+       ORIGIN_CPU = 0,
        ORIGIN_CS,
        ORIGIN_FLIP,
        ORIGIN_DIRTYFB,