Skip to contentSkip to conversation

drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

PATCH In review Hans de Goede 4 participants 7 messages Jan 17, 2018

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

PATCH 1/1 drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

All Kconfig menu menu entries should have a depends on MENU_OPTION, the menu stops after the first Kconfig entry without this depends on.

Since the PANEL_ORIENTATION_QUIRKS option is also used outside of DRM, it deliberately does not have a depends on DRM, but this causes all items after it to show as separate items rather then under the DRM menuconfig.

This commit moves PANEL_ORIENTATION_QUIRKS to the end of the drm Kconfig file, grouping it with DRM_LIB_RANDOM which also does not depend on DRM, fixing the DRM menuconfig.

Fixes 404d1a3edc38 ("drm: Add panel orientation quirks, v6.")
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/Kconfig +4 -4
index 0bc374459440..deeefa7a1773 100644
@@ -27,10 +27,6 @@ config DRM_MIPI_DSI
 	bool
 	depends on DRM
 
-# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
-config DRM_PANEL_ORIENTATION_QUIRKS
-	tristate
-
 config DRM_DP_AUX_CHARDEV
 	bool "DRM DP AUX Interface"
 	depends on DRM
@@ -372,6 +368,10 @@ config DRM_SAVAGE
 
 endif # DRM_LEGACY
 
+# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
+config DRM_PANEL_ORIENTATION_QUIRKS
+	tristate
+
 config DRM_LIB_RANDOM
 	bool
 	default n
Signature · 6 lines
2.14.3

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

✓ Fi.CI.BAT: success for drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

== Series Details ==

== Series Details ==

Series: drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig
URL : https://patchwork.freedesktop.org/series/36595/
State : success

== Summary ==

Series 36595v1 drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig
https://patchwork.freedesktop.org/api/1.0/series/36595/revisions/1/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-b:
                pass       -> INCOMPLETE (fi-snb-2520m) fdo#103713

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

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:418s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:432s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:372s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:490s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:281s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:483s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:484s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:466s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:462s
fi-elk-e7500     total:224  pass:168  dwarn:10  dfail:0   fail:0   skip:45 
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:512s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:391s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:405s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:411s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:462s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:415s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:464s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:498s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:453s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:509s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:585s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:435s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:509s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:528s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:489s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:495s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:432s
fi-snb-2520m     total:245  pass:211  dwarn:0   dfail:0   fail:0   skip:33 
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:394s
Blacklisted hosts:
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:567s
fi-glk-dsi       total:288  pass:257  dwarn:0   dfail:0   fail:1   skip:30  time:476s

bf4fa7c9c108a7c8f9a966f940d8df733b4a4b89 drm-tip: 2018y-01m-17d-07h-03m-28s UTC integration manifest 000479c816f5 drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

== Logs ==

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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Hans de Goede
Quoted 8 lines · Hans de Goede

All Kconfig menu menu entries should have a depends on MENU_OPTION, the menu stops after the first Kconfig entry without this depends on.

Since the PANEL_ORIENTATION_QUIRKS option is also used outside of DRM, it deliberately does not have a depends on DRM, but this causes all items after it to show as separate items rather then under the DRM menuconfig.

Quoted 8 lines

This commit moves PANEL_ORIENTATION_QUIRKS to the end of the drm Kconfig file, grouping it with DRM_LIB_RANDOM which also does not depend on DRM, fixing the DRM menuconfig.

Fixes 404d1a3edc38 ("drm: Add panel orientation quirks, v6.")
Cc Chris Wilson <[email protected]>

Probably best if you push to to drm-misc-next-fixes so it gets into 4.16 still.
-Daniel

Quoted 37 lines
---
 drivers/gpu/drm/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/Kconfig +4 -4
index 0bc374459440..deeefa7a1773 100644
@@ -27,10 +27,6 @@ config DRM_MIPI_DSI
 	bool
 	depends on DRM
 
-# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
-config DRM_PANEL_ORIENTATION_QUIRKS
-	tristate
-
 config DRM_DP_AUX_CHARDEV
 	bool "DRM DP AUX Interface"
 	depends on DRM
