Re: [Intel-gfx] [PATCH v2 5/5] drm/i915/glk: Enable pipe CSC

2017-01-30 Thread Ville Syrjälä
On Thu, Jan 26, 2017 at 01:24:25PM +0200, Ander Conselvan de Oliveira wrote:
> Now that the pre-csc degamma table is set up correctly in Geminilake,
> pipe CSC can be enabled without causing a black screen.
> 
> v2: Rebase.
> Signed-off-by: Ander Conselvan de Oliveira 
> 

Reviewed-by: Ville Syrjälä 

> ---
>  drivers/gpu/drm/i915/intel_display.c | 1 +
>  drivers/gpu/drm/i915/intel_sprite.c  | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c 
> b/drivers/gpu/drm/i915/intel_display.c
> index 13d05bc..3eee44a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3391,6 +3391,7 @@ static void skylake_update_primary_plane(struct 
> drm_plane *plane,
>   if (IS_GEMINILAKE(dev_priv)) {
>   I915_WRITE(PLANE_COLOR_CTL(pipe, plane_id),
>  PLANE_COLOR_PIPE_GAMMA_ENABLE |
> +PLANE_COLOR_PIPE_CSC_ENABLE |
>  PLANE_COLOR_PLANE_GAMMA_DISABLE);
>   } else {
>   plane_ctl |=
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
> b/drivers/gpu/drm/i915/intel_sprite.c
> index b16a295..27e0752 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -224,6 +224,7 @@ skl_update_plane(struct drm_plane *drm_plane,
>   if (IS_GEMINILAKE(dev_priv)) {
>   I915_WRITE(PLANE_COLOR_CTL(pipe, plane_id),
>  PLANE_COLOR_PIPE_GAMMA_ENABLE |
> +PLANE_COLOR_PIPE_CSC_ENABLE |
>  PLANE_COLOR_PLANE_GAMMA_DISABLE);
>   } else {
>   plane_ctl |=
> -- 
> 2.5.5
> 
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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


[Intel-gfx] [PATCH v2 5/5] drm/i915/glk: Enable pipe CSC

2017-01-26 Thread Ander Conselvan de Oliveira
Now that the pre-csc degamma table is set up correctly in Geminilake,
pipe CSC can be enabled without causing a black screen.

v2: Rebase.
Signed-off-by: Ander Conselvan de Oliveira 

---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 drivers/gpu/drm/i915/intel_sprite.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 13d05bc..3eee44a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3391,6 +3391,7 @@ static void skylake_update_primary_plane(struct drm_plane 
*plane,
if (IS_GEMINILAKE(dev_priv)) {
I915_WRITE(PLANE_COLOR_CTL(pipe, plane_id),
   PLANE_COLOR_PIPE_GAMMA_ENABLE |
+  PLANE_COLOR_PIPE_CSC_ENABLE |
   PLANE_COLOR_PLANE_GAMMA_DISABLE);
} else {
plane_ctl |=
diff --git a/drivers/gpu/drm/i915/intel_sprite.c 
b/drivers/gpu/drm/i915/intel_sprite.c
index b16a295..27e0752 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -224,6 +224,7 @@ skl_update_plane(struct drm_plane *drm_plane,
if (IS_GEMINILAKE(dev_priv)) {
I915_WRITE(PLANE_COLOR_CTL(pipe, plane_id),
   PLANE_COLOR_PIPE_GAMMA_ENABLE |
+  PLANE_COLOR_PIPE_CSC_ENABLE |
   PLANE_COLOR_PLANE_GAMMA_DISABLE);
} else {
plane_ctl |=
-- 
2.5.5

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx