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: Thierry Reding <treding@nvidia.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Родитель
798ae0f669
Коммит
45e3743aff
|
@ -1151,7 +1151,7 @@ EXPORT_SYMBOL(drm_encoder_cleanup);
|
||||||
int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
|
int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
|
||||||
unsigned long possible_crtcs,
|
unsigned long possible_crtcs,
|
||||||
const struct drm_plane_funcs *funcs,
|
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)
|
enum drm_plane_type type)
|
||||||
{
|
{
|
||||||
struct drm_mode_config *config = &dev->mode_config;
|
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,
|
int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,
|
||||||
unsigned long possible_crtcs,
|
unsigned long possible_crtcs,
|
||||||
const struct drm_plane_funcs *funcs,
|
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)
|
bool is_primary)
|
||||||
{
|
{
|
||||||
enum drm_plane_type type;
|
enum drm_plane_type type;
|
||||||
|
|
|
@ -13681,7 +13681,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
|
||||||
struct intel_plane *primary;
|
struct intel_plane *primary;
|
||||||
struct intel_plane_state *state;
|
struct intel_plane_state *state;
|
||||||
const uint32_t *intel_primary_formats;
|
const uint32_t *intel_primary_formats;
|
||||||
int num_formats;
|
unsigned int num_formats;
|
||||||
|
|
||||||
primary = kzalloc(sizeof(*primary), GFP_KERNEL);
|
primary = kzalloc(sizeof(*primary), GFP_KERNEL);
|
||||||
if (primary == NULL)
|
if (primary == NULL)
|
||||||
|
|
|
@ -261,7 +261,7 @@ nv10_overlay_init(struct drm_device *device)
|
||||||
{
|
{
|
||||||
struct nouveau_drm *drm = nouveau_drm(device);
|
struct nouveau_drm *drm = nouveau_drm(device);
|
||||||
struct nouveau_plane *plane = kzalloc(sizeof(struct nouveau_plane), GFP_KERNEL);
|
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;
|
int ret;
|
||||||
|
|
||||||
if (!plane)
|
if (!plane)
|
||||||
|
|
|
@ -865,7 +865,7 @@ struct drm_plane {
|
||||||
|
|
||||||
uint32_t possible_crtcs;
|
uint32_t possible_crtcs;
|
||||||
uint32_t *format_types;
|
uint32_t *format_types;
|
||||||
uint32_t format_count;
|
unsigned int format_count;
|
||||||
bool format_default;
|
bool format_default;
|
||||||
|
|
||||||
struct drm_crtc *crtc;
|
struct drm_crtc *crtc;
|
||||||
|
@ -1270,13 +1270,13 @@ extern int drm_universal_plane_init(struct drm_device *dev,
|
||||||
unsigned long possible_crtcs,
|
unsigned long possible_crtcs,
|
||||||
const struct drm_plane_funcs *funcs,
|
const struct drm_plane_funcs *funcs,
|
||||||
const uint32_t *formats,
|
const uint32_t *formats,
|
||||||
uint32_t format_count,
|
unsigned int format_count,
|
||||||
enum drm_plane_type type);
|
enum drm_plane_type type);
|
||||||
extern int drm_plane_init(struct drm_device *dev,
|
extern int drm_plane_init(struct drm_device *dev,
|
||||||
struct drm_plane *plane,
|
struct drm_plane *plane,
|
||||||
unsigned long possible_crtcs,
|
unsigned long possible_crtcs,
|
||||||
const struct drm_plane_funcs *funcs,
|
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);
|
bool is_primary);
|
||||||
extern void drm_plane_cleanup(struct drm_plane *plane);
|
extern void drm_plane_cleanup(struct drm_plane *plane);
|
||||||
extern unsigned int drm_plane_index(struct drm_plane *plane);
|
extern unsigned int drm_plane_index(struct drm_plane *plane);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче