android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm: Use driver specified encoder name

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

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/1449592922-5545-5-git-send-email-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä
2015-12-08 18:41:52 +02:00
committed by Daniel Vetter
parent 13a3d91f17
commit 86bf546b33
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/drm_crtc.c
View File

@ -1101,9 +1101,17 @@ int drm_encoder_init(struct drm_device *dev,
encoder->dev = dev; encoder->dev = dev;
encoder->encoder_type = encoder_type; encoder->encoder_type = encoder_type;
encoder->funcs = funcs; encoder->funcs = funcs;
encoder->name = kasprintf(GFP_KERNEL, "%s-%d", if (name) {
drm_encoder_enum_list[encoder_type].name, va_list ap;
encoder->base.id);
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) { if (!encoder->name) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_put; goto out_put;