diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-02-07 15:37:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-02-07 15:42:21 +1000 |
| commit | 4f6993b3feab7bfb1869a8fa12eb8b375964c19f (patch) | |
| tree | 4846a44bdd808c6b81f6dfe75c6d6e50886b0cbd /drivers/gpu/drm/i915/display/intel_backlight.c | |
| parent | 7fa68b9f85973cd21eaf7dbb969b1c0f7fd95c63 (diff) | |
| parent | 069504f1fcfa1532e4e221290df428b15bd9d284 (diff) | |
| download | linux-next-4f6993b3feab7bfb1869a8fa12eb8b375964c19f.tar.gz linux-next-4f6993b3feab7bfb1869a8fa12eb8b375964c19f.zip | |
Merge tag 'drm-intel-fixes-2025-02-06' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-fixes
- Fix the build error with clamp after WARN_ON on gcc 13.x+ (Guenter)
- HDCP related fixes (Suraj)
- PMU fix zero delta busyness issue (Umesh)
- Fix page cleanup on DMA remap failure (Brian)
- Drop 64bpp YUV formats from ICL+ SDR planes (Ville)
- GuC log related fix (Daniele)
- DisplayPort related fixes (Ankit, Jani)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/Z6TDHpgI6dnOc0KI@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_backlight.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_backlight.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_backlight.c b/drivers/gpu/drm/i915/display/intel_backlight.c index fc1e517e074a..7e6ce905bdaf 100644 --- a/drivers/gpu/drm/i915/display/intel_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_backlight.c @@ -41,8 +41,9 @@ static u32 scale(u32 source_val, { u64 target_val; - WARN_ON(source_min > source_max); - WARN_ON(target_min > target_max); + if (WARN_ON(source_min >= source_max) || + WARN_ON(target_min > target_max)) + return target_min; /* defensive */ source_val = clamp(source_val, source_min, source_max); |