diff options
author | José Roberto de Souza <jose.souza@intel.com> | 2021-08-15 04:43:46 +0300 |
---|---|---|
committer | José Roberto de Souza <jose.souza@intel.com> | 2021-08-16 20:31:18 +0300 |
commit | bbaafe536c840d962870d33572d3d5f9051550f3 (patch) | |
tree | 4a9f62f1e5b3ce72ad5903074feb9753f544aafb | |
parent | 7b24b79bf5f9492a63a09d5752af3c155f45f793 (diff) | |
download | linux-bbaafe536c840d962870d33572d3d5f9051550f3.tar.xz |
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
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_fbc.c | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_frontbuffer.h | 3 |
2 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index ddfc17e21668..e4d412d395c3 100644 --- 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 6d41f5394425..4b977c1e4d52 100644 --- 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, |