[PATCH 0/2] Enable RGB565 rotation from gen11 onwards

[PATCH 0/2] Enable RGB565 rotation from gen11 onwards

[Juha-Pekka Heikkila]

These patches enable RGB565 format to be rotated 90 and 270 degrees
on gen11 and later.

Related changes to IGT here:
https://patchwork.freedesktop.org/series/48756/

/Juha-Pekka

Juha-Pekka Heikkila (2):
  drm/i915: Move 90/270 rotation validity check into its own function
  drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

 drivers/gpu/drm/i915/intel_atomic_plane.c | 75 ++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 30 deletions(-)

-- 
2.7.4

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

[PATCH 1/2] drm/i915: Move 90/270 rotation validity check into its own function

[Juha-Pekka Heikkila]

This makes intel_plane_atomic_check_with_state() generally shorter.

v2: (Ville Syrjälä) move all rotation related checks into new function and
	don't pass dev_priv pointer around.

v3: (Ville Syljälä) rename new function.

v4: rebase

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
---
 drivers/gpu/drm/i915/intel_atomic_plane.c | 66 ++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 27 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index dcba645..344a16b 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -107,44 +107,34 @@ intel_plane_destroy_state(struct drm_plane *plane,
 	drm_atomic_helper_plane_destroy_state(plane, state);
 }
 
