On Tue, Jun 11, 2019 at 03:28:20PM +0200, Maarten Lankhorst wrote: > They have been unused since rotation was added to drm core in 2015, > time to get rid of them. > > Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_atomic_plane.c | 45 ----------------------- > drivers/gpu/drm/i915/intel_atomic_plane.h | 8 ---- > drivers/gpu/drm/i915/intel_display.c | 6 --- > drivers/gpu/drm/i915/intel_sprite.c | 8 ---- > 4 files changed, 67 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c > b/drivers/gpu/drm/i915/intel_atomic_plane.c > index 58ea1b672a1a..30bd4e76fff9 100644 > --- a/drivers/gpu/drm/i915/intel_atomic_plane.c > +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c > @@ -353,48 +353,3 @@ const struct drm_plane_helper_funcs > intel_plane_helper_funcs = { > .cleanup_fb = intel_cleanup_plane_fb, > .atomic_check = intel_plane_atomic_check, > }; > - > -/** > - * intel_plane_atomic_get_property - fetch plane property value > - * @plane: plane to fetch property for > - * @state: state containing the property value > - * @property: property to look up > - * @val: pointer to write property value into > - * > - * The DRM core does not store shadow copies of properties for > - * atomic-capable drivers. This entrypoint is used to fetch > - * the current value of a driver-specific plane property. > - */ > -int > -intel_plane_atomic_get_property(struct drm_plane *plane, > - const struct drm_plane_state *state, > - struct drm_property *property, > - u64 *val) > -{ > - DRM_DEBUG_KMS("Unknown property [PROP:%d:%s]\n", > - property->base.id, property->name); > - return -EINVAL; > -} > - > -/** > - * intel_plane_atomic_set_property - set plane property value > - * @plane: plane to set property for > - * @state: state to update property value in > - * @property: property to set > - * @val: value to set property to > - * > - * Writes the specified property value for a plane into the provided atomic > - * state object. > - * > - * Returns 0 on success, -EINVAL on unrecognized properties > - */ > -int > -intel_plane_atomic_set_property(struct drm_plane *plane, > - struct drm_plane_state *state, > - struct drm_property *property, > - u64 val) > -{ > - DRM_DEBUG_KMS("Unknown property [PROP:%d:%s]\n", > - property->base.id, property->name); > - return -EINVAL; > -} > diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.h > b/drivers/gpu/drm/i915/intel_atomic_plane.h > index 24320041498d..1437a8797e10 100644 > --- a/drivers/gpu/drm/i915/intel_atomic_plane.h > +++ b/drivers/gpu/drm/i915/intel_atomic_plane.h > @@ -42,14 +42,6 @@ int intel_plane_atomic_check_with_state(const struct > intel_crtc_state *old_crtc_ > struct intel_crtc_state *crtc_state, > const struct intel_plane_state > *old_plane_state, > struct intel_plane_state *intel_state); > -int intel_plane_atomic_get_property(struct drm_plane *plane, > - const struct drm_plane_state *state, > - struct drm_property *property, > - u64 *val); > -int intel_plane_atomic_set_property(struct drm_plane *plane, > - struct drm_plane_state *state, > - struct drm_property *property, > - u64 val); > int intel_plane_atomic_calc_changes(const struct intel_crtc_state > *old_crtc_state, > struct drm_crtc_state *crtc_state, > const struct intel_plane_state > *old_plane_state, > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 62fa573f90e8..5d497627ffd0 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -14458,8 +14458,6 @@ static const struct drm_plane_funcs i965_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 = i965_plane_format_mod_supported, > @@ -14469,8 +14467,6 @@ static const struct drm_plane_funcs i8xx_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 = i8xx_plane_format_mod_supported, > @@ -14611,8 +14607,6 @@ static const struct drm_plane_funcs > intel_cursor_plane_funcs = { > .update_plane = intel_legacy_cursor_update, > .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_cursor_format_mod_supported, > diff --git a/drivers/gpu/drm/i915/intel_sprite.c > b/drivers/gpu/drm/i915/intel_sprite.c > index c180815faabd..004b52027ae8 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -2157,8 +2157,6 @@ static const struct drm_plane_funcs g4x_sprite_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 = g4x_sprite_format_mod_supported, > @@ -2168,8 +2166,6 @@ static const struct drm_plane_funcs snb_sprite_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 = snb_sprite_format_mod_supported, > @@ -2179,8 +2175,6 @@ static const struct drm_plane_funcs vlv_sprite_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 = vlv_sprite_format_mod_supported, > @@ -2190,8 +2184,6 @@ static const struct drm_plane_funcs skl_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 = skl_plane_format_mod_supported, > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx