2023-06-27 17:42:05

by Colin Ian King

Subject: [PATCH][next] drm/edid: make read-only const array static

Don't populate the const array on the stack, instead make it static.

Signed-off-by: Colin Ian King <[email protected]>
---
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 e0dbd9140726..39b13417b749 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3962,7 +3962,7 @@ static int drm_cvt_modes(struct drm_connector *connector,
struct drm_display_mode *newmode;
struct drm_device *dev = connector->dev;
const struct cvt_timing *cvt;
- const int rates[] = { 60, 85, 75, 60, 50 };
+ static const int rates[] = { 60, 85, 75, 60, 50 };
const u8 empty[3] = { 0, 0, 0 };

for (i = 0; i < 4; i++) {
--
2.39.2

2023-06-28 09:26:01

by Jani Nikula

Subject: Re: [PATCH][next] drm/edid: make read-only const array static

On Tue, 27 Jun 2023, Colin Ian King <[email protected]> wrote:
> Don't populate the const array on the stack, instead make it static.
>
> Signed-off-by: Colin Ian King <[email protected]>

Thanks, pushed to drm-misc-next.

> ---
> 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 e0dbd9140726..39b13417b749 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3962,7 +3962,7 @@ static int drm_cvt_modes(struct drm_connector *connector,
> struct drm_display_mode *newmode;
> struct drm_device *dev = connector->dev;
> const struct cvt_timing *cvt;
> - const int rates[] = { 60, 85, 75, 60, 50 };
> + static const int rates[] = { 60, 85, 75, 60, 50 };
> const u8 empty[3] = { 0, 0, 0 };

Side note, this could be removed by replacing

if (!memcmp(cvt->code, empty, 3))

with

if (!memchr_inv(cvt->code, 0, 3))

or even

if (!cvt->code[0] && !cvt->code[1] && !cvt->code[2])

BR,
Jani.

>
> for (i = 0; i < 4; i++) {

--
Jani Nikula, Intel Open Source Graphics Center