diff options
| author | Daniel Vetter | 2013-10-10 12:44:43 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-10-10 12:44:43 +0200 |
| commit | 967ad7f1489da7babbe0746f81c283458ecd3f84 (patch) | |
| tree | 812608fd6efcfe81096bd51b1ec1c2a4167385f6 /drivers/gpu/drm/drm_edid.c | |
| parent | drm/i915: Use adjusted_mode in the fastboot hack to disable pfit (diff) | |
| parent | drm/i915/dp: get rid of intel_dp->link_configuration (diff) | |
| download | kernel-qcow2-linux-967ad7f1489da7babbe0746f81c283458ecd3f84.tar.gz kernel-qcow2-linux-967ad7f1489da7babbe0746f81c283458ecd3f84.tar.xz kernel-qcow2-linux-967ad7f1489da7babbe0746f81c283458ecd3f84.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.
i915_dma.c is just adjacent lines changed, nothing nefarious there.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_edid.c')
| -rw-r--r-- | drivers/gpu/drm/drm_edid.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 7d1e8a90480a..9e81609b1e29 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1264,6 +1264,18 @@ struct edid *drm_get_edid(struct drm_connector *connector, } EXPORT_SYMBOL(drm_get_edid); +/** + * drm_edid_duplicate - duplicate an EDID and the extensions + * @edid: EDID to duplicate + * + * Return duplicate edid or NULL on allocation failure. + */ +struct edid *drm_edid_duplicate(const struct edid *edid) +{ + return kmemdup(edid, (edid->extensions + 1) * EDID_LENGTH, GFP_KERNEL); +} +EXPORT_SYMBOL(drm_edid_duplicate); + /*** EDID parsing ***/ /** @@ -3013,6 +3025,8 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb) /* Speaker Allocation Data Block */ if (dbl == 3) { *sadb = kmalloc(dbl, GFP_KERNEL); + if (!*sadb) + return -ENOMEM; memcpy(*sadb, &db[1], dbl); count = dbl; break; |