[Intel-gfx] [PATCH] drm/i915: Fix compilation (panel orientation x enum plane rename).

[Hans de Goede]

Hi,

On 05-12-17 01:58, Rodrigo Vivi wrote:
> On Tue, Dec 05, 2017 at 12:09:35AM +0000, Michel Thierry wrote:
>> On 12/4/2017 4:04 PM, Rodrigo Vivi wrote:
>>> When commit '82daca297506 ("drm/i915: Add "panel orientation"
>>> property to the panel connector, v6.")' was done and tested
>>> by CI, commit 'ed15030d7ab0 ("drm/i915: s/enum plane/enum
>>> i9xx_plane_id/")' wasn't there already.
> 
> Ops, the biggest issue now is that one patch is on drm-misc-next while
> the other one is on drm-intel-next-queued.
> 
> I would just revert this from drm-misc-next and apply it to dinq
> with a new fixed version or with this patch on top. But I'm not taking
> any harsh decision without ack from drm-misc maintainers.
> 
> I will check to see if I get some ack or better ideas tonight before going
> to bed or in a hope that someone in Europe timezone get this in the morning
> and fix it.

Ugh, sorry, I tested that I did not break drm-misc-next compilation,
but I did not realize this was going to break drm-tip compilation.

Just reverting the offending commit on drm-misc-next and
adding a fixed version to dinq will not worked because the patch
depends on the new panel-orientation member of struct drm_display_info.

So there are 2 options AFAICT:

Option 1:
-Merge drm-misc-next into dinq
-Add a fixup commit to dinq on top

Option 2:
-Revert the commit from drm-misc-next
-Merge drm-misc-next into dinq
-Add a fixed version of the commit into dinq

Regards,

Hans



>>>
>>> On this race the second patch got merged first so the first one
>>> broke i915 compilation. Thanks to Michel this was found quickly.
>>>
>>> Cc: Michel Thierry <michel.thierry at intel.com>
>>> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
>>> Cc: Hans de Goede <hdegoede at redhat.com>
>>> Suggested-by: Michel Thierry <michel.thierry at intel.com>
>>> Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
>>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
>>> ---
>>>    drivers/gpu/drm/i915/intel_dsi.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
>>> index 1b60df3c14a0..f67d321376e4 100644
>>> --- a/drivers/gpu/drm/i915/intel_dsi.c
>>> +++ b/drivers/gpu/drm/i915/intel_dsi.c
>>> @@ -1670,7 +1670,7 @@ static int intel_dsi_get_panel_orientation(struct intel_connector *connector)
>>>    {
>>>    	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
>>>    	int orientation = DRM_MODE_PANEL_ORIENTATION_NORMAL;
>>> -	enum plane plane;
>>> +	enum i9xx_plane_id plane;
>>>    	u32 val;
>>>    	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
>>>
>>
>> Reviewed-by: Michel Thierry <michel.thierry at intel.com>