[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 at 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 at chris-wilson.co.uk>
>>> Reported-by: Chris Wilson <chris at chris-wilson.co.uk>
>>> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
>>
>>
>> Reviewed-by: Daniel Vetter <daniel.vetter at 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 at 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