Skip to contentSkip to conversation

drm/i915: Remove unecessary check for unsupported modifiers for NV12

PATCH In review Dhinakaran Pandiyan 5 participants 9 messages Jun 28, 2018 – Jul 2, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Remove unecessary check for unsupported modifiers for NV12

There is already a check to allow only RGB8888 formats with CCS modifiers.

---
 drivers/gpu/drm/i915/intel_display.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -5
index eaa0663963a5..c5ec13e0f484 100644
@@ -14521,11 +14521,6 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 		}
 		break;
 	case DRM_FORMAT_NV12:
-		if (mode_cmd->modifier[0] == I915_FORMAT_MOD_Y_TILED_CCS ||
-		    mode_cmd->modifier[0] == I915_FORMAT_MOD_Yf_TILED_CCS) {
-			DRM_DEBUG_KMS("RC not to be enabled with NV12\n");
-			goto err;
-		}
 		if (INTEL_GEN(dev_priv) < 9 || IS_SKYLAKE(dev_priv) ||
 		    IS_BROXTON(dev_priv)) {
 			DRM_DEBUG_KMS("unsupported pixel format: %s\n",
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Dhinakaran Pandiyan

There is already a check to allow only RGB8888 formats with CCS modifiers.

Aside: intel_framebuffer_init is horribly long function, and it would probably make a lot of sense to extract all the framebuffer related stuff into a new intel_framebuffer.c file. intel_display.c is a bit ... big :-) -Daniel

Quoted 27 lines
---
 drivers/gpu/drm/i915/intel_display.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -5
index eaa0663963a5..c5ec13e0f484 100644
@@ -14521,11 +14521,6 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 		}
 		break;
 	case DRM_FORMAT_NV12:
