[Intel-gfx] [PATCH v2 3/4] drm/i915: move more atomic plane declarations to intel_atomic_plane.h

Chris Wilson chris at chris-wilson.co.uk
Thu Jun 6 12:29:47 UTC 2019


Quoting Jani Nikula (2019-06-06 13:22:02)
> Some function declarations in intel_drv.h were missed when
> intel_atomic_plane.h was created.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_atomic_plane.h | 16 ++++++++++++++++
>  drivers/gpu/drm/i915/intel_drv.h          | 12 ------------
>  2 files changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.h b/drivers/gpu/drm/i915/intel_atomic_plane.h
> index 0a9651376d0e..24320041498d 100644
> --- a/drivers/gpu/drm/i915/intel_atomic_plane.h
> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.h
> @@ -6,7 +6,11 @@
>  #ifndef __INTEL_ATOMIC_PLANE_H__
>  #define __INTEL_ATOMIC_PLANE_H__
>  
> +#include <linux/types.h>
> +
> +struct drm_crtc_state;
>  struct drm_plane;
> +struct drm_property;
>  struct intel_atomic_state;
>  struct intel_crtc;
>  struct intel_crtc_state;
> @@ -38,5 +42,17 @@ 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,
> +                                   struct drm_plane_state *plane_state);

intel_plane_atomic vs intel_atomic_plane.h that must be hitting the ocd
sweetspot.

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris


More information about the Intel-gfx mailing list