diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-06 05:34:58 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-06 05:38:28 +0300 |
| commit | 86fdf61e71046618f6f499542cee12f2348c523c (patch) | |
| tree | ca4e67019e5442a02f804ebccf1687cac095077a /include/drm | |
| parent | 549738f15da0e5a00275977623be199fbbf7df50 (diff) | |
| parent | 27204b99b08289d0993cb77c22470034b5eb974d (diff) | |
| download | linux-86fdf61e71046618f6f499542cee12f2348c523c.tar.xz | |
Merge tag 'drm-misc-fixes-2020-10-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
drm-misc-fixes for v5.9:
- Small doc fix.
- Re-add FB_ARMCLCD for android.
- Fix global-out-of-bounds read in fbcon_get_font().
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8585daa2-fcbc-3924-ac4f-e7b5668808e0@linux.intel.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_dsc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_dsc.h b/include/drm/drm_dsc.h index 887954cbfc60..732f32740c86 100644 --- a/include/drm/drm_dsc.h +++ b/include/drm/drm_dsc.h @@ -588,7 +588,7 @@ struct drm_dsc_picture_parameter_set { * This structure represents the DSC PPS infoframe required to send the Picture * Parameter Set metadata required before enabling VESA Display Stream * Compression. This is based on the DP Secondary Data Packet structure and - * comprises of SDP Header as defined &struct struct dp_sdp_header in drm_dp_helper.h + * comprises of SDP Header as defined &struct dp_sdp_header in drm_dp_helper.h * and PPS payload defined in &struct drm_dsc_picture_parameter_set. * * @pps_header: Header for PPS as per DP SDP header format of type |