| Message ID | 20200820052600.3069895-1-furquan@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drivers: gpu: amd: Initialize amdgpu_dm_backlight_caps object to 0 in amdgpu_dm_update_backlight_caps | expand |
Am 20.08.20 um 07:26 schrieb Furquan Shaikh: > In `amdgpu_dm_update_backlight_caps()`, there is a local > `amdgpu_dm_backlight_caps` object that is filled in by > `amdgpu_acpi_get_backlight_caps()`. However, this object is > uninitialized before the call and hence the subsequent check for > aux_support can fail since it is not initialized by > `amdgpu_acpi_get_backlight_caps()` as well. This change initializes > this local `amdgpu_dm_backlight_caps` object to 0. > > Signed-off-by: Furquan Shaikh <furquan@google.com> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index e4b33c67b634..725d8af634ee 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -2853,7 +2853,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) > static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm) > { > #if defined(CONFIG_ACPI) > - struct amdgpu_dm_backlight_caps caps; > + struct amdgpu_dm_backlight_caps caps = { 0 }; Please use memset instead of "{ 0 }" for initialization. Christian. > > if (dm->backlight_caps.caps_valid) > return;
Am 20.08.20 um 09:52 schrieb Furquan Shaikh: > In `amdgpu_dm_update_backlight_caps()`, there is a local > `amdgpu_dm_backlight_caps` object that is filled in by > `amdgpu_acpi_get_backlight_caps()`. However, this object is > uninitialized before the call and hence the subsequent check for > aux_support can fail since it is not initialized by > `amdgpu_acpi_get_backlight_caps()` as well. This change initializes > this local `amdgpu_dm_backlight_caps` object to 0. > > Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > v2: Switched to using memset for initialization of object. > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index e4b33c67b634..da072998ce48 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -2855,6 +2855,8 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm) > #if defined(CONFIG_ACPI) > struct amdgpu_dm_backlight_caps caps; > > + memset(&caps, 0, sizeof(caps)); > + > if (dm->backlight_caps.caps_valid) > return; >
Applied. Thanks! Alex On Thu, Aug 20, 2020 at 5:01 AM Christian König <christian.koenig@amd.com> wrote: > > Am 20.08.20 um 09:52 schrieb Furquan Shaikh: > > In `amdgpu_dm_update_backlight_caps()`, there is a local > > `amdgpu_dm_backlight_caps` object that is filled in by > > `amdgpu_acpi_get_backlight_caps()`. However, this object is > > uninitialized before the call and hence the subsequent check for > > aux_support can fail since it is not initialized by > > `amdgpu_acpi_get_backlight_caps()` as well. This change initializes > > this local `amdgpu_dm_backlight_caps` object to 0. > > > > Signed-off-by: Furquan Shaikh <furquan@google.com> > > Reviewed-by: Christian König <christian.koenig@amd.com> > > > --- > > v2: Switched to using memset for initialization of object. > > > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > index e4b33c67b634..da072998ce48 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > @@ -2855,6 +2855,8 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm) > > #if defined(CONFIG_ACPI) > > struct amdgpu_dm_backlight_caps caps; > > > > + memset(&caps, 0, sizeof(caps)); > > + > > if (dm->backlight_caps.caps_valid) > > return; > > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e4b33c67b634..725d8af634ee 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2853,7 +2853,7 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm) { #if defined(CONFIG_ACPI) - struct amdgpu_dm_backlight_caps caps; + struct amdgpu_dm_backlight_caps caps = { 0 }; if (dm->backlight_caps.caps_valid) return;
In `amdgpu_dm_update_backlight_caps()`, there is a local `amdgpu_dm_backlight_caps` object that is filled in by `amdgpu_acpi_get_backlight_caps()`. However, this object is uninitialized before the call and hence the subsequent check for aux_support can fail since it is not initialized by `amdgpu_acpi_get_backlight_caps()` as well. This change initializes this local `amdgpu_dm_backlight_caps` object to 0. Signed-off-by: Furquan Shaikh <furquan@google.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)