-int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
-					struct intel_crtc_state *crtc_state,
-					const struct intel_plane_state *old_plane_state,
-					struct intel_plane_state *intel_state)
+static bool intel_plane_valid_rotation(const struct drm_plane_state *plane_state)
 {
-	struct drm_plane *plane = intel_state->base.plane;
-	struct drm_i915_private *dev_priv = to_i915(plane->dev);
-	struct drm_plane_state *state = &intel_state->base;
-	struct intel_plane *intel_plane = to_intel_plane(plane);
-	const struct drm_display_mode *adjusted_mode =
-		&crtc_state->base.adjusted_mode;
-	int ret;
+	struct intel_plane *plane = to_intel_plane(plane_state->plane);
+	struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
 
-	if (!intel_state->base.crtc && !old_plane_state->base.crtc)
-		return 0;
-
-	if (state->fb && drm_rotation_90_or_270(state->rotation)) {
+	if (plane_state->fb &&
+	    drm_rotation_90_or_270(plane_state->rotation)) {
 		struct drm_format_name_buf format_name;
 
-		if (state->fb->modifier != I915_FORMAT_MOD_Y_TILED &&
-		    state->fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
+		if (plane_state->fb->modifier != I915_FORMAT_MOD_Y_TILED &&
+		    plane_state->fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
 			DRM_DEBUG_KMS("Y/Yf tiling required for 90/270!\n");
-			return -EINVAL;
+			return false;
 		}
 
 		/*
 		 * 90/270 is not allowed with RGB64 16:16:16:16,
 		 * RGB 16-bit 5:6:5, and Indexed 8-bit.
-		 * TBD: Add RGB64 case once its added in supported format list.
+		 * TBD: Add RGB64 case once its added in supported format
+		 * list.
 		 */
-		switch (state->fb->format->format) {
+		switch (plane_state->fb->format->format) {
 		case DRM_FORMAT_C8:
 		case DRM_FORMAT_RGB565:
 			DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
-			              drm_get_format_name(state->fb->format->format,
-			                                  &format_name));
-			return -EINVAL;
-
+				      drm_get_format_name(plane_state->fb->format->format,
+							  &format_name));
+			return false;
 		default:
 			break;
 		}
@@ -152,12 +142,34 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
 
 	/* CHV ignores the mirror bit when the rotate bit is set :( */
 	if (IS_CHERRYVIEW(dev_priv) &&
-	    state->rotation & DRM_MODE_ROTATE_180 &&
-	    state->rotation & DRM_MODE_REFLECT_X) {
+	    plane_state->rotation & DRM_MODE_ROTATE_180 &&
+	    plane_state->rotation & DRM_MODE_REFLECT_X) {
 		DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
-		return -EINVAL;
+		return false;
 	}
 
+	return true;
+}
+
+int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
+					struct intel_crtc_state *crtc_state,
+					const struct intel_plane_state *old_plane_state,
+					struct intel_plane_state *intel_state)
+{
+	struct drm_plane *plane = intel_state->base.plane;
+	struct drm_i915_private *dev_priv = to_i915(plane->dev);
+	struct drm_plane_state *state = &intel_state->base;
+	struct intel_plane *intel_plane = to_intel_plane(plane);
+	const struct drm_display_mode *adjusted_mode =
+		&crtc_state->base.adjusted_mode;
+	int ret;
+
+	if (!intel_state->base.crtc && !old_plane_state->base.crtc)
+		return 0;
+
+	if (!intel_plane_valid_rotation(state))
+		return -EINVAL;
+
 	intel_state->base.visible = false;
 	ret = intel_plane->check_plane(intel_plane, crtc_state, intel_state);
 	if (ret)
-- 
2.7.4

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

[PATCH 2/2] drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

[Juha-Pekka Heikkila]

From gen11 onwards RGB565 90/270 plane rotation is supported on hardware.

IGT: https://patchwork.freedesktop.org/series/48756/
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
---
 drivers/gpu/drm/i915/intel_atomic_plane.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
index 344a16b..c245906 100644
--- a/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@ -123,14 +123,17 @@ static bool intel_plane_valid_rotation(const struct drm_plane_state *plane_state
 		}
 
 		/*
-		 * 90/270 is not allowed with RGB64 16:16:16:16,
-		 * RGB 16-bit 5:6:5, and Indexed 8-bit.
+		 * 90/270 is not allowed with RGB64 16:16:16:16 and
+		 * Indexed 8-bit. RGB 16-bit. 5:6:5 is allowed gen11 onwards.
 		 * TBD: Add RGB64 case once its added in supported format
 		 * list.
 		 */
 		switch (plane_state->fb->format->format) {
-		case DRM_FORMAT_C8:
 		case DRM_FORMAT_RGB565:
+			if (INTEL_GEN(dev_priv) >= 11)
+				break;
+			/* fall through */
+		case DRM_FORMAT_C8:
 			DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
 				      drm_get_format_name(plane_state->fb->format->format,
 							  &format_name));
-- 
2.7.4

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

✗ Fi.CI.CHECKPATCH: warning for Enable RGB565 rotation from gen11 onwards

[Patchwork]

== Series Details ==

Series: Enable RGB565 rotation from gen11 onwards
URL   : https://patchwork.freedesktop.org/series/48758/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
44ee504222cb drm/i915: Move 90/270 rotation validity check into its own function
-:12: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#12: 
v2: (Ville Syrjälä) move all rotation related checks into new function and

total: 0 errors, 1 warnings, 0 checks, 95 lines checked
49a28a97f471 drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

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

✓ Fi.CI.BAT: success for Enable RGB565 rotation from gen11 onwards

[Patchwork]

== Series Details ==

Series: Enable RGB565 rotation from gen11 onwards
URL   : https://patchwork.freedesktop.org/series/48758/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4706 -> Patchwork_10020 =

== Summary - WARNING ==

  Minor unknown changes coming with Patchwork_10020 need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_10020, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/48758/revisions/1/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in Patchwork_10020:

  === IGT changes ===

    ==== Warnings ====

    igt@drv_selftest@live_execlists:
      fi-whl-u:           SKIP -> PASS +1

    {igt@pm_rpm@module-reload}:
      fi-cnl-psr:         WARN (fdo#107602) -> FAIL

    
== Known issues ==

  Here are the changes found in Patchwork_10020 that come from known issues:

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_guc:
      fi-skl-guc:         NOTRUN -> DMESG-WARN (fdo#107258, fdo#107175)

    igt@drv_selftest@live_hangcheck:
      fi-skl-guc:         NOTRUN -> DMESG-FAIL (fdo#107174)
      fi-skl-6600u:       PASS -> DMESG-FAIL (fdo#106560, fdo#107174)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
      {fi-byt-clapper}:   PASS -> INCOMPLETE (fdo#102657)

    
    ==== Possible fixes ====

    igt@drv_selftest@live_hangcheck:
      fi-whl-u:           DMESG-FAIL (fdo#106560) -> PASS

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
      fi-bxt-dsi:         INCOMPLETE (fdo#103927) -> PASS

    {igt@kms_psr@primary_mmap_gtt}:
      fi-cnl-psr:         DMESG-WARN -> PASS

    
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  fdo#102657 https://bugs.freedesktop.org/show_bug.cgi?id=102657
  fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
  fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
  fdo#107174 https://bugs.freedesktop.org/show_bug.cgi?id=107174
  fdo#107175 https://bugs.freedesktop.org/show_bug.cgi?id=107175
  fdo#107258 https://bugs.freedesktop.org/show_bug.cgi?id=107258
  fdo#107602 https://bugs.freedesktop.org/show_bug.cgi?id=107602


== Participating hosts (53 -> 48) ==

  Additional (1): fi-skl-guc 
  Missing    (6): fi-hsw-4770r fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 


== Build changes ==

    * Linux: CI_DRM_4706 -> Patchwork_10020

  CI_DRM_4706: 6d5687919f3a3426243041b99111b576dd0576d0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4609: 0bc9763af77bbb37f2ed65cc39c398e88db7d8e3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10020: 49a28a97f4718e3dc9d957c11af540afcc2a6024 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

49a28a97f471 drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.
44ee504222cb drm/i915: Move 90/270 rotation validity check into its own function

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10020/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.IGT: success for Enable RGB565 rotation from gen11 onwards

[Patchwork]

== Series Details ==

Series: Enable RGB565 rotation from gen11 onwards
URL   : https://patchwork.freedesktop.org/series/48758/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4706_full -> Patchwork_10020_full =

== Summary - SUCCESS ==

  No regressions found.

  

== Known issues ==

  Here are the changes found in Patchwork_10020_full that come from known issues:

  === IGT changes ===

    ==== Possible fixes ====

    igt@gem_ctx_isolation@bcs0-s3:
      shard-kbl:          INCOMPLETE (fdo#103665) -> PASS

    igt@kms_flip@flip-vs-expired-vblank-interruptible:
      shard-glk:          FAIL (fdo#102887, fdo#105363) -> PASS

    
  fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
  fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
  fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363


== Participating hosts (5 -> 5) ==

  No changes in participating hosts


== Build changes ==

    * Linux: CI_DRM_4706 -> Patchwork_10020

  CI_DRM_4706: 6d5687919f3a3426243041b99111b576dd0576d0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4609: 0bc9763af77bbb37f2ed65cc39c398e88db7d8e3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10020: 49a28a97f4718e3dc9d957c11af540afcc2a6024 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10020/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/2] drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

[Ville Syrjälä]

On Mon, Aug 27, 2018 at 03:37:53PM +0300, Juha-Pekka Heikkila wrote:
> From gen11 onwards RGB565 90/270 plane rotation is supported on hardware.
> 
> IGT: https://patchwork.freedesktop.org/series/48756/
> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> ---
>  drivers/gpu/drm/i915/intel_atomic_plane.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
> index 344a16b..c245906 100644
> --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
> @@ -123,14 +123,17 @@ static bool intel_plane_valid_rotation(const struct drm_plane_state *plane_state
>  		}
>  
>  		/*
> -		 * 90/270 is not allowed with RGB64 16:16:16:16,
> -		 * RGB 16-bit 5:6:5, and Indexed 8-bit.
> +		 * 90/270 is not allowed with RGB64 16:16:16:16 and
> +		 * Indexed 8-bit. RGB 16-bit. 5:6:5 is allowed gen11 onwards.
                                            ^
Extra period there

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

>  		 * TBD: Add RGB64 case once its added in supported format
>  		 * list.
>  		 */
>  		switch (plane_state->fb->format->format) {
> -		case DRM_FORMAT_C8:
>  		case DRM_FORMAT_RGB565:
> +			if (INTEL_GEN(dev_priv) >= 11)
> +				break;
> +			/* fall through */
> +		case DRM_FORMAT_C8:
>  			DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
>  				      drm_get_format_name(plane_state->fb->format->format,
>  							  &format_name));
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

Re: [PATCH 2/2] drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

[Maarten Lankhorst]

Op 05-09-18 om 16:58 schreef Ville Syrjälä:
> On Mon, Aug 27, 2018 at 03:37:53PM +0300, Juha-Pekka Heikkila wrote:
>> From gen11 onwards RGB565 90/270 plane rotation is supported on hardware.
>>
>> IGT: https://patchwork.freedesktop.org/series/48756/
>> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>> ---
>>  drivers/gpu/drm/i915/intel_atomic_plane.c | 9 ++++++---
>>  1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
>> index 344a16b..c245906 100644
>> --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
>> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
>> @@ -123,14 +123,17 @@ static bool intel_plane_valid_rotation(const struct drm_plane_state *plane_state
>>  		}
>>  
>>  		/*
>> -		 * 90/270 is not allowed with RGB64 16:16:16:16,
>> -		 * RGB 16-bit 5:6:5, and Indexed 8-bit.
>> +		 * 90/270 is not allowed with RGB64 16:16:16:16 and
>> +		 * Indexed 8-bit. RGB 16-bit. 5:6:5 is allowed gen11 onwards.
>                                             ^
> Extra period there
>
> Otherwise lgtm
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks, pushed.

Patch 1/2 is dropped because of other cleanups superceeding it, and had to rebase patch 2/2 to apply. All should be well now. :)

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

Re: [PATCH 2/2] drm/i915: Enable RGB565 90/270 plane rotation for gen11 onwards.

[Juha-Pekka Heikkila]

On 25.09.2018 16:35, Maarten Lankhorst wrote:
> Op 05-09-18 om 16:58 schreef Ville Syrjälä:
>> On Mon, Aug 27, 2018 at 03:37:53PM +0300, Juha-Pekka Heikkila wrote:
>>>  From gen11 onwards RGB565 90/270 plane rotation is supported on hardware.
>>>
>>> IGT: https://patchwork.freedesktop.org/series/48756/
>>> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
>>> ---
>>>   drivers/gpu/drm/i915/intel_atomic_plane.c | 9 ++++++---
>>>   1 file changed, 6 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
>>> index 344a16b..c245906 100644
>>> --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
>>> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
>>> @@ -123,14 +123,17 @@ static bool intel_plane_valid_rotation(const struct drm_plane_state *plane_state
>>>   		}
>>>   
>>>   		/*
>>> -		 * 90/270 is not allowed with RGB64 16:16:16:16,
>>> -		 * RGB 16-bit 5:6:5, and Indexed 8-bit.
>>> +		 * 90/270 is not allowed with RGB64 16:16:16:16 and
>>> +		 * Indexed 8-bit. RGB 16-bit. 5:6:5 is allowed gen11 onwards.
>>                                              ^
>> Extra period there
>>
>> Otherwise lgtm
>> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Thanks, pushed.
> 
> Patch 1/2 is dropped because of other cleanups superceeding it, and had to rebase patch 2/2 to apply. All should be well now. :)
> 

Ok, thank you :)

/Juha-Pekka

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