diff options
author | Dan Carpenter <error27@gmail.com> | 2010-05-14 13:06:19 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 15:56:14 +1000 |
commit | 96525a2f7448c427bb8d99240907a6bd2d9e818c (patch) | |
tree | 2794c2f359003f432d40cba0e007531f8fadeb02 /include/drm | |
parent | f405a1ab2bf316b1969fc5355891e5dff4e1a54c (diff) | |
download | linux-stable-96525a2f7448c427bb8d99240907a6bd2d9e818c.tar.gz linux-stable-96525a2f7448c427bb8d99240907a6bd2d9e818c.tar.bz2 linux-stable-96525a2f7448c427bb8d99240907a6bd2d9e818c.zip |
drm_edid: There should be 6 Standard Timings
Smatch complained that we initialize 6 elements in add_detailed_modes()
but the timings[] array is declared with 5 elements. Adam Jackson
verified that 6 is the correct number of timings.
On Mon, May 10, 2010 at 12:08:24PM -0400, Adam Jackson wrote:
> > > struct std_timing timings[5];
> > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>
> This decl is wrong, should be 6. From the 1.4 spec:
>
> "Six additional Standard Timings may be listed as a display descriptor
> (tag #FAh)."
>
> The 1.3 spec is a little less explicit about it, but does show 6
> standard timing codes in the 0xFA detailed subblock, terminated by 0x0A
> in the 18th byte. I don't have the docs for 1.2 or earlier, but we're
> paranoid enough about not adding broken timings that we should be fine.
This patch is basically a clean up, because timings[] is declared inside
a union and increasing the number of elements here doesn't change the
overall size of the union.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_edid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index d33c3e038606..39e2cc5c7e66 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -120,7 +120,7 @@ struct detailed_non_pixel { struct detailed_data_string str; struct detailed_data_monitor_range range; struct detailed_data_wpindex color; - struct std_timing timings[5]; + struct std_timing timings[6]; struct cvt_timing cvt[4]; } data; } __attribute__((packed)); |