@@ -372,6 +368,10 @@ config DRM_SAVAGE
 
 endif # DRM_LEGACY
 
+# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
+config DRM_PANEL_ORIENTATION_QUIRKS
+	tristate
+
 config DRM_LIB_RANDOM
 	bool
 	default n
Signature · 6 lines
2.14.3

_______________________________________________
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
#3 lore raw

Hi,

Quoted 18 lines · Daniel Vetter
Quoted 8 lines · Hans de Goede

All Kconfig menu menu entries should have a depends on MENU_OPTION, the menu stops after the first Kconfig entry without this depends on.

Since the PANEL_ORIENTATION_QUIRKS option is also used outside of DRM, it deliberately does not have a depends on DRM, but this causes all items after it to show as separate items rather then under the DRM menuconfig.

Quoted 8 lines

This commit moves PANEL_ORIENTATION_QUIRKS to the end of the drm Kconfig file, grouping it with DRM_LIB_RANDOM which also does not depend on DRM, fixing the DRM menuconfig.

Fixes 404d1a3edc38 ("drm: Add panel orientation quirks, v6.")
Cc Chris Wilson <[email protected]>
Quoted 4 lines

Probably best if you push to to drm-misc-next-fixes so it gets into 4.16 still.

Ok, does that mean I need to push it to 2 branches, or will it automatically and up in drm-misc-next if I push it to drm-misc-next-fixes?

Regards,

Hans

Quoted 33 lines
Quoted 33 lines
---
  drivers/gpu/drm/Kconfig | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/Kconfig +4 -4
index 0bc374459440..deeefa7a1773 100644
@@ -27,10 +27,6 @@ config DRM_MIPI_DSI
  	bool
  	depends on DRM
 
-# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
-config DRM_PANEL_ORIENTATION_QUIRKS
-	tristate
-
  config DRM_DP_AUX_CHARDEV
  	bool "DRM DP AUX Interface"
  	depends on DRM
@@ -372,6 +368,10 @@ config DRM_SAVAGE
 
  endif # DRM_LEGACY
 
+# Separate option because drm_panel_orientation_quirks.c is shared with fbdev
+config DRM_PANEL_ORIENTATION_QUIRKS
+	tristate
+
  config DRM_LIB_RANDOM
  	bool
  	default n
Signature · 1 line
2.14.3
Quoted 5 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

#4 lore raw
Quoted 24 lines · Hans de Goede

Hi,

Quoted 21 lines · Daniel Vetter
Quoted 17 lines · Hans de Goede

All Kconfig menu menu entries should have a depends on MENU_OPTION, the menu stops after the first Kconfig entry without this depends on.

Since the PANEL_ORIENTATION_QUIRKS option is also used outside of DRM, it deliberately does not have a depends on DRM, but this causes all items after it to show as separate items rather then under the DRM menuconfig.

This commit moves PANEL_ORIENTATION_QUIRKS to the end of the drm Kconfig file, grouping it with DRM_LIB_RANDOM which also does not depend on DRM, fixing the DRM menuconfig.

Fixes 404d1a3edc38 ("drm: Add panel orientation quirks, v6.")
Cc Chris Wilson <[email protected]>
Quoted 8 lines
Quoted 4 lines

Probably best if you push to to drm-misc-next-fixes so it gets into 4.16 still.

Ok, does that mean I need to push it to 2 branches, or will it automatically and up in drm-misc-next if I push it to drm-misc-next-fixes?

Only one branch. We'll do a backmerge eventually to sync up drm-misc-next with the other branches. Or if you need it right away, you can request that from the -next maintainer for that cycle (Sean this time around).
-Daniel

Quoted 47 lines

Regards,

Hans

Quoted 38 lines
Quoted 36 lines
---
  drivers/gpu/drm/Kconfig | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/Kconfig +0 -0
index 0bc374459440..deeefa7a1773 100644
@@ -27,10 +27,6 @@ config DRM_MIPI_DSI
        bool
        depends on DRM
  -# Separate option because drm_panel_orientation_quirks.c is shared

with fbdev

drivers/gpu/drm/Kconfig +0 -3
-config DRM_PANEL_ORIENTATION_QUIRKS
-       tristate
-
  config DRM_DP_AUX_CHARDEV
        bool "DRM DP AUX Interface"
        depends on DRM
