[DRM] Fix a regression caused by a typo

Daniel Stone daniels at collabora.com
Fri Jul 3 00:23:43 PDT 2015


Hi,

> On 2 Jul 2015, at 7:57 pm, Shixin Zeng <zeng.shixin at gmail.com> wrote:
> 
> From: Shixin Zeng <zeng.shixin at gmail.com>
> 
> The length of each EDID block is EDID_LENGTH, and number of blocks is (1
> + edid->extensions)
> 
> This causes wrong EDID to be passed on, and is a regression introduced
> by d2ed34362a52 (drm: Introduce helper for replacing blob properties)
> 
> Signed-off-by: Shixin Zeng <zeng.shixin at gmail.com>

Good catch, thanks!

Reviewed-by: Daniel Stone <daniels at collabora.com>

> drivers/gpu/drm/drm_crtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index b69ed97..b9ba061 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -4732,7 +4732,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
>        return 0;
> 
>    if (edid)
> -        size = EDID_LENGTH + (1 + edid->extensions);
> +        size = EDID_LENGTH * (1 + edid->extensions);
> 
>    ret = drm_property_replace_global_blob(dev,
>                           &connector->edid_blob_ptr,
> -- 
> 2.4.5
> 


More information about the dri-devel mailing list