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

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

[Rodrigo Vivi]

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.

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@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Hans de Goede <hdegoede@redhat.com>
Suggested-by: Michel Thierry <michel.thierry@intel.com>
Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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)) {
-- 
2.13.6

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

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

[Michel Thierry]

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.
> 
> 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@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Suggested-by: Michel Thierry <michel.thierry@intel.com>
> Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: Fix compilation (panel orientation x enum plane rename).

[Patchwork]

== Series Details ==

Series: drm/i915: Fix compilation (panel orientation x enum plane rename).
URL   : https://patchwork.freedesktop.org/series/34876/
State : failure

== Summary ==

Applying: drm/i915: Fix compilation (panel orientation x enum plane rename).
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_dsi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_dsi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dsi.c
Patch failed at 0001 drm/i915: Fix compilation (panel orientation x enum plane rename).
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

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

Re: ✗ Fi.CI.BAT: failure for drm/i915: Fix compilation (panel orientation x enum plane rename).

[Rodrigo Vivi]

On Tue, Dec 05, 2017 at 12:14:22AM +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Fix compilation (panel orientation x enum plane rename).
> URL   : https://patchwork.freedesktop.org/series/34876/
> State : failure
> 
> == Summary ==
> 
> Applying: drm/i915: Fix compilation (panel orientation x enum plane rename).
> error: Failed to merge in the changes.
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/intel_dsi.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/intel_dsi.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dsi.c
> Patch failed at 0001 drm/i915: Fix compilation (panel orientation x enum plane rename).
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 

Ouch! commit '82daca297506 ("drm/i915: Add "panel orientation"
property to the panel connector, v6.")' is merged on drm-misc, not on drm-intel-next-queued.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Rodrigo Vivi]

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.

Thanks,
Rodrigo.

> > 
> > 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@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Suggested-by: Michel Thierry <michel.thierry@intel.com>
> > Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [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@intel.com>
>>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>>> Cc: Hans de Goede <hdegoede@redhat.com>
>>> Suggested-by: Michel Thierry <michel.thierry@intel.com>
>>> Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
>>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Joonas Lahtinen]

On Tue, 2017-12-05 at 09:18 +0100, Hans de Goede wrote:
> 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

Actually, what was needed (a very badly documented, with obscure
automated fixup patch naming :P) Option 3:

- Add a fixup commit to drm-rerere, so that it gets applied when
merging drm-intel-next-queued to drm-tip.

So it's basically like amending a regular GIT merge with --amend, where
the fixup diff resides in drm-rerere as a .patch file.

It's fixed now.

Regards, Joonas

> 
> 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@intel.com>
> > > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > > > Cc: Hans de Goede <hdegoede@redhat.com>
> > > > Suggested-by: Michel Thierry <michel.thierry@intel.com>
> > > > Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
> > > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Daniel Vetter]

On Tue, Dec 05, 2017 at 12:12:27PM +0200, Joonas Lahtinen wrote:
> On Tue, 2017-12-05 at 09:18 +0100, Hans de Goede wrote:
> > 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
> 
> Actually, what was needed (a very badly documented, with obscure
> automated fixup patch naming :P) Option 3:
> 
> - Add a fixup commit to drm-rerere, so that it gets applied when
> merging drm-intel-next-queued to drm-tip.
> 
> So it's basically like amending a regular GIT merge with --amend, where
> the fixup diff resides in drm-rerere as a .patch file.
> 
> It's fixed now.

btw the recommended way to prevent this is to develop patches on top of
drm-tip. Then if you apply it to a branch where not all the patches are
included you'll either get a conflict or it wont' compile anymore. Either
way a warning sign telling you to check that drm-tip is still in good
shape. I think we even have that best practice documented in the committer
section of our docs.

Cheers, Daniel
> 
> Regards, Joonas
> 
> > 
> > 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@intel.com>
> > > > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > > > > Cc: Hans de Goede <hdegoede@redhat.com>
> > > > > Suggested-by: Michel Thierry <michel.thierry@intel.com>
> > > > > Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
> > > > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> -- 
> Joonas Lahtinen
> Open Source Technology Center
> Intel Corporation

-- 
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/i915: Fix compilation (panel orientation x enum plane rename).

[Hans de Goede]

Hi,

On 05-12-17 11:14, Daniel Vetter wrote:
> On Tue, Dec 05, 2017 at 12:12:27PM +0200, Joonas Lahtinen wrote:
>> On Tue, 2017-12-05 at 09:18 +0100, Hans de Goede wrote:
>>> 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
>>
>> Actually, what was needed (a very badly documented, with obscure
>> automated fixup patch naming :P) Option 3:
>>
>> - Add a fixup commit to drm-rerere, so that it gets applied when
>> merging drm-intel-next-queued to drm-tip.
>>
>> So it's basically like amending a regular GIT merge with --amend, where
>> the fixup diff resides in drm-rerere as a .patch file.
>>
>> It's fixed now.
> 
> btw the recommended way to prevent this is to develop patches on top of
> drm-tip. Then if you apply it to a branch where not all the patches are
> included you'll either get a conflict or it wont' compile anymore. Either
> way a warning sign telling you to check that drm-tip is still in good
> shape. I think we even have that best practice documented in the committer
> section of our docs.

Ok, I will remember that for the next time.

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@intel.com>
>>>>>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>>>>>> Cc: Hans de Goede <hdegoede@redhat.com>
>>>>>> Suggested-by: Michel Thierry <michel.thierry@intel.com>
>>>>>> Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
>>>>>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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@intel.com>
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> -- 
>> Joonas Lahtinen
>> Open Source Technology Center
>> Intel Corporation
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Ville Syrjälä]

On Mon, Dec 04, 2017 at 04:04:15PM -0800, 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.
> 
> 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@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Suggested-by: Michel Thierry <michel.thierry@intel.com>
> Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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;

s/plane/i9xx_plane/ for consistency

Not that I particularly like having this code here in the first
place. Ideally it would be part of proper plane state readout, but since
we don't have that I think it should be in some more central place so
that every connector can use it.

>  	u32 val;
>  
>  	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> -- 
> 2.13.6
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Joonas Lahtinen]

On Tue, 2017-12-05 at 15:38 +0200, Ville Syrjälä wrote:
> On Mon, Dec 04, 2017 at 04:04:15PM -0800, 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.
> > 
> > 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@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Suggested-by: Michel Thierry <michel.thierry@intel.com>
> > Fixes: 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@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;
> 
> s/plane/i9xx_plane/ for consistency

I pushed the minimal fix to unbreak the tree.

> Not that I particularly like having this code here in the first
> place. Ideally it would be part of proper plane state readout, but since
> we don't have that I think it should be in some more central place so
> that every connector can use it.

I guess further changes should be queued as a follow-up patch to drm-
misc-next (just remember to refresh the -fixup.patch).

Regards, Joonas

> 
> >  	u32 val;
> >  
> >  	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
> > -- 
> > 2.13.6
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> 
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx