Re: [11/12] fbdev/core: Protect edid_info with CONFIG_ARCH_HAS_EDID_INFO

Sui Jingfeng <suijingfeng@xxxxxxxxxxx> · Wed, 5 Jul 2023 09:43:09 +0800

Hi,


On 2023/6/29 19:45, Thomas Zimmermann wrote:

Guard usage of edid_info with CONFIG_ARCH_HAS_EDID_INFO instead
of CONFIG_X86. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@xxxxxxx>



Reviewed-by: Sui Jingfeng <suijingfeng@xxxxxxxxxxx>



Cc: Daniel Vetter <daniel@xxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
---
  drivers/video/fbdev/core/fbmon.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 35be4431f649a..9ae063021e431 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -1480,17 +1480,19 @@ int fb_validate_mode(const struct fb_var_screeninfo *var, struct fb_info *info)
  		-EINVAL : 0;
  }

  

-#if defined(CONFIG_FIRMWARE_EDID) && defined(CONFIG_X86)

+#if defined(CONFIG_FIRMWARE_EDID)
  const unsigned char *fb_firmware_edid(struct fb_info *info)
  {
  	unsigned char *edid = NULL;

  

+#if defined(CONFIG_ARCH_HAS_EDID_INFO)

  	/*
  	 * We need to ensure that the EDID block is only
  	 * returned for the primary graphics adapter.
  	 */
  	if (fb_is_primary_device(info))
  		edid = edid_info.dummy;
+#endif

  

  	return edid;

  }




