[PATCH] drm/edid: fix building error

[Ville Syrjälä]

On Tue, Feb 04, 2020 at 04:41:16PM +0200, Ville Syrjälä wrote:
> On Mon, Feb 03, 2020 at 10:31:13PM +0100, Mauro Rossi wrote:
> > Fixes the following building error:
> > 
> > CC [M]  drivers/gpu/drm/drm_edid.o
> > ~/pie-x86_kernel/kernel/drivers/gpu/drm/drm_edid.c: In function 'cea_mode_alternate_timings':
> > ~/pie-x86_kernel/kernel/drivers/gpu/drm/drm_edid.c:3275:2: error: call to '__compiletime_assert_3282'
> > declared with attribute error: BUILD_BUG_ON failed: cea_mode_for_vic(8)->vtotal != 262 || cea_mode_for_vic(9)->vtotal != 262 || cea_mode_for_vic(12)->vtotal != 262 || cea_mode_for_vic(13)->vtotal != 262 || cea_mode_for_vic(23)->vtotal != 312 || cea_mode_for_vic(24)->vtotal != 312 || cea_mode_for_vic(27)->vtotal != 312 || cea_mode_for_vic(28)->vtotal != 312
> > make[4]: *** [~/pie-x86_kernel/kernel/scripts/Makefile.build:265: drivers/gpu/drm/drm_edid.o] Error 1
> > 
> > Fixes: 7befe62 ("drm/edid: Abstract away cea_edid_modes[]")
> > Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
> > ---
> >  drivers/gpu/drm/drm_edid.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> > index 99769d6c9f84..805fb004c8eb 100644
> > --- a/drivers/gpu/drm/drm_edid.c
> > +++ b/drivers/gpu/drm/drm_edid.c
> > @@ -3211,7 +3211,7 @@ static u8 *drm_find_cea_extension(const struct edid *edid)
> >  	return cea;
> >  }
> >  
> > -static const struct drm_display_mode *cea_mode_for_vic(u8 vic)
> > +static __always_inline const struct drm_display_mode *cea_mode_for_vic(u8 vic)
> 
> Thanks for the fix. I've had another few reports of this fail on ia64
> at least. Hoping to get an answer whether this fixes that one as well.
> If not we need to do something else.

Got word that this fixes ia64 as well -> pushed to drm-misc-next-fixes.
Thanks.

PS. I bumped the Fixes sha1 up to the recommended 12 characters.

-- 
Ville Syrjälä
Intel