| Message ID | ygbPTKPSWe6cj3VaZ_V5I0Pg3VobZiiFKAHEZHGqXPMAahNqYoPw60gkBMaSew0nz9RLj9LLkJ99ZO6HbXvDCkoTSHzA9_9br2M5sHKLTW4=@emersion.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: add immutable zpos plane properties | expand |
Quoting Simon Ser (2019-03-30 00:19:25) > From: emersion <contact@emersion.fr> Please fix your From: field. > This adds basic immutable support for the zpos property. The zpos increases > from bottom to top: primary, sprites, cursor. > > Signed-off-by: Simon Ser <contact@emersion.fr> This is just Ville's patch rebased, so it's incorrect to strip the S-o-b, please read: https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin Regards, Joonas
On Tuesday, April 2, 2019 3:35 PM, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote: > Quoting Simon Ser (2019-03-30 00:19:25) > > > From: emersion contact@emersion.fr > > Please fix your From: field. Gah. > > This adds basic immutable support for the zpos property. The zpos increases > > from bottom to top: primary, sprites, cursor. > > Signed-off-by: Simon Ser contact@emersion.fr > > This is just Ville's patch rebased, so it's incorrect to strip the S-o-b, > please read: > > https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin Honestly I wasn't sure what to do, especially considering that I've edited most of the lines. I tried to ask on IRC but I got no reply. Thanks for clearing that up! So just to be sure I don't mess up v2: - This is Ville's patch so he definitely should be the author. - Ville's S-o-b should definitely be kept as-is. - Now, should I add my own S-o-b? It seems like I should. - Co-Authored-By probably doesn't make sense here. - I originally wanted to add my Reviewed-by tag, but it probably wouldn't make sense if I have a S-o-b tag. Is this correct?
Quoting Simon Ser (2019-04-02 17:36:33) > On Tuesday, April 2, 2019 3:35 PM, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote: > > Quoting Simon Ser (2019-03-30 00:19:25) > > > > > From: emersion contact@emersion.fr > > > > Please fix your From: field. > > Gah. > > > > This adds basic immutable support for the zpos property. The zpos increases > > > from bottom to top: primary, sprites, cursor. > > > Signed-off-by: Simon Ser contact@emersion.fr > > > > This is just Ville's patch rebased, so it's incorrect to strip the S-o-b, > > please read: > > > > https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin > > Honestly I wasn't sure what to do, especially considering that I've > edited most of the lines. I tried to ask on IRC but I got no reply. > > Thanks for clearing that up! So just to be sure I don't mess up v2: > > - This is Ville's patch so he definitely should be the author. > - Ville's S-o-b should definitely be kept as-is. > - Now, should I add my own S-o-b? It seems like I should. > - Co-Authored-By probably doesn't make sense here. > - I originally wanted to add my Reviewed-by tag, but it probably > wouldn't make sense if I have a S-o-b tag. > > Is this correct? You should git am (maybe with --3way) the original patch, and add a change log entry explaining what you modified about the patch and finally add your own S-o-b. That way the From: will correctly point to the original patch owner and it is clear what modifications you made. For review just poke somebody working in that area (git blame is your friend here). Regards, Joonas
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8576a7f799..f0a85a75bd 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14323,7 +14323,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) const u64 *modifiers; const u32 *formats; int num_formats; - int ret; + int ret, zpos; if (INTEL_GEN(dev_priv) >= 9) return skl_universal_plane_create(dev_priv, pipe, @@ -14412,6 +14412,9 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) DRM_MODE_ROTATE_0, supported_rotations); + zpos = 0; + drm_plane_create_zpos_immutable_property(&plane->base, zpos); + drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs); return plane; @@ -14428,7 +14431,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, { unsigned int possible_crtcs; struct intel_plane *cursor; - int ret; + int ret, zpos; cursor = intel_plane_alloc(); if (IS_ERR(cursor)) @@ -14477,6 +14480,9 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180); + zpos = RUNTIME_INFO(dev_priv)->num_sprites[pipe] + 1; + drm_plane_create_zpos_immutable_property(&cursor->base, zpos); + drm_plane_helper_add(&cursor->base, &intel_plane_helper_funcs); return cursor; diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 65de7387bf..48bd8f9079 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -2354,7 +2354,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, const u64 *modifiers; const u32 *formats; int num_formats; - int ret; + int ret, zpos; if (INTEL_GEN(dev_priv) >= 9) return skl_universal_plane_create(dev_priv, pipe, @@ -2444,6 +2444,9 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, DRM_COLOR_YCBCR_BT709, DRM_COLOR_YCBCR_LIMITED_RANGE); + zpos = sprite + 1; + drm_plane_create_zpos_immutable_property(&plane->base, zpos); + drm_plane_helper_add(&plane->base, &intel_plane_helper_funcs); return plane;