Change the argument type to u32 for the default level being sent
since it has to now account for luminance value which has to be
set for DP_EDP_PANEL_LUMINANCE_TARGET_VALUE.

Signed-off-by: Suraj Kandpal <suraj.kand...@intel.com>
---
 drivers/gpu/drm/display/drm_dp_helper.c | 6 +++---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
 include/drm/display/drm_dp_helper.h     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/display/drm_dp_helper.c 
b/drivers/gpu/drm/display/drm_dp_helper.c
index bbe3ff91fedc..0a2ec1147006 100644
--- a/drivers/gpu/drm/display/drm_dp_helper.c
+++ b/drivers/gpu/drm/display/drm_dp_helper.c
@@ -4020,7 +4020,7 @@ drm_edp_backlight_set_enable(struct drm_dp_aux *aux, 
const struct drm_edp_backli
  * Returns: %0 on success, negative error code on failure.
  */
 int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct 
drm_edp_backlight_info *bl,
-                            const u16 level)
+                            const u32 level)
 {
        int ret;
        u8 dpcd_buf;
@@ -4055,7 +4055,7 @@ int drm_edp_backlight_enable(struct drm_dp_aux *aux, 
const struct drm_edp_backli
                return ret < 0 ? ret : -EIO;
        }
 
-       ret = drm_edp_backlight_set_level(aux, bl, (u32)level);
+       ret = drm_edp_backlight_set_level(aux, bl, level);
        if (ret < 0)
                return ret;
        ret = drm_edp_backlight_set_enable(aux, bl, true);
@@ -4331,7 +4331,7 @@ static int dp_aux_backlight_update_status(struct 
backlight_device *bd)
 
        if (!backlight_is_blank(bd)) {
                if (!bl->enabled) {
-                       drm_edp_backlight_enable(bl->aux, &bl->info, 
brightness);
+                       drm_edp_backlight_enable(bl->aux, &bl->info, 
(u32)brightness);
                        bl->enabled = true;
                        return 0;
                }
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c 
b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 725331638a15..c9b3cac47e17 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1829,7 +1829,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, 
struct drm_atomic_state *sta
                backlight = nv_connector->backlight;
                if (backlight && backlight->uses_dpcd)
                        drm_edp_backlight_enable(&nv_connector->aux, 
&backlight->edp_info,
-                                                
(u16)backlight->dev->props.brightness);
+                                                
(u32)backlight->dev->props.brightness);
 #endif
 
                break;
diff --git a/include/drm/display/drm_dp_helper.h 
b/include/drm/display/drm_dp_helper.h
index 6bce0176efd3..b6c03d3ca6c3 100644
--- a/include/drm/display/drm_dp_helper.h
+++ b/include/drm/display/drm_dp_helper.h
@@ -855,7 +855,7 @@ drm_edp_backlight_init(struct drm_dp_aux *aux, struct 
drm_edp_backlight_info *bl
 int drm_edp_backlight_set_level(struct drm_dp_aux *aux, const struct 
drm_edp_backlight_info *bl,
                                u32 level);
 int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct 
drm_edp_backlight_info *bl,
-                            u16 level);
+                            u32 level);
 int drm_edp_backlight_disable(struct drm_dp_aux *aux, const struct 
drm_edp_backlight_info *bl);
 
 #if IS_ENABLED(CONFIG_DRM_KMS_HELPER) && 
(IS_BUILTIN(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
-- 
2.34.1

Reply via email to