intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org,
	rodrigo.vivi@intel.com
Subject: Re: [PATCH 2/2] drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE
Date: Wed, 22 Aug 2018 12:49:01 +0300	[thread overview]
Message-ID: <20180822094901.GW5565@intel.com> (raw)
In-Reply-To: <20180822015053.1420-2-dhinakaran.pandiyan@intel.com>

On Tue, Aug 21, 2018 at 06:50:53PM -0700, Dhinakaran Pandiyan wrote:
> Rename PLANE_CTL_DECOMPRESSION_ENABLE to resemble the bpsec name -
> PLANE_CTL_RENDER_DECOMPRESSION_ENABLE
> 
> Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_reg.h      | 2 +-
>  drivers/gpu/drm/i915/intel_display.c | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 59d06d0055bb..a338aaa2b313 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6515,7 +6515,7 @@ enum {
>  #define   PLANE_CTL_YUV422_UYVY			(1 << 16)
>  #define   PLANE_CTL_YUV422_YVYU			(2 << 16)
>  #define   PLANE_CTL_YUV422_VYUY			(3 << 16)
> -#define   PLANE_CTL_DECOMPRESSION_ENABLE	(1 << 15)
> +#define   PLANE_CTL_RENDER_DECOMPRESSION_ENABLE	(1 << 15)
>  #define   PLANE_CTL_TRICKLE_FEED_DISABLE	(1 << 14)
>  #define   PLANE_CTL_PLANE_GAMMA_DISABLE		(1 << 13) /* Pre-GLK */
>  #define   PLANE_CTL_TILED_MASK			(0x7 << 10)
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b98eab113330..ea2bf9c22ade 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3554,11 +3554,11 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier)
>  	case I915_FORMAT_MOD_Y_TILED:
>  		return PLANE_CTL_TILED_Y;
>  	case I915_FORMAT_MOD_Y_TILED_CCS:
> -		return PLANE_CTL_TILED_Y | PLANE_CTL_DECOMPRESSION_ENABLE;
> +		return PLANE_CTL_TILED_Y | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
>  	case I915_FORMAT_MOD_Yf_TILED:
>  		return PLANE_CTL_TILED_YF;
>  	case I915_FORMAT_MOD_Yf_TILED_CCS:
> -		return PLANE_CTL_TILED_YF | PLANE_CTL_DECOMPRESSION_ENABLE;
> +		return PLANE_CTL_TILED_YF | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
>  	default:
>  		MISSING_CASE(fb_modifier);
>  	}
> @@ -8801,13 +8801,13 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
>  		fb->modifier = I915_FORMAT_MOD_X_TILED;
>  		break;
>  	case PLANE_CTL_TILED_Y:
> -		if (val & PLANE_CTL_DECOMPRESSION_ENABLE)
> +		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)
>  			fb->modifier = I915_FORMAT_MOD_Y_TILED_CCS;
>  		else
>  			fb->modifier = I915_FORMAT_MOD_Y_TILED;
>  		break;
>  	case PLANE_CTL_TILED_YF:
> -		if (val & PLANE_CTL_DECOMPRESSION_ENABLE)
> +		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)
>  			fb->modifier = I915_FORMAT_MOD_Yf_TILED_CCS;
>  		else
>  			fb->modifier = I915_FORMAT_MOD_Yf_TILED;
> -- 
> 2.17.1

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2018-08-22  9:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-22  1:50 [PATCH 1/2] drm/i915: Add a small wrapper to check for CCS modifiers Dhinakaran Pandiyan
2018-08-22  1:50 ` [PATCH 2/2] drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE Dhinakaran Pandiyan
2018-08-22  9:49   ` Ville Syrjälä [this message]
2018-08-22  2:35 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Add a small wrapper to check for CCS modifiers Patchwork
2018-08-22  3:50 ` ✓ Fi.CI.IGT: " Patchwork
2018-08-22  9:48 ` [PATCH 1/2] " Ville Syrjälä
2018-08-22 17:45   ` Dhinakaran Pandiyan
2018-08-22 19:38   ` [PATCH v2] " Dhinakaran Pandiyan
2018-08-22 20:01 ` ✓ Fi.CI.BAT: success for series starting with [v2] drm/i915: Add a small wrapper to check for CCS modifiers. (rev2) Patchwork
2018-08-22 20:50 ` ✗ Fi.CI.IGT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180822094901.GW5565@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dhinakaran.pandiyan@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=rodrigo.vivi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).