Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f59d6414 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move more atomic plane declarations to intel_atomic_plane.h 



Some function declarations in intel_drv.h were missed when
intel_atomic_plane.h was created.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190606122203.13416-3-jani.nikula@intel.com
parent a6617183

drivers/gpu/drm/i915/intel_atomic_plane.h

+16 −0
Original line number Diff line number Diff line
@@ -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);



#endif /* __INTEL_ATOMIC_PLANE_H__ */

drivers/gpu/drm/i915/intel_drv.h

+0 −12
Original line number Diff line number Diff line
@@ -1535,18 +1535,6 @@ int intel_prepare_plane_fb(struct drm_plane *plane, 
			   struct drm_plane_state *new_state);

void intel_cleanup_plane_fb(struct drm_plane *plane,

			    struct drm_plane_state *old_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);



void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,

				    enum pipe pipe);