-		if (mode_cmd->modifier[0] == I915_FORMAT_MOD_Y_TILED_CCS ||
-		    mode_cmd->modifier[0] == I915_FORMAT_MOD_Yf_TILED_CCS) {
-			DRM_DEBUG_KMS("RC not to be enabled with NV12\n");
-			goto err;
-		}
 		if (INTEL_GEN(dev_priv) < 9 || IS_SKYLAKE(dev_priv) ||
 		    IS_BROXTON(dev_priv)) {
 			DRM_DEBUG_KMS("unsupported pixel format: %s\n",
Signature · 6 lines
2.14.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
Quoted 8 lines · Daniel Vetter
Quoted 5 lines · Dhinakaran Pandiyan

There is already a check to allow only RGB8888 formats with CCS modifiers.

Thanks for the reviews.

Quoted 5 lines

Aside: intel_framebuffer_init is horribly long function, and it would probably make a lot of sense to extract all the framebuffer related stuff
into a new intel_framebuffer.c file. intel_display.c is a bit ... big :-)

Yup, it's become a pain to add new stuff. I'll add this to my todo list.

Quoted 33 lines

-Daniel

Quoted 31 lines

---
 drivers/gpu/drm/i915/intel_display.c | 5 -----

 1 file changed, 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index eaa0663963a5..c5ec13e0f484 100644
@@ -14521,11 +14521,6 @@ static int intel_framebuffer_init(struct
 intel_framebuffer *intel_fb,
  		}
  		break;

  case DRM_FORMAT_NV12:

drivers/gpu/drm/i915/intel_display.c +0 -1
-		if (mode_cmd->modifier[0] ==

I915_FORMAT_MOD_Y_TILED_CCS ||

drivers/gpu/drm/i915/intel_display.c +0 -1
-		    mode_cmd->modifier[0] ==

I915_FORMAT_MOD_Yf_TILED_CCS) {

drivers/gpu/drm/i915/intel_display.c +0 -1
-			DRM_DEBUG_KMS("RC not to be enabled with

NV12\n");

drivers/gpu/drm/i915/intel_display.c +0 -2
-			goto err;
-		}

  if (INTEL_GEN(dev_priv) < 9 || IS_SKYLAKE(dev_priv) ||
      IS_BROXTON(dev_priv)) { DRM_DEBUG_KMS("unsupported pixel format:
%s\n",
--
2.14.1

Quoted 4 lines
Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
Quoted 13 lines · Dhinakaran Pandiyan
Quoted 8 lines · Daniel Vetter
Quoted 5 lines · Dhinakaran Pandiyan

There is already a check to allow only RGB8888 formats with CCS modifiers.

Thanks for the reviews.

Quoted 8 lines
Quoted 5 lines

Aside: intel_framebuffer_init is horribly long function, and it would probably make a lot of sense to extract all the framebuffer related stuff
into a new intel_framebuffer.c file. intel_display.c is a bit ... big :-)

Yup, it's become a pain to add new stuff. I'll add this to my todo list.

A big chunk of intel_framebuffer_init() should simply be disappeared. I tried but couldn't really come up with any entirely satisfactory solution. Someone should revisit that topic now that we at least figured out what to do with the .format_mod_supported() vs. plane->modifiers[].

https://patchwork.freedesktop.org/series/39384/
https://patchwork.freedesktop.org/series/39701/
https://patchwork.freedesktop.org/series/39814/

Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
In reply to Dhinakaran Pandiyan
Quoted 6 lines · Dhinakaran Pandiyan
Quoted 5 lines · Daniel Vetter
Quoted 2 lines · Dhinakaran Pandiyan
Quoted 8 lines
Quoted 7 lines
Quoted 5 lines

There is already a check to allow only RGB8888 formats with CCS modifiers.

Quoted 1 line

Thanks for the reviews.

Pushed this to -dinq.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove unecessary check for unsupported modifiers for NV12

In reply to Dhinakaran Pandiyan
== Series Details ==

== Series Details ==

Series: drm/i915: Remove unecessary check for unsupported modifiers for NV12
URL : https://patchwork.freedesktop.org/series/45548/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
ba24b4784bad drm/i915: Remove unecessary check for unsupported modifiers for NV12
-:4: WARNING:TYPO_SPELLING: 'unecessary' may be misspelled - perhaps 'unnecessary'?
#4: 
Subject: [PATCH] drm/i915: Remove unecessary check for unsupported modifiers

total: 0 errors, 1 warnings, 0 checks, 11 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

✓ Fi.CI.BAT: success for drm/i915: Remove unecessary check for unsupported modifiers for NV12

In reply to Dhinakaran Pandiyan
== Series Details ==

== Series Details ==

Series: drm/i915: Remove unecessary check for unsupported modifiers for NV12
URL : https://patchwork.freedesktop.org/series/45548/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4395 -> Patchwork_9458 =

== Summary - SUCCESS ==

No regressions found.

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

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_chamelium@dp-edid-read:
      fi-kbl-7500u:       PASS -> FAIL (fdo#103841)

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

fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927

== Participating hosts (43 -> 39) ==

Additional (1): fi-bxt-dsi
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u

== Build changes ==

* Linux: CI_DRM_4395 -> Patchwork_9458

CI_DRM_4395: 90dc6e8ebc4152ea9f146c023b06f15371cbb244 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4530: 0e98bf69f146eb72fe3a7c3b19a049b5786f0ca3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9458: ba24b4784badf884cc39c6a5e151f73666b9170c @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

ba24b4784bad drm/i915: Remove unecessary check for unsupported modifiers for NV12

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9458/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#7 lore raw
In reply to Dhinakaran Pandiyan

Op 28-06-18 om 08:18 schreef Dhinakaran Pandiyan:

Quoted 14 lines

There is already a check to allow only RGB8888 formats with CCS modifiers.

---
 drivers/gpu/drm/i915/intel_display.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -0
index eaa0663963a5..c5ec13e0f484 100644
@@ -14521,11 +14521,6 @@ static int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
 		}

drivers/gpu/drm/i915/intel_display.c static int intel_framebuffer_init(struct intel_framebuffer *intel_fb, · line 14526

Quoted 10 lines
drivers/gpu/drm/i915/intel_display.c +0 -5
 		break;
 	case DRM_FORMAT_NV12:
-		if (mode_cmd->modifier[0] == I915_FORMAT_MOD_Y_TILED_CCS ||
-		    mode_cmd->modifier[0] == I915_FORMAT_MOD_Yf_TILED_CCS) {
-			DRM_DEBUG_KMS("RC not to be enabled with NV12\n");
-			goto err;
-		}
 		if (INTEL_GEN(dev_priv) < 9 || IS_SKYLAKE(dev_priv) ||
 		    IS_BROXTON(dev_priv)) {
 			DRM_DEBUG_KMS("unsupported pixel format: %s\n",

Fair enough, probably rebase noise. :)

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

✓ Fi.CI.IGT: success for drm/i915: Remove unecessary check for unsupported modifiers for NV12

In reply to Dhinakaran Pandiyan
== Series Details ==

== Series Details ==

Series: drm/i915: Remove unecessary check for unsupported modifiers for NV12
URL : https://patchwork.freedesktop.org/series/45548/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4395_full -> Patchwork_9458_full =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_9458_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_9458_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

== Possible new issues ==

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

=== IGT changes ===

    ==== Warnings ====

    igt@gem_exec_schedule@deep-bsd2:
      shard-kbl:          PASS -> SKIP

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_gtt:
      shard-glk:          PASS -> FAIL (fdo#105347)

    igt@drv_suspend@fence-restore-untiled:
      shard-kbl:          NOTRUN -> DMESG-WARN (fdo#103313)

    igt@drv_suspend@shrink:
      shard-snb:          PASS -> INCOMPLETE (fdo#105411)

    igt@gem_ctx_switch@basic-all-light:
      shard-hsw:          PASS -> INCOMPLETE (fdo#103540)

    igt@gem_exec_schedule@pi-ringfull-render:
      shard-kbl:          NOTRUN -> FAIL (fdo#103158)

    igt@gem_mmap_gtt@coherency:
      shard-glk:          NOTRUN -> FAIL (fdo#100587)

    igt@gem_softpin@noreloc-s3:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665)

    igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
      shard-glk:          NOTRUN -> FAIL (fdo#106509, fdo#105454)

    igt@kms_flip@plain-flip-ts-check-interruptible:
      shard-glk:          PASS -> FAIL (fdo#100368)

    igt@kms_flip_tiling@flip-to-x-tiled:
      shard-glk:          PASS -> FAIL (fdo#103822, fdo#104724) +1

    
    ==== Possible fixes ====

    igt@drv_selftest@live_hangcheck:
      shard-apl:          DMESG-FAIL (fdo#106560, fdo#106947) -> PASS

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

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

    igt@kms_flip@modeset-vs-vblank-race:
      shard-glk:          FAIL (fdo#103060) -> PASS

    igt@kms_flip@plain-flip-fb-recreate:
      shard-glk:          FAIL (fdo#100368) -> PASS

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#100587 https://bugs.freedesktop.org/show_bug.cgi?id=100587
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947

== Participating hosts (6 -> 6) ==

No changes in participating hosts

== Build changes ==

* Linux: CI_DRM_4395 -> Patchwork_9458

CI_DRM_4395: 90dc6e8ebc4152ea9f146c023b06f15371cbb244 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4530: 0e98bf69f146eb72fe3a7c3b19a049b5786f0ca3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9458: ba24b4784badf884cc39c6a5e151f73666b9170c @ 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_9458/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx