[PATCH] drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

[PATCH] drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

[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 <chris@chris-wilson.co.uk>
Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/gpu/drm/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 0bc374459440..deeefa7a1773 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -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
-- 
2.14.3

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

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

[Patchwork]

== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

[Daniel Vetter]

On Wed, Jan 17, 2018 at 09:10:32AM +0100, Hans de Goede wrote:
> 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 <chris@chris-wilson.co.uk>
> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

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

> ---
>  drivers/gpu/drm/Kconfig | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index 0bc374459440..deeefa7a1773 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -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
> -- 
> 2.14.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

[Hans de Goede]

Hi,

On 17-01-18 09:40, Daniel Vetter wrote:
> On Wed, Jan 17, 2018 at 09:10:32AM +0100, Hans de Goede wrote:
>> 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 <chris@chris-wilson.co.uk>
>> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> 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



>> ---
>>   drivers/gpu/drm/Kconfig | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>> index 0bc374459440..deeefa7a1773 100644
>> --- a/drivers/gpu/drm/Kconfig
>> +++ b/drivers/gpu/drm/Kconfig
>> @@ -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
>> -- 
>> 2.14.3
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

[Daniel Vetter]

On Wed, Jan 17, 2018 at 9:42 AM, Hans de Goede <j.w.r.degoede@gmail.com> wrote:
> Hi,
>
> On 17-01-18 09:40, Daniel Vetter wrote:
>>
>> On Wed, Jan 17, 2018 at 09:10:32AM +0100, Hans de Goede wrote:
>>>
>>> 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 <chris@chris-wilson.co.uk>
>>> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>
>>
>> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>>
>> 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

>
> Regards,
>
> Hans
>
>
>
>
>>> ---
>>>   drivers/gpu/drm/Kconfig | 8 ++++----
>>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>>> index 0bc374459440..deeefa7a1773 100644
>>> --- a/drivers/gpu/drm/Kconfig
>>> +++ b/drivers/gpu/drm/Kconfig
>>> @@ -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
>>> --
>>> 2.14.3
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
>>
>



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm: Fix PANEL_ORIENTATION_QUIRKS breaking the Kconfig DRM menuconfig

[Hans de Goede]

Hi,

On 17-01-18 09:48, Daniel Vetter wrote:
> On Wed, Jan 17, 2018 at 9:42 AM, Hans de Goede <j.w.r.degoede@gmail.com> wrote:
>> Hi,
>>
>> On 17-01-18 09:40, Daniel Vetter wrote:
>>>
>>> On Wed, Jan 17, 2018 at 09:10:32AM +0100, Hans de Goede wrote:
>>>>
>>>> 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 <chris@chris-wilson.co.uk>
>>>> Reported-by: Chris Wilson <chris@chris-wilson.co.uk>
>>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>>
>>>
>>> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>>>
>>> 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).

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

Regards,

Hans


>>>> ---
>>>>    drivers/gpu/drm/Kconfig | 8 ++++----
>>>>    1 file changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
>>>> index 0bc374459440..deeefa7a1773 100644
>>>> --- a/drivers/gpu/drm/Kconfig
>>>> +++ b/drivers/gpu/drm/Kconfig
>>>> @@ -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
>>>> --
>>>> 2.14.3
>>>>
>>>> _______________________________________________
>>>> Intel-gfx mailing list
>>>> Intel-gfx@lists.freedesktop.org
>>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>>
>>>
>>
> 
> 
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Patchwork]

== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx