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

Commit 86bf546b authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Use driver specified encoder name 



Use the encoder name passed by the driver if non-NULL, otherwise fall
back to the old style name.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449592922-5545-5-git-send-email-ville.syrjala@linux.intel.com
parent 13a3d91f

drivers/gpu/drm/drm_crtc.c

+11 −3
Original line number Diff line number Diff line
@@ -1101,9 +1101,17 @@ int drm_encoder_init(struct drm_device *dev, 
	encoder->dev = dev;

	encoder->encoder_type = encoder_type;

	encoder->funcs = funcs;

	if (name) {

		va_list ap;



		va_start(ap, name);

		encoder->name = kvasprintf(GFP_KERNEL, name, ap);

		va_end(ap);

	} else {

		encoder->name = kasprintf(GFP_KERNEL, "%s-%d",

					  drm_encoder_enum_list[encoder_type].name,

					  encoder->base.id);

	}

	if (!encoder->name) {

		ret = -ENOMEM;

		goto out_put;