drm/i915: Some plane init cleanups
Subsystems (2)
v2 cover drm/i915: Some plane init cleanups
From: Ville Syrjälä <[email protected]>
Since NV12 more or less made it in I figured it's time to try and land this plane init cleanup series once again.
Ville Syrjälä (13):
drm/i915: Constify intel_plane_funcs
drm/i915: Fix tabs vs. spaces
drm/i915: Populate possible_crtcs for primary/cursor planes drm/i915: Don't populate plane->i9xx_plane for sprites drm/i915: Allow horizontal mirroring for cnl+ "sprite" planes drm/i915: Disallow plane scaling with specific pixel formats drm/i915: Add missing pixel formats for skl+ "sprites" drm/i915: Move plane_state->scaler_id initialization into
intel_create_plane_state()
drm/i915: Introduce intel_plane_alloc()
drm/i915: Extract skl_universal_plane_init() drm/i915: Simplify skl_plane_has_planar()
drm/i915: s/intel_plane/plane/ in sprite init drm/i915: Rename variables in intel_primary_plane_create()
drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/intel_display.c | 310 ++++++------------------- drivers/gpu/drm/i915/intel_drv.h | 16 +- drivers/gpu/drm/i915/intel_sprite.c | 374 ++++++++++++++++++++---------- 4 files changed, 327 insertions(+), 374 deletions(-)
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/13 drm/i915: Constify intel_plane_funcs
From: Ville Syrjälä <[email protected]>
intel_plane funcs can be cosnt. Make it so.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -13252,7 +13252,7 @@ static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,return modifier ==DRM_FORMAT_MOD_LINEAR && format ==DRM_FORMAT_ARGB8888 ; } -static struct drm_plane_funcs intel_plane_funcs = { +static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = intel_plane_destroy,
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 01/13] drm/i915: Constify intel_plane_funcs
Quoted 4 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
intel_planefuncs can be cosnt. Make it so.
s/cosnt/const
Quoted 22 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_display.c +1
-2@@ -13252,7 +13252,7 @@ static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,return modifier ==DRM_FORMAT_MOD_LINEAR && format ==DRM_FORMAT_ARGB8888 ; } -static struct drm_plane_funcs intel_plane_funcs = { +static const struct drm_plane_funcs intel_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = intel_plane_destroy, --2.16.1
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/13 drm/i915: Fix tabs vs. spaces
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
The sprite code has a bunch of spaces where tabs should be used. Fix it up.
--- drivers/gpu/drm/i915/intel_sprite.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +10 -10
@@ -1303,8 +1303,8 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier) }static bool intel_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +uint32_t format, +uint64_t modifier) {struct drm_i915_private *dev_priv =to_i915 (plane->dev);
@@ -1326,14 +1326,14 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, }static const struct drm_plane_funcs intel_sprite_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .atomic_get_property = intel_plane_atomic_get_property, - .atomic_set_property = intel_plane_atomic_set_property, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = intel_sprite_plane_format_mod_supported, + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .atomic_get_property = intel_plane_atomic_get_property, + .atomic_set_property = intel_plane_atomic_set_property, + .atomic_duplicate_state = intel_plane_duplicate_state, + .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = intel_sprite_plane_format_mod_supported, }; bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 02/13] drm/i915: Fix tabs vs. spaces
Quoted 4 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The sprite code has a bunch of spaces where tabs should be used. Fix it up.
I guess the subject could be a little more specific; you aren't fixing the whole driver after all. With that,
Quoted 44 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_sprite.c +10
-10@@ -1303,8 +1303,8 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier) }static bool intel_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +uint32_t format, +uint64_t modifier) {struct drm_i915_private *dev_priv =to_i915 (plane->dev);@@ -1326,14 +1326,14 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, }static const struct drm_plane_funcs intel_sprite_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .atomic_get_property = intel_plane_atomic_get_property, - .atomic_set_property = intel_plane_atomic_set_property, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = intel_sprite_plane_format_mod_supported, + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .atomic_get_property = intel_plane_atomic_get_property, + .atomic_set_property = intel_plane_atomic_set_property, + .atomic_duplicate_state = intel_plane_duplicate_state, + .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = intel_sprite_plane_format_mod_supported, }; bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 02/13] drm/i915: Fix tabs vs. spaces
Quoted 10 lines · Jani Nikula
Quoted 4 lines · Ville Syrjala
From: Ville Syrjälä <[email protected]>
The sprite code has a bunch of spaces where tabs should be used. Fix it up.
I guess the subject could be a little more specific; you aren't fixing the whole driver after all. With that,
Reviewed-by Jani Nikula <[email protected]>
Patch subject amanded and pushed to dinq. Alas I forgot that I had already pushed something to drm-misc-next which made this patch redundant. So in hindsight I should have just dropped this one and avoided the merge conflicts. Thanks for the review anyway.
Quoted 49 lines
Quoted 46 lines
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_sprite.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/intel_sprite.c +10
-10@@ -1303,8 +1303,8 @@ static bool skl_mod_supported(uint32_t format, uint64_t modifier) }static bool intel_sprite_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +uint32_t format, +uint64_t modifier) {struct drm_i915_private *dev_priv =to_i915 (plane->dev);@@ -1326,14 +1326,14 @@ static bool intel_sprite_plane_format_mod_supported(struct drm_plane *plane, }static const struct drm_plane_funcs intel_sprite_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .atomic_get_property = intel_plane_atomic_get_property, - .atomic_set_property = intel_plane_atomic_set_property, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = intel_sprite_plane_format_mod_supported, + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = intel_plane_destroy, + .atomic_get_property = intel_plane_atomic_get_property, + .atomic_set_property = intel_plane_atomic_set_property, + .atomic_duplicate_state = intel_plane_duplicate_state, + .atomic_destroy_state = intel_plane_destroy_state, + .format_mod_supported = intel_sprite_plane_format_mod_supported, }; bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/13 drm/i915: Populate possible_crtcs for primary/cursor planes
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
We're currently not providing the possible_crtcs mask to drm_universal_plane_init() for primary/cursor planes. While that does work on account of drm_crtc_init_with_planes() filling those up for us, it's inconsisten with what we're doing for sprite planes.
Let's just always pass the possible_crtcs bitmask to drm_universal_plane_init(). This does assume that crtc->index == pipe. But we're already making that assumption elsewhere so it doesn't seem like a very big sin here.
--- drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++---- drivers/gpu/drm/i915/intel_sprite.c | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -4
@@ -13445,6 +13445,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)struct intel_plane_state *state =NULL ;const uint32_t *intel_primary_formats;unsigned int supported_rotations; +unsigned int possible_crtcs;unsigned int num_formats;const uint64_t *modifiers;int ret;
@@ -13532,23 +13533,25 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->get_hw_state = i9xx_plane_get_hw_state; } + possible_crtcs =BIT (pipe); +if (INTEL_GEN (dev_priv) >=9 ) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base, -0 , &intel_plane_funcs, + possible_crtcs, &intel_plane_funcs, intel_primary_formats, num_formats, modifiers,DRM_PLANE_TYPE_PRIMARY ,"plane 1%c" ,pipe_name (pipe));else if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base, -0 , &intel_plane_funcs, + possible_crtcs, &intel_plane_funcs, intel_primary_formats, num_formats, modifiers,DRM_PLANE_TYPE_PRIMARY ,"primary %c" ,pipe_name (pipe));else ret = drm_universal_plane_init(&dev_priv->drm, &primary->base, - 0, &intel_plane_funcs, + possible_crtcs, &intel_plane_funcs, intel_primary_formats, num_formats, modifiers, DRM_PLANE_TYPE_PRIMARY,
@@ -13608,6 +13611,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, {struct intel_plane *cursor =NULL ;struct intel_plane_state *state =NULL ; +unsigned int possible_crtcs;int ret; cursor =kzalloc (sizeof (*cursor),GFP_KERNEL );
@@ -13649,8 +13653,10 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,if (IS_I845G (dev_priv) ||IS_I865G (dev_priv) ||HAS_CUR_FBC (dev_priv)) cursor->cursor.size = ~0 ; + possible_crtcs =BIT (pipe); + ret = drm_universal_plane_init(&dev_priv->drm, &cursor->base, - 0, &intel_cursor_plane_funcs, + possible_crtcs, &intel_cursor_plane_funcs, intel_cursor_formats, ARRAY_SIZE(intel_cursor_formats), cursor_format_modifiers,
drivers/gpu/drm/i915/intel_sprite.c +1 -1
@@ -1464,7 +1464,7 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, intel_plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, intel_plane->id); intel_plane->check_plane = intel_check_sprite_plane; - possible_crtcs = (1 << pipe); + possible_crtcs =BIT (pipe);if (INTEL_GEN (dev_priv) >=9 ) ret = drm_universal_plane_init(&dev_priv->drm, &intel_plane->base,
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/13 drm/i915: Don't populate plane->i9xx_plane for sprites
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
enum i9xx_plane_id namespace is not valid for any sprite plane, so let's not even populate plane->i9xx_plane.
--- drivers/gpu/drm/i915/intel_sprite.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/i915/intel_sprite.c +0 -1
@@ -1459,7 +1459,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, } intel_plane->pipe = pipe; - intel_plane->i9xx_plane = plane; intel_plane->id =PLANE_SPRITE0 + plane; intel_plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, intel_plane->id); intel_plane->check_plane = intel_check_sprite_plane;
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/13 drm/i915: Allow horizontal mirroring for cnl+ "sprite" planes
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
All CNL universal planes support horizontal mirroring. Currently we expose the capability only for the primary plane. Expose it for the overlay planes as well.
--- drivers/gpu/drm/i915/intel_sprite.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_sprite.c +6 -1
@@ -1445,7 +1445,12 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv, } } -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=10 ) { + supported_rotations = +DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_90 | +DRM_MODE_ROTATE_180 |DRM_MODE_ROTATE_270 | +DRM_MODE_REFLECT_X ; + }else if (INTEL_GEN (dev_priv) >=9 ) { supported_rotations =DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_90 |DRM_MODE_ROTATE_180 |DRM_MODE_ROTATE_270 ;
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/13 drm/i915: Disallow plane scaling with specific pixel formats
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Plane scaling is not supported with specific pixel formats. Disallow plane scaling when such a format is used. Currently the only such pixel format we expose is C8, but in case we add more in the future let's make it easy to deal with them.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_sprite.c | 41 ++++++++++++++++++++++++------------ 3 files changed, 29 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -13034,7 +13034,7 @@ intel_check_primary_plane(struct intel_plane *plane,if (INTEL_GEN (dev_priv) >=9 ) {/* use scaler when colorkey is not required */ -if (!state->ckey.flags) { +if (!state->ckey.flags &&intel_fb_scalable (state->base.fb)) { min_scale =1 ;if (state->base.fb) pixel_format = state->base.fb->format->format;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -2070,6 +2070,7 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv,/* intel_sprite.c */ bool intel_format_is_yuv (u32 format); +bool intel_fb_scalable (const struct drm_framebuffer *fb);int intel_usecs_to_scanlines (const struct drm_display_mode *adjusted_mode,int usecs); struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_sprite.c +27 -14
64 lines not on this page · raw message
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/13 drm/i915: Add missing pixel formats for skl+ "sprites"
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
All SKL+ universal planes support the same set of formats (with the exception of NV12 which we don't expose yet). Make the format lists for primary and sprites the same.
And make the format list const while at it.
--- drivers/gpu/drm/i915/intel_sprite.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +7 -4
@@ -1181,12 +1181,15 @@ static const uint32_t vlv_plane_formats[] = { DRM_FORMAT_VYUY, }; -static uint32_t skl_plane_formats[] = { +static const uint32_t skl_plane_formats[] = { +DRM_FORMAT_C8 ,DRM_FORMAT_RGB565 , -DRM_FORMAT_ABGR8888 , -DRM_FORMAT_ARGB8888 , -DRM_FORMAT_XBGR8888 ,DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_XRGB2101010 , +DRM_FORMAT_XBGR2101010 ,DRM_FORMAT_YUYV ,DRM_FORMAT_YVYU ,DRM_FORMAT_UYVY ,
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/13 drm/i915: Move plane_state->scaler_id initialization into intel_create_plane_state()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
No point in having each caller of intel_create_plane_state() initialize the scaler_id to -1. Instead just do it in intel_create_plane_state().
Previously we left scaler_id at 0 for pre-SKL platforms, but I can't see how initializing it to -1 always would cause any harm.
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 1 + drivers/gpu/drm/i915/intel_display.c | 7 +------ drivers/gpu/drm/i915/intel_sprite.c | 1 - 3 files changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +1 -0
@@ -56,6 +56,7 @@ intel_create_plane_state(struct drm_plane *plane) state->base.plane = plane; state->base.rotation =DRM_MODE_ROTATE_0 ; + state->scaler_id =-1 ;return state; }
drivers/gpu/drm/i915/intel_display.c +1 -6
@@ -13466,10 +13466,8 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->can_scale = false; primary->max_downscale =1 ; -if (INTEL_GEN (dev_priv) >=9 ) { +if (INTEL_GEN (dev_priv) >=9 ) primary->can_scale = true; - state->scaler_id =-1 ; - } primary->pipe = pipe;/* * On gen2/3 only plane A can do FBC, but the panel fitter and LVDS
@@ -13671,9 +13669,6 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180); -if (INTEL_GEN (dev_priv) >=9 ) - state->scaler_id =-1 ; -drm_plane_helper_add (&cursor->base, &intel_plane_helper_funcs);return cursor;
drivers/gpu/drm/i915/intel_sprite.c +0 -1
@@ -1397,7 +1397,6 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=9 ) { intel_plane->can_scale = true; - state->scaler_id =-1 ; intel_plane->update_plane = skl_update_plane; intel_plane->disable_plane = skl_disable_plane;
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 9/13 drm/i915: Introduce intel_plane_alloc()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Pull the common plane+plane_state allocation into a small helper. Reduces the amount of boilerplate in the plane initialization functions.
--- drivers/gpu/drm/i915/intel_display.c | 44 ++++++++----------------------- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_sprite.c | 50 ++++++++++++++++++++++++------------ 3 files changed, 47 insertions(+), 50 deletions(-)
drivers/gpu/drm/i915/intel_display.c +10 -34
@@ -13441,8 +13441,7 @@ bool skl_plane_has_planar(struct drm_i915_private *dev_priv,static struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct intel_plane *primary =NULL ; -struct intel_plane_state *state =NULL ; +struct intel_plane *primary;const uint32_t *intel_primary_formats;unsigned int supported_rotations;unsigned int possible_crtcs;
@@ -13450,19 +13449,9 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)const uint64_t *modifiers;int ret; - primary =kzalloc (sizeof (*primary),GFP_KERNEL ); -if (!primary) { - ret = -ENOMEM ; - goto fail; - } - - state =intel_create_plane_state (&primary->base); -if (!state) { - ret = -ENOMEM ; - goto fail; - } - - primary->base.state = &state->base; + primary =intel_plane_alloc (); +if (IS_ERR (primary)) +return primary; primary->can_scale = false; primary->max_downscale =1 ;
@@ -13597,8 +13586,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)return primary; fail: -kfree (state); -kfree (primary); +intel_plane_free (primary);return ERR_PTR (ret); }
@@ -13607,24 +13595,13 @@ static struct intel_plane * intel_cursor_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) { -struct intel_plane *cursor =NULL ; -struct intel_plane_state *state =NULL ;unsigned int possible_crtcs; +struct intel_plane *cursor;int ret; - cursor =kzalloc (sizeof (*cursor),GFP_KERNEL ); -if (!cursor) { - ret = -ENOMEM ; - goto fail; - } - - state =intel_create_plane_state (&cursor->base); -if (!state) { - ret = -ENOMEM ; - goto fail; - } - - cursor->base.state = &state->base; + cursor =intel_plane_alloc (); +if (IS_ERR (cursor)) +return cursor; cursor->can_scale = false; cursor->max_downscale =1 ;
@@ -13674,8 +13651,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv,return cursor; fail: -kfree (state); -kfree (cursor); +intel_plane_free (cursor);return ERR_PTR (ret); }
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -2089,6 +2089,9 @@ bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,bool intel_format_is_yuv (uint32_t format);bool skl_plane_has_planar (struct drm_i915_private *dev_priv,enum pipe pipe,enum plane_id plane_id); +struct intel_plane *intel_plane_alloc (void ); +void intel_plane_free (struct intel_plane *plane); +/* intel_tv.c */ void intel_tv_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_sprite.c +34 -16
72 lines not on this page · raw message
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 10/13 drm/i915: Extract skl_universal_plane_init()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
There's not much point in following the primary vs. sprite split for the SKL+ universal plane init code. The only difference is of our own doing in the form of the .check_plane(). Let's make a small exception for that little detail and otherwise share the same code to initialize all the universal planes.
Eventually we should eliminate the mess around .check_plane() as well, but for now let's be happy with some code reduction.
v2: Remember to set up plane->has_fbc
Make skl_plane_has_ccs() static
v3: Rebase due to NV12, rename some variables
--- drivers/gpu/drm/i915/intel_display.c | 195 +++++------------------------------ drivers/gpu/drm/i915/intel_drv.h | 12 +-- drivers/gpu/drm/i915/intel_sprite.c | 192 +++++++++++++++++++++++++--------- 3 files changed, 169 insertions(+), 230 deletions(-)
drivers/gpu/drm/i915/intel_display.c +24 -171
@@ -73,55 +73,6 @@ static const uint64_t i9xx_format_modifiers[] = {DRM_FORMAT_MOD_INVALID }; -static const uint32_t skl_primary_formats[] = { -DRM_FORMAT_C8 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_XBGR8888 , -DRM_FORMAT_ARGB8888 , -DRM_FORMAT_ABGR8888 , -DRM_FORMAT_XRGB2101010 , -DRM_FORMAT_XBGR2101010 , -DRM_FORMAT_YUYV , -DRM_FORMAT_YVYU , -DRM_FORMAT_UYVY , -DRM_FORMAT_VYUY , -}; - -static const uint32_t skl_pri_planar_formats[] = { -DRM_FORMAT_C8 , -DRM_FORMAT_RGB565 , -DRM_FORMAT_XRGB8888 , -DRM_FORMAT_XBGR8888 , -DRM_FORMAT_ARGB8888 , -DRM_FORMAT_ABGR8888 , -DRM_FORMAT_XRGB2101010 , -DRM_FORMAT_XBGR2101010 , -DRM_FORMAT_YUYV , -DRM_FORMAT_YVYU , -DRM_FORMAT_UYVY , -DRM_FORMAT_VYUY , -DRM_FORMAT_NV12 , -}; - -static const uint64_t skl_format_modifiers_noccs[] = { - I915_FORMAT_MOD_Yf_TILED, -I915_FORMAT_MOD_Y_TILED , -I915_FORMAT_MOD_X_TILED , -DRM_FORMAT_MOD_LINEAR , -DRM_FORMAT_MOD_INVALID -}; - -static const uint64_t skl_format_modifiers_ccs[] = { - I915_FORMAT_MOD_Yf_TILED_CCS, -I915_FORMAT_MOD_Y_TILED_CCS , - I915_FORMAT_MOD_Yf_TILED, -I915_FORMAT_MOD_Y_TILED , -I915_FORMAT_MOD_X_TILED , -DRM_FORMAT_MOD_LINEAR , -DRM_FORMAT_MOD_INVALID -}; -/* Cursor formats */ static const uint32_t intel_cursor_formats[] = {DRM_FORMAT_ARGB8888 ,
@@ -13188,42 +13139,9 @@ static bool i965_mod_supported(uint32_t format, uint64_t modifier) } } -static bool skl_mod_supported (uint32_t format,uint64_t modifier) -{ -switch (format) { -case DRM_FORMAT_XRGB8888 : -case DRM_FORMAT_XBGR8888 : -case DRM_FORMAT_ARGB8888 : -case DRM_FORMAT_ABGR8888 : -if (modifier == I915_FORMAT_MOD_Yf_TILED_CCS || - modifier ==I915_FORMAT_MOD_Y_TILED_CCS ) -return true; -/* fall through */ -case DRM_FORMAT_RGB565 : -case DRM_FORMAT_XRGB2101010 : -case DRM_FORMAT_XBGR2101010 : -case DRM_FORMAT_YUYV : -case DRM_FORMAT_YVYU : -case DRM_FORMAT_UYVY : -case DRM_FORMAT_VYUY : -case DRM_FORMAT_NV12 : -if (modifier == I915_FORMAT_MOD_Yf_TILED) -return true; -/* fall through */ -case DRM_FORMAT_C8 : -if (modifier ==DRM_FORMAT_MOD_LINEAR || - modifier ==I915_FORMAT_MOD_X_TILED || - modifier ==I915_FORMAT_MOD_Y_TILED ) -return true; -/* fall through */ -default : -return false; - } -} - -static bool intel_primary_plane_format_mod_supported (struct drm_plane *plane, -uint32_t format, -uint64_t modifier) +static bool i9xx_plane_format_mod_supported (struct drm_plane *plane, +uint32_t format, +uint64_t modifier) {struct drm_i915_private *dev_priv =to_i915 (plane->dev);
@@ -13234,9 +13152,7 @@ static bool intel_primary_plane_format_mod_supported(struct drm_plane *plane, modifier != DRM_FORMAT_MOD_LINEAR)return false; -if (INTEL_GEN (dev_priv) >=9 ) -return skl_mod_supported (format, modifier); -else if (INTEL_GEN (dev_priv) >=4 ) +if (INTEL_GEN (dev_priv) >=4 )return i965_mod_supported (format, modifier);else return i8xx_mod_supported (format, modifier);
@@ -13252,7 +13168,7 @@ static bool intel_cursor_plane_format_mod_supported(struct drm_plane *plane,return modifier ==DRM_FORMAT_MOD_LINEAR && format ==DRM_FORMAT_ARGB8888 ; } -static const struct drm_plane_funcs intel_plane_funcs = { +static const struct drm_plane_funcs i9xx_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = intel_plane_destroy,
@@ -13260,7 +13176,7 @@ static const struct drm_plane_funcs intel_plane_funcs = { .atomic_set_property = intel_plane_atomic_set_property, .atomic_duplicate_state = intel_plane_duplicate_state, .atomic_destroy_state = intel_plane_destroy_state, - .format_mod_supported = intel_primary_plane_format_mod_supported, + .format_mod_supported = i9xx_plane_format_mod_supported, }; static int
@@ -13405,39 +13321,6 @@ static bool i9xx_plane_has_fbc(struct drm_i915_private *dev_priv,return i9xx_plane ==PLANE_A ; } -static bool skl_plane_has_fbc (struct drm_i915_private *dev_priv, -enum pipe pipe,enum plane_id plane_id) -{ -if (!HAS_FBC (dev_priv)) -return false; - -return pipe ==PIPE_A && plane_id ==PLANE_PRIMARY ; -} - -bool skl_plane_has_planar (struct drm_i915_private *dev_priv, -enum pipe pipe,enum plane_id plane_id) -{ -if (plane_id ==PLANE_PRIMARY ) { -if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) -return false; -else if ((INTEL_GEN (dev_priv) ==9 && pipe ==PIPE_C ) && - !IS_GEMINILAKE (dev_priv)) -return false; - }else if (plane_id >=PLANE_SPRITE0 ) { -if (plane_id ==PLANE_CURSOR ) -return false; -if (IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) ==10 ) { -if (plane_id !=PLANE_SPRITE0 ) -return false; - }else { -if (plane_id !=PLANE_SPRITE0 || pipe ==PIPE_C || -IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) -return false; - } - } -return true; -} -static struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) {
@@ -13449,14 +13332,24 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)const uint64_t *modifiers;int ret; +if (INTEL_GEN (dev_priv) >=9 ) { + primary =skl_universal_plane_create (dev_priv, pipe, +PLANE_PRIMARY ); +if (IS_ERR (primary)) +return primary; + +/* FIXME unify */ + primary->check_plane = intel_check_primary_plane; + +return primary; + } + primary =intel_plane_alloc ();if (IS_ERR (primary))return primary; primary->can_scale = false; primary->max_downscale =1 ; -if (INTEL_GEN (dev_priv) >=9 ) - primary->can_scale = true; primary->pipe = pipe;/* * On gen2/3 only plane A can do FBC, but the panel fitter and LVDS
@@ -13469,14 +13362,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->id =PLANE_PRIMARY ; primary->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, primary->id); -if (INTEL_GEN (dev_priv) >=9 ) - primary->has_fbc =skl_plane_has_fbc (dev_priv, - primary->pipe, - primary->id); -else - primary->has_fbc =i9xx_plane_has_fbc (dev_priv, - primary->i9xx_plane); - + primary->has_fbc =i9xx_plane_has_fbc (dev_priv, primary->i9xx_plane);if (primary->has_fbc) {struct intel_fbc *fbc = &dev_priv->fbc;
@@ -13485,24 +13371,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->check_plane = intel_check_primary_plane; -if (INTEL_GEN (dev_priv) >=9 ) { -if (skl_plane_has_planar (dev_priv, pipe,PLANE_PRIMARY )) { - intel_primary_formats = skl_pri_planar_formats; - num_formats =ARRAY_SIZE (skl_pri_planar_formats); - }else { - intel_primary_formats = skl_primary_formats; - num_formats =ARRAY_SIZE (skl_primary_formats); - } - -if (skl_plane_has_ccs (dev_priv, pipe,PLANE_PRIMARY )) - modifiers = skl_format_modifiers_ccs; -else - modifiers = skl_format_modifiers_noccs; - - primary->update_plane = skl_update_plane; - primary->disable_plane = skl_disable_plane; - primary->get_hw_state = skl_plane_get_hw_state; - }else if (INTEL_GEN (dev_priv) >=4 ) { +if (INTEL_GEN (dev_priv) >=4 ) { intel_primary_formats = i965_primary_formats; num_formats =ARRAY_SIZE (i965_primary_formats); modifiers = i9xx_format_modifiers;
@@ -13522,23 +13391,16 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) possible_crtcs =BIT (pipe); -if (INTEL_GEN (dev_priv) >=9 ) - ret =drm_universal_plane_init (&dev_priv->drm, &primary->base, - possible_crtcs, &intel_plane_funcs, - intel_primary_formats, num_formats, - modifiers, -DRM_PLANE_TYPE_PRIMARY , -"plane 1%c" ,pipe_name (pipe)); -else if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) +if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) ret =drm_universal_plane_init (&dev_priv->drm, &primary->base, - possible_crtcs, &intel_plane_funcs, + possible_crtcs, &i9xx_plane_funcs, intel_primary_formats, num_formats, modifiers,DRM_PLANE_TYPE_PRIMARY ,"primary %c" ,pipe_name (pipe));else ret = drm_universal_plane_init(&dev_priv->drm, &primary->base, - possible_crtcs, &intel_plane_funcs, + possible_crtcs, &i9xx_plane_funcs, intel_primary_formats, num_formats, modifiers, DRM_PLANE_TYPE_PRIMARY,
@@ -13547,16 +13409,7 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)if (ret) goto fail; -if (INTEL_GEN (dev_priv) >=10 ) { - supported_rotations = -DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_90 | -DRM_MODE_ROTATE_180 |DRM_MODE_ROTATE_270 | -DRM_MODE_REFLECT_X ; - }else if (INTEL_GEN (dev_priv) >=9 ) { - supported_rotations = -DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_90 | -DRM_MODE_ROTATE_180 |DRM_MODE_ROTATE_270 ; - }else if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { +if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { supported_rotations =DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 |DRM_MODE_REFLECT_X ;
drivers/gpu/drm/i915/intel_drv.h +3 -9
@@ -2079,18 +2079,12 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv);void intel_pipe_update_start (const struct intel_crtc_state *new_crtc_state);void intel_pipe_update_end (struct intel_crtc_state *new_crtc_state); -void skl_update_plane (struct intel_plane *plane, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state); -void skl_disable_plane (struct intel_plane *plane,struct intel_crtc *crtc); -bool skl_plane_get_hw_state (struct intel_plane *plane); -bool skl_plane_has_ccs (struct drm_i915_private *dev_priv, -enum pipe pipe,enum plane_id plane_id);bool intel_format_is_yuv (uint32_t format); -bool skl_plane_has_planar (struct drm_i915_private *dev_priv, -enum pipe pipe,enum plane_id plane_id);struct intel_plane *intel_plane_alloc (void );void intel_plane_free (struct intel_plane *plane); +struct intel_plane * +skl_universal_plane_create (struct drm_i915_private *dev_priv, +enum pipe pipe,enum plane_id plane_id);/* intel_tv.c */
drivers/gpu/drm/i915/intel_sprite.c +142 -50
244 lines not on this page · raw message
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 11/13 drm/i915: Simplify skl_plane_has_planar()
From: Ville Syrjälä <[email protected]>
Untangle skl_plane_has_planar() into a more legible form.
--- drivers/gpu/drm/i915/intel_sprite.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +17 -19
@@ -1364,25 +1364,23 @@ static bool skl_plane_has_fbc(struct drm_i915_private *dev_priv,static bool skl_plane_has_planar (struct drm_i915_private *dev_priv,enum pipe pipe,enum plane_id plane_id) { -if (plane_id ==PLANE_PRIMARY ) { -if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) -return false; -else if ((INTEL_GEN (dev_priv) ==9 && pipe ==PIPE_C ) && - !IS_GEMINILAKE (dev_priv)) -return false; - }else if (plane_id >=PLANE_SPRITE0 ) { -if (plane_id ==PLANE_CURSOR ) -return false; -if (IS_GEMINILAKE (dev_priv) ||INTEL_GEN (dev_priv) ==10 ) { -if (plane_id !=PLANE_SPRITE0 ) -return false; - }else { -if (plane_id !=PLANE_SPRITE0 || pipe ==PIPE_C || -IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) -return false; - } - } -return true; +if (plane_id ==PLANE_CURSOR ) +return false; + +if (IS_SKYLAKE (dev_priv) ||IS_BROXTON (dev_priv)) +return false; + +/* FIXME */ +if (INTEL_GEN (dev_priv) >=11 ) +return false; + +if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) +return plane_id ==PLANE_PRIMARY || + plane_id ==PLANE_SPRITE0 ; + +return pipe !=PIPE_C && + (plane_id ==PLANE_PRIMARY || + plane_id ==PLANE_SPRITE0 ); } static bool skl_plane_has_ccs(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 12/13 drm/i915: s/intel_plane/plane/ in sprite init
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Use a more familiar naming pattern for our variables in the sprite plane init function.
v2: Drop the redundant 'plane' from plane_formats and num_planes_formats
too
--- drivers/gpu/drm/i915/intel_sprite.c | 103 ++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/intel_sprite.c +51 -52
@@ -1515,74 +1515,74 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,struct intel_plane *intel_sprite_plane_create (struct drm_i915_private *dev_priv, -enum pipe pipe,int plane) +enum pipe pipe,int sprite) { -struct intel_plane *intel_plane; +struct intel_plane *plane;unsigned long possible_crtcs; -const uint32_t *plane_formats; -const uint64_t *modifiers;unsigned int supported_rotations; -int num_plane_formats; +const u64 *modifiers; +const u32 *formats; +int num_formats;int ret;if (INTEL_GEN (dev_priv) >=9 ) { - intel_plane =skl_universal_plane_create (dev_priv, pipe, -PLANE_SPRITE0 + plane); -if (IS_ERR (intel_plane)) -return intel_plane; + plane =skl_universal_plane_create (dev_priv, pipe, +PLANE_SPRITE0 + sprite); +if (IS_ERR (plane)) +return plane;/* FIXME unify */ - intel_plane->check_plane = intel_check_sprite_plane; + plane->check_plane = intel_check_sprite_plane; -return intel_plane; +return plane; } - intel_plane =intel_plane_alloc (); -if (IS_ERR (intel_plane)) -return intel_plane; + plane =intel_plane_alloc (); +if (IS_ERR (plane)) +return plane;if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { - intel_plane->can_scale = false; - intel_plane->max_downscale =1 ; + plane->can_scale = false; + plane->max_downscale =1 ; - intel_plane->update_plane = vlv_update_plane; - intel_plane->disable_plane = vlv_disable_plane; - intel_plane->get_hw_state = vlv_plane_get_hw_state; + plane->update_plane = vlv_update_plane; + plane->disable_plane = vlv_disable_plane; + plane->get_hw_state = vlv_plane_get_hw_state; - plane_formats = vlv_plane_formats; - num_plane_formats =ARRAY_SIZE (vlv_plane_formats); + formats = vlv_plane_formats; + num_formats =ARRAY_SIZE (vlv_plane_formats); modifiers = i9xx_plane_format_modifiers; }else if (INTEL_GEN (dev_priv) >=7 ) {if (IS_IVYBRIDGE (dev_priv)) { - intel_plane->can_scale = true; - intel_plane->max_downscale =2 ; + plane->can_scale = true; + plane->max_downscale =2 ; }else { - intel_plane->can_scale = false; - intel_plane->max_downscale =1 ; + plane->can_scale = false; + plane->max_downscale =1 ; } - intel_plane->update_plane = ivb_update_plane; - intel_plane->disable_plane = ivb_disable_plane; - intel_plane->get_hw_state = ivb_plane_get_hw_state; + plane->update_plane = ivb_update_plane; + plane->disable_plane = ivb_disable_plane; + plane->get_hw_state = ivb_plane_get_hw_state; - plane_formats = snb_plane_formats; - num_plane_formats =ARRAY_SIZE (snb_plane_formats); + formats = snb_plane_formats; + num_formats =ARRAY_SIZE (snb_plane_formats); modifiers = i9xx_plane_format_modifiers; }else { - intel_plane->can_scale = true; - intel_plane->max_downscale =16 ; + plane->can_scale = true; + plane->max_downscale =16 ; - intel_plane->update_plane = g4x_update_plane; - intel_plane->disable_plane = g4x_disable_plane; - intel_plane->get_hw_state = g4x_plane_get_hw_state; + plane->update_plane = g4x_update_plane; + plane->disable_plane = g4x_disable_plane; + plane->get_hw_state = g4x_plane_get_hw_state; modifiers = i9xx_plane_format_modifiers;if (IS_GEN6 (dev_priv)) { - plane_formats = snb_plane_formats; - num_plane_formats =ARRAY_SIZE (snb_plane_formats); + formats = snb_plane_formats; + num_formats =ARRAY_SIZE (snb_plane_formats); }else { - plane_formats = g4x_plane_formats; - num_plane_formats =ARRAY_SIZE (g4x_plane_formats); + formats = g4x_plane_formats; + num_formats =ARRAY_SIZE (g4x_plane_formats); } }
@@ -1595,27 +1595,26 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,DRM_MODE_ROTATE_0 |DRM_MODE_ROTATE_180 ; } - intel_plane->pipe = pipe; - intel_plane->id =PLANE_SPRITE0 + plane; - intel_plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, intel_plane->id); - intel_plane->check_plane = intel_check_sprite_plane; + plane->pipe = pipe; + plane->id =PLANE_SPRITE0 + sprite; + plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, plane->id); + plane->check_plane = intel_check_sprite_plane; possible_crtcs =BIT (pipe); - ret =drm_universal_plane_init (&dev_priv->drm, &intel_plane->base, + ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, possible_crtcs, &intel_sprite_plane_funcs, - plane_formats, num_plane_formats, - modifiers, + formats, num_formats, modifiers,DRM_PLANE_TYPE_OVERLAY , -"sprite %c" ,sprite_name (pipe, plane)); +"sprite %c" ,sprite_name (pipe, sprite));if (ret) goto fail; -drm_plane_create_rotation_property (&intel_plane->base, +drm_plane_create_rotation_property (&plane->base,DRM_MODE_ROTATE_0 , supported_rotations); - drm_plane_create_color_properties(&intel_plane->base, + drm_plane_create_color_properties(&plane->base, BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709), BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
@@ -1623,12 +1622,12 @@ intel_sprite_plane_create(struct drm_i915_private *dev_priv,DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); -drm_plane_helper_add (&intel_plane->base, &intel_plane_helper_funcs); +drm_plane_helper_add (&plane->base, &intel_plane_helper_funcs); -return intel_plane; +return plane; fail: -intel_plane_free (intel_plane); +intel_plane_free (plane);return ERR_PTR (ret); }
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 13/13 drm/i915: Rename variables in intel_primary_plane_create()
In reply to Ville SyrjalaFrom: Ville Syrjälä <[email protected]>
Let's try to stick a common naming pattern in all the plane init funcs.
--- drivers/gpu/drm/i915/intel_display.c | 86 ++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 44 deletions(-)
drivers/gpu/drm/i915/intel_display.c +42 -44
@@ -13324,88 +13324,86 @@ static bool i9xx_plane_has_fbc(struct drm_i915_private *dev_priv,static struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) { -struct intel_plane *primary; -const uint32_t *intel_primary_formats; +struct intel_plane *plane;unsigned int supported_rotations;unsigned int possible_crtcs; -unsigned int num_formats; -const uint64_t *modifiers; +const u64 *modifiers; +const u32 *formats; +int num_formats;int ret;if (INTEL_GEN (dev_priv) >=9 ) { - primary =skl_universal_plane_create (dev_priv, pipe, -PLANE_PRIMARY ); -if (IS_ERR (primary)) -return primary; + plane =skl_universal_plane_create (dev_priv, pipe, +PLANE_PRIMARY ); +if (IS_ERR (plane)) +return plane;/* FIXME unify */ - primary->check_plane = intel_check_primary_plane; + plane->check_plane = intel_check_primary_plane; -return primary; +return plane; } - primary =intel_plane_alloc (); -if (IS_ERR (primary)) -return primary; + plane =intel_plane_alloc (); +if (IS_ERR (plane)) +return plane; - primary->can_scale = false; - primary->max_downscale =1 ; - primary->pipe = pipe; + plane->can_scale = false; + plane->max_downscale =1 ; + plane->pipe = pipe;/* * On gen2/3 only plane A can do FBC, but the panel fitter and LVDS * port is hooked to pipe B. Hence we want plane A feeding pipe B. */ if (HAS_FBC (dev_priv) &&INTEL_GEN (dev_priv) <4 ) - primary->i9xx_plane = (enum i9xx_plane_id ) !pipe; + plane->i9xx_plane = (enum i9xx_plane_id ) !pipe;else - primary->i9xx_plane = (enum i9xx_plane_id ) pipe; - primary->id =PLANE_PRIMARY ; - primary->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, primary->id); + plane->i9xx_plane = (enum i9xx_plane_id ) pipe; + plane->id =PLANE_PRIMARY ; + plane->frontbuffer_bit =INTEL_FRONTBUFFER (pipe, plane->id); - primary->has_fbc =i9xx_plane_has_fbc (dev_priv, primary->i9xx_plane); -if (primary->has_fbc) { + plane->has_fbc =i9xx_plane_has_fbc (dev_priv, plane->i9xx_plane); +if (plane->has_fbc) {struct intel_fbc *fbc = &dev_priv->fbc; - fbc->possible_framebuffer_bits |= primary->frontbuffer_bit; + fbc->possible_framebuffer_bits |= plane->frontbuffer_bit; } - primary->check_plane = intel_check_primary_plane; + plane->check_plane = intel_check_primary_plane;if (INTEL_GEN (dev_priv) >=4 ) { - intel_primary_formats = i965_primary_formats; + formats = i965_primary_formats; num_formats =ARRAY_SIZE (i965_primary_formats); modifiers = i9xx_format_modifiers; - primary->update_plane = i9xx_update_plane; - primary->disable_plane = i9xx_disable_plane; - primary->get_hw_state = i9xx_plane_get_hw_state; + plane->update_plane = i9xx_update_plane; + plane->disable_plane = i9xx_disable_plane; + plane->get_hw_state = i9xx_plane_get_hw_state; }else { - intel_primary_formats = i8xx_primary_formats; + formats = i8xx_primary_formats; num_formats =ARRAY_SIZE (i8xx_primary_formats); modifiers = i9xx_format_modifiers; - primary->update_plane = i9xx_update_plane; - primary->disable_plane = i9xx_disable_plane; - primary->get_hw_state = i9xx_plane_get_hw_state; + plane->update_plane = i9xx_update_plane; + plane->disable_plane = i9xx_disable_plane; + plane->get_hw_state = i9xx_plane_get_hw_state; } possible_crtcs =BIT (pipe);if (INTEL_GEN (dev_priv) >=5 ||IS_G4X (dev_priv)) - ret =drm_universal_plane_init (&dev_priv->drm, &primary->base, + ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, possible_crtcs, &i9xx_plane_funcs, - intel_primary_formats, num_formats, - modifiers, + formats, num_formats, modifiers,DRM_PLANE_TYPE_PRIMARY ,"primary %c" ,pipe_name (pipe));else - ret =drm_universal_plane_init (&dev_priv->drm, &primary->base, + ret =drm_universal_plane_init (&dev_priv->drm, &plane->base, possible_crtcs, &i9xx_plane_funcs, - intel_primary_formats, num_formats, - modifiers, + formats, num_formats, modifiers,DRM_PLANE_TYPE_PRIMARY ,"plane %c" , -plane_name (primary->i9xx_plane)); +plane_name (plane->i9xx_plane));if (ret) goto fail;
@@ -13421,12 +13419,12 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) }if (INTEL_GEN (dev_priv) >=4 ) -drm_plane_create_rotation_property (&primary->base, +drm_plane_create_rotation_property (&plane->base,DRM_MODE_ROTATE_0 , supported_rotations);if (INTEL_GEN (dev_priv) >=9 ) - drm_plane_create_color_properties(&primary->base, + drm_plane_create_color_properties(&plane->base, BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709), BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
@@ -13434,12 +13432,12 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_COLOR_YCBCR_BT709 , DRM_COLOR_YCBCR_LIMITED_RANGE); -drm_plane_helper_add (&primary->base, &intel_plane_helper_funcs); +drm_plane_helper_add (&plane->base, &intel_plane_helper_funcs); -return primary; +return plane; fail: -intel_plane_free (primary); +intel_plane_free (plane);return ERR_PTR (ret); }
Signature · 6 lines
2.16.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx