Commit 45e3743a authored by Thierry Reding's avatar Thierry Reding Committed by Daniel Vetter
Browse files

drm/plane: Use consistent data types for format count 



Rather than a mix of the the sized uint32_t and signed integer, use an
unsized unsigned int to specify the format count.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 798ae0f6

drivers/gpu/drm/drm_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ EXPORT_SYMBOL(drm_encoder_cleanup); 
int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,

			     unsigned long possible_crtcs,

			     const struct drm_plane_funcs *funcs,

			     const uint32_t *formats, uint32_t format_count,

			     const uint32_t *formats, unsigned int format_count,

			     enum drm_plane_type type)

{

	struct drm_mode_config *config = &dev->mode_config;
@@ -1225,7 +1225,7 @@ EXPORT_SYMBOL(drm_universal_plane_init); 
int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,

		   unsigned long possible_crtcs,

		   const struct drm_plane_funcs *funcs,

		   const uint32_t *formats, uint32_t format_count,

		   const uint32_t *formats, unsigned int format_count,

		   bool is_primary)

{

	enum drm_plane_type type;

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -13681,7 +13681,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, 
	struct intel_plane *primary;

	struct intel_plane_state *state;

	const uint32_t *intel_primary_formats;

	int num_formats;

	unsigned int num_formats;



	primary = kzalloc(sizeof(*primary), GFP_KERNEL);

	if (primary == NULL)

drivers/gpu/drm/nouveau/dispnv04/overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ nv10_overlay_init(struct drm_device *device) 
{

	struct nouveau_drm *drm = nouveau_drm(device);

	struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL);

	int num_formats = ARRAY_SIZE(formats);

	unsigned int num_formats = ARRAY_SIZE(formats);

	int ret;



	if (!plane)

include/drm/drm_crtc.h

+3 −3
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ struct drm_plane { 


	uint32_t possible_crtcs;

	uint32_t *format_types;

	uint32_t format_count;

	unsigned int format_count;

	bool format_default;



	struct drm_crtc *crtc;
@@ -1270,13 +1270,13 @@ extern int drm_universal_plane_init(struct drm_device *dev, 
				    unsigned long possible_crtcs,

				    const struct drm_plane_funcs *funcs,

				    const uint32_t *formats,

				    uint32_t format_count,

				    unsigned int format_count,

				    enum drm_plane_type type);

extern int drm_plane_init(struct drm_device *dev,

			  struct drm_plane *plane,

			  unsigned long possible_crtcs,

			  const struct drm_plane_funcs *funcs,

			  const uint32_t *formats, uint32_t format_count,

			  const uint32_t *formats, unsigned int format_count,

			  bool is_primary);

extern void drm_plane_cleanup(struct drm_plane *plane);

extern unsigned int drm_plane_index(struct drm_plane *plane);