Skip to content

Commit

Permalink
drm/xe/display: fix compat IS_DISPLAY_STEP() range end
Browse files Browse the repository at this point in the history
BugLink: https://bugs.launchpad.net/bugs/2086138

[ Upstream commit dd10595 ]

It's supposed to be an open range at the end like in i915. Fingers
crossed that nobody relies on this definition.

Fixes: 44e6949 ("drm/xe/display: Implement display support")
Reviewed-by: Lucas De Marchi <[email protected]>
Reviewed-by: Matt Roper <[email protected]>
Acked-by: Lucas De Marchi <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/fe8743770694e429f6902491cdb306c97bdf701a.1724180287.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <[email protected]>
(cherry picked from commit 453afb1)
Signed-off-by: Rodrigo Vivi <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
[koichiroden: adjusted context due to missing commit
9033bac ("drm/xe/display: clean up a lot of cruft from compat i915_drv.h")]
Signed-off-by: Koichiro Den <[email protected]>
Signed-off-by: Roxana Nicolescu <[email protected]>
  • Loading branch information
jnikula authored and mehmetb0 committed Nov 9, 2024
1 parent 75e9baf commit 97e8d24
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)
#define HAS_GMD_ID(xe) GRAPHICS_VERx100(xe) >= 1270

/* Workarounds not handled yet */
#define IS_DISPLAY_STEP(xe, first, last) ({u8 __step = (xe)->info.step.display; first <= __step && __step <= last; })
#define IS_DISPLAY_STEP(xe, first, last) ({u8 __step = (xe)->info.step.display; first <= __step && __step < last; })
#define IS_GRAPHICS_STEP(xe, first, last) ({u8 __step = (xe)->info.step.graphics; first <= __step && __step <= last; })

#define IS_LP(xe) (0)
Expand Down

0 comments on commit 97e8d24

Please sign in to comment.