@@ -372,6 +368,10 @@ config DRM_SAVAGE
    endif # DRM_LEGACY
  +# Separate option because drm_panel_orientation_quirks.c is shared

with fbdev

drivers/gpu/drm/Kconfig +3 -1
+config DRM_PANEL_ORIENTATION_QUIRKS
+       tristate
+
  config DRM_LIB_RANDOM
        bool
        default n
--

2.14.3

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

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#5 lore raw

Hi,

Quoted 31 lines · Daniel Vetter
Quoted 30 lines · Hans de Goede

Hi,

Quoted 25 lines · Daniel Vetter
Quoted 9 lines · Hans de Goede

All Kconfig menu menu entries should have a depends on MENU_OPTION, the menu stops after the first Kconfig entry without this depends on.

Since the PANEL_ORIENTATION_QUIRKS option is also used outside of DRM, it deliberately does not have a depends on DRM, but this causes all items after it to show as separate items rather then under the DRM menuconfig.

Quoted 8 lines

This commit moves PANEL_ORIENTATION_QUIRKS to the end of the drm Kconfig file, grouping it with DRM_LIB_RANDOM which also does not depend on DRM, fixing the DRM menuconfig.

Fixes 404d1a3edc38 ("drm: Add panel orientation quirks, v6.")
Cc Chris Wilson <[email protected]>

Probably best if you push to to drm-misc-next-fixes so it gets into 4.16 still.

Quoted 8 lines
Quoted 2 lines

Ok, does that mean I need to push it to 2 branches, or will it automatically and up in drm-misc-next if I push it to drm-misc-next-fixes?

Only one branch. We'll do a backmerge eventually to sync up drm-misc-next with the other branches. Or if you need it right away, you can request that from the -next maintainer for that cycle (Sean this time around).

Ok, pushed to drm-misc-next-fixes and as always thank you for your help.

Regards,

Hans

Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
Quoted 32 lines
---
   drivers/gpu/drm/Kconfig | 8 ++++----
   1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/Kconfig +0 -0
index 0bc374459440..deeefa7a1773 100644
@@ -27,10 +27,6 @@ config DRM_MIPI_DSI
         bool
         depends on DRM
   -# Separate option because drm_panel_orientation_quirks.c is shared

with fbdev

drivers/gpu/drm/Kconfig +0 -3
-config DRM_PANEL_ORIENTATION_QUIRKS
-       tristate
-
   config DRM_DP_AUX_CHARDEV
         bool "DRM DP AUX Interface"
         depends on DRM
@@ -372,6 +368,10 @@ config DRM_SAVAGE
     endif # DRM_LEGACY
   +# Separate option because drm_panel_orientation_quirks.c is shared

with fbdev

drivers/gpu/drm/Kconfig +3 -1
+config DRM_PANEL_ORIENTATION_QUIRKS
+       tristate
+
   config DRM_LIB_RANDOM
         bool
         default n
--

2.14.3

Quoted 10 lines
Quoted 7 lines
Quoted 6 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

#6 lore raw

✗ Fi.CI.IGT: failure for drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

In reply to Hans de Goede
== Series Details ==

== Series Details ==

Series: drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig
URL : https://patchwork.freedesktop.org/series/36595/
State : failure

== Summary ==

Test pm_rc6_residency:

        Subgroup rc6-accuracy:
                pass       -> SKIP       (shard-snb)
Test kms_chv_cursor_fail:
        Subgroup pipe-b-64x64-left-edge:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
                pass       -> FAIL       (shard-snb) fdo#101623 +2
Test perf:
        Subgroup polling:
                fail       -> PASS       (shard-hsw) fdo#102252

fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252

shard-hsw        total:2653 pass:1496 dwarn:1   dfail:0   fail:11  skip:1144 time:8722s
shard-snb        total:2724 pass:1315 dwarn:1   dfail:0   fail:12  skip:1395 time:7609s

Blacklisted hosts:
shard-apl total:2729 pass:1702 dwarn:1 dfail:1 fail:24 skip:1001 time:13724s

== Logs ==

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