Skip to contentSkip to conversation

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

PATCH In review Rodrigo Vivi 7 participants 11 messages Dec 5, 2017

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

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

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
 drivers/gpu/drm/i915/intel_dsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dsi.c +1 -1
index 1b60df3c14a0..f67d321376e4 100644
@@ -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)) {
Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · 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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
  drivers/gpu/drm/i915/intel_dsi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dsi.c +0 -0
index 1b60df3c14a0..f67d321376e4 100644

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector) · line 1676

Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
@@ -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)) {

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

author maintainer
#2 lore raw
Quoted 5 lines · Michel Thierry
Quoted 4 lines · 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.

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.

Quoted 14 lines
Quoted 14 lines

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
  drivers/gpu/drm/i915/intel_dsi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector) · line 1676

Quoted 13 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
index 1b60df3c14a0..f67d321376e4 100644
@@ -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)) {
 

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

#3 lore raw

Hi,

Quoted 10 lines · Rodrigo Vivi
Quoted 5 lines · Michel Thierry
Quoted 4 lines · 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.

Ops, the biggest issue now is that one patch is on drm-misc-next while the other one is on drm-intel-next-queued.

Quoted 7 lines

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

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
   drivers/gpu/drm/i915/intel_dsi.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dsi.c +0 -0
index 1b60df3c14a0..f67d321376e4 100644
@@ -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);
Quoted 8 lines

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
   	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)) {
 

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

maintainer
#4 lore raw
Quoted 35 lines · Hans de Goede

Hi,

Quoted 10 lines · Rodrigo Vivi
Quoted 5 lines · Michel Thierry
Quoted 4 lines · 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.

Ops, the biggest issue now is that one patch is on drm-misc-next while the other one is on drm-intel-next-queued.

Quoted 7 lines

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:

(quoted diff) +0 -2
-Merge drm-misc-next into dinq
-Add a fixup commit to dinq on top

Option 2:

Review

Quoted 3 lines
(quoted diff) +0 -3
-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

Quoted 41 lines

Regards,

Hans

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
   drivers/gpu/drm/i915/intel_dsi.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dsi.c +0 -0
index 1b60df3c14a0..f67d321376e4 100644
@@ -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);
Quoted 8 lines

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
   	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)) {
 

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

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 43 lines · Joonas Lahtinen
Quoted 35 lines · Hans de Goede

Hi,

Quoted 10 lines · Rodrigo Vivi
Quoted 5 lines · Michel Thierry
Quoted 4 lines · 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.

Ops, the biggest issue now is that one patch is on drm-misc-next while the other one is on drm-intel-next-queued.

Quoted 7 lines

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:

(quoted diff) +0 -2
-Merge drm-misc-next into dinq
-Add a fixup commit to dinq on top

Option 2:

Review

Quoted 3 lines
(quoted diff) +0 -3
-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:

Quoted 7 lines

- 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

Quoted 48 lines

Regards, Joonas

Quoted 41 lines

Regards,

Hans

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
   drivers/gpu/drm/i915/intel_dsi.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_dsi.c +0 -0
index 1b60df3c14a0..f67d321376e4 100644
@@ -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);
Quoted 8 lines

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
   	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)) {
 

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

Signature · 3 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
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
#6 lore raw

Hi,

Quoted 50 lines · Daniel Vetter
Quoted 49 lines · Joonas Lahtinen
Quoted 35 lines · Hans de Goede

Hi,

Quoted 10 lines · Rodrigo Vivi
Quoted 5 lines · Michel Thierry
Quoted 4 lines · 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.

Ops, the biggest issue now is that one patch is on drm-misc-next while the other one is on drm-intel-next-queued.

Quoted 7 lines

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:

(quoted diff) +0 -2
-Merge drm-misc-next into dinq
-Add a fixup commit to dinq on top

Option 2:

Review

Quoted 3 lines
(quoted diff) +0 -3
-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.

Quoted 8 lines
Quoted 1 line

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

Quoted 29 lines
Quoted 29 lines
Quoted 29 lines
Quoted 28 lines
Quoted 28 lines
Quoted 18 lines

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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
    drivers/gpu/drm/i915/intel_dsi.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dsi.c +0 -0
index 1b60df3c14a0..f67d321376e4 100644

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector) · line 1676

Quoted 8 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
@@ -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)) {
 
Quoted 9 lines
Quoted 8 lines
Quoted 4 lines

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

Signature · 3 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation

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

#7 lore raw

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

In reply to Rodrigo Vivi
== Series Details ==

== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author maintainer
#8 lore raw

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

Quoted 8 lines · Patchwork

== Series Details ==

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

== Summary ==

Quoted 13 lines

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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
In reply to Rodrigo Vivi
Quoted 23 lines · 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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
 drivers/gpu/drm/i915/intel_dsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dsi.c +0 -0
index 1b60df3c14a0..f67d321376e4 100644

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector) · line 1673

Quoted 5 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
@@ -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.

Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +0 -0
 	u32 val;
 
 	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#10 lore raw
Quoted 19 lines · Ville Syrjälä
Quoted 18 lines · 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 <[email protected]>
Cc Daniel Vetter <[email protected]>
Cc Hans de Goede <[email protected]>
Fixes 82daca297506 ("drm/i915: Add "panel orientation" property to the panel connector, v6.")
---
 drivers/gpu/drm/i915/intel_dsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 12 lines

drivers/gpu/drm/i915/intel_dsi.c static int intel_dsi_get_panel_orientation(struct intel_connector *connector) · line 1673

Quoted 10 lines
drivers/gpu/drm/i915/intel_dsi.c +1 -1
index 1b60df3c14a0..f67d321376e4 100644
@@ -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.

Quoted 4 lines

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

Quoted 13 lines
Quoted 11 lines
drivers/gpu/drm/i915/intel_dsi.c +0 -0
 	u32 val;
 
 	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx