diff mbox series

[3/4] drm/i915: Nuke ORIGIN_GTT

Message ID 20210731001019.150373-3-jose.souza@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915/display/tgl+: Dispatch atomic commits instead of front buffer modifications | expand

Commit Message

Souza, Jose July 31, 2021, 12:10 a.m. UTC 
There is no users of it, so no need to keep handling for it.

Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
 drivers/gpu/drm/i915/display/intel_fbc.c         | 10 +---------
 drivers/gpu/drm/i915/display/intel_frontbuffer.h |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

Comments

Gwan-gyeong Mun Aug. 3, 2021, 11:20 a.m. UTC | #1 
On 7/31/21 3:10 AM, José Roberto de Souza wrote:
> There is no users of it, so no need to keep handling for it.
> 
> Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_fbc.c         | 10 +---------
>   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 ddfc17e21668a..e4d412d395c34 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 6d41f53944250..4b977c1e4d52b 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,
> 
Is this patch absolutely necessary for this series?
Souza, Jose Aug. 3, 2021, 5:19 p.m. UTC | #2 
On Tue, 2021-08-03 at 14:20 +0300, Gwan-gyeong Mun wrote:
> 
> On 7/31/21 3:10 AM, José Roberto de Souza wrote:
> > There is no users of it, so no need to keep handling for it.
> > 
> > Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
> > Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> > ---
> >   drivers/gpu/drm/i915/display/intel_fbc.c         | 10 +---------
> >   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 ddfc17e21668a..e4d412d395c34 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 6d41f53944250..4b977c1e4d52b 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,
> > 
> Is this patch absolutely necessary for this series?

Nope, just notice this unused ORIGIN_GTT while debugging.
Gwan-gyeong Mun Aug. 13, 2021, 7:41 a.m. UTC | #3 
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>

On 8/3/21 8:19 PM, Souza, Jose wrote:
> On Tue, 2021-08-03 at 14:20 +0300, Gwan-gyeong Mun wrote:
>>
>> On 7/31/21 3:10 AM, José Roberto de Souza wrote:
>>> There is no users of it, so no need to keep handling for it.
>>>
>>> Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
>>> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
>>> ---
>>>    drivers/gpu/drm/i915/display/intel_fbc.c         | 10 +---------
>>>    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 ddfc17e21668a..e4d412d395c34 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 6d41f53944250..4b977c1e4d52b 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,
>>>
>> Is this patch absolutely necessary for this series?
> 
> Nope, just notice this unused ORIGIN_GTT while debugging.
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index ddfc17e21668a..e4d412d395c34 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 6d41f53944250..4b977c1e4d52b 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,