diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-12-09 09:19:55 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-11 03:13:10 -0500 |
commit | b0b3b7951114315d65398c27648705ca1c322faa (patch) | |
tree | 7d555fa88e918646f67b48c2bc5c507a2cf378d2 /drivers/gpu/drm/i915 | |
parent | f98828769c8838f526703ef180b3088a714af2f9 (diff) |
drm: Pass 'name' to drm_universal_plane_init()
Done with coccinelle for the most part. It choked on
msm/mdp/mdp5/mdp5_plane.c like so:
"BAD:!!!!! enum drm_plane_type type;"
No idea how to deal with that, so I just fixed that up
by hand.
Also it thinks '...' is part of the semantic patch, so I put an
'int DOTDOTDOT' placeholder in its place and got rid of it with
sed afterwards.
I didn't convert drm_plane_init() since passing the varargs through
would mean either cpp macros or va_list, and I figured we don't
care about these legacy functions enough to warrant the extra pain.
@@
typedef uint32_t;
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
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,
unsigned int format_count,
enum drm_plane_type type
+ ,const char *name, int DOTDOTDOT
)
{ ... }
@@
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
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,
unsigned int format_count,
enum drm_plane_type type
+ ,const char *name, int DOTDOTDOT
);
@@
expression E1, E2, E3, E4, E5, E6, E7;
@@
drm_universal_plane_init(E1, E2, E3, E4, E5, E6, E7
+ ,NULL
)
v2: Split crtc and plane changes apart
Pass NUL for no-name instead of ""
Leave drm_plane_init() alone
v3: Add ', or NULL...' to @name kernel doc (Jani)
Annotate the function with __printf() attribute (Jani)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670795-2853-1-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 5a3370798ba3..fc0d53a4eab3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -13904,7 +13904,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev, | |||
13904 | drm_universal_plane_init(dev, &primary->base, 0, | 13904 | drm_universal_plane_init(dev, &primary->base, 0, |
13905 | &intel_plane_funcs, | 13905 | &intel_plane_funcs, |
13906 | intel_primary_formats, num_formats, | 13906 | intel_primary_formats, num_formats, |
13907 | DRM_PLANE_TYPE_PRIMARY); | 13907 | DRM_PLANE_TYPE_PRIMARY, NULL); |
13908 | 13908 | ||
13909 | if (INTEL_INFO(dev)->gen >= 4) | 13909 | if (INTEL_INFO(dev)->gen >= 4) |
13910 | intel_create_rotation_property(dev, primary); | 13910 | intel_create_rotation_property(dev, primary); |
@@ -14043,7 +14043,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev, | |||
14043 | &intel_plane_funcs, | 14043 | &intel_plane_funcs, |
14044 | intel_cursor_formats, | 14044 | intel_cursor_formats, |
14045 | ARRAY_SIZE(intel_cursor_formats), | 14045 | ARRAY_SIZE(intel_cursor_formats), |
14046 | DRM_PLANE_TYPE_CURSOR); | 14046 | DRM_PLANE_TYPE_CURSOR, NULL); |
14047 | 14047 | ||
14048 | if (INTEL_INFO(dev)->gen >= 4) { | 14048 | if (INTEL_INFO(dev)->gen >= 4) { |
14049 | if (!dev->mode_config.rotation_property) | 14049 | if (!dev->mode_config.rotation_property) |
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 2b96f336589e..dbf421351b5c 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
@@ -1123,7 +1123,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane) | |||
1123 | ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs, | 1123 | ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs, |
1124 | &intel_plane_funcs, | 1124 | &intel_plane_funcs, |
1125 | plane_formats, num_plane_formats, | 1125 | plane_formats, num_plane_formats, |
1126 | DRM_PLANE_TYPE_OVERLAY); | 1126 | DRM_PLANE_TYPE_OVERLAY, NULL); |
1127 | if (ret) { | 1127 | if (ret) { |
1128 | kfree(intel_plane); | 1128 | kfree(intel_plane); |
1129 | goto out; | 1129 | goto out; |