Skip to content

Commit ace8730

Browse files
committed
drm/i915: annotate maybe unused but set intel_plane_state variables
Prepare for re-enabling -Wunused-but-set-variable. for_each_new_intel_plane_in_state() requires passing in a struct intel_plane_state pointer, which it uses, but in many places this leads to warning about unused but set variables. Annotate them with __maybe_unused. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/438ff3b257b7f85ecca5750ae8687336faee0a79.1685119007.git.jani.nikula@intel.com
1 parent 1032a49 commit ace8730

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

drivers/gpu/drm/i915/display/intel_atomic_plane.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ skl_next_plane_to_commit(struct intel_atomic_state *state,
722722
{
723723
struct intel_crtc_state *crtc_state =
724724
intel_atomic_get_new_crtc_state(state, crtc);
725-
struct intel_plane_state *plane_state;
725+
struct intel_plane_state __maybe_unused *plane_state;
726726
struct intel_plane *plane;
727727
int i;
728728

drivers/gpu/drm/i915/display/intel_cdclk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2959,7 +2959,7 @@ int intel_cdclk_atomic_check(struct intel_atomic_state *state,
29592959
{
29602960
const struct intel_cdclk_state *old_cdclk_state;
29612961
const struct intel_cdclk_state *new_cdclk_state;
2962-
struct intel_plane_state *plane_state;
2962+
struct intel_plane_state __maybe_unused *plane_state;
29632963
struct intel_plane *plane;
29642964
int ret;
29652965
int i;

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ static void intel_crtc_enable_flip_done(struct intel_atomic_state *state,
971971
const struct intel_crtc_state *crtc_state =
972972
intel_atomic_get_new_crtc_state(state, crtc);
973973
u8 update_planes = crtc_state->update_planes;
974-
const struct intel_plane_state *plane_state;
974+
const struct intel_plane_state __maybe_unused *plane_state;
975975
struct intel_plane *plane;
976976
int i;
977977

@@ -988,7 +988,7 @@ static void intel_crtc_disable_flip_done(struct intel_atomic_state *state,
988988
const struct intel_crtc_state *crtc_state =
989989
intel_atomic_get_new_crtc_state(state, crtc);
990990
u8 update_planes = crtc_state->update_planes;
991-
const struct intel_plane_state *plane_state;
991+
const struct intel_plane_state __maybe_unused *plane_state;
992992
struct intel_plane *plane;
993993
int i;
994994

@@ -5617,7 +5617,7 @@ static int intel_crtc_add_bigjoiner_planes(struct intel_atomic_state *state,
56175617
struct intel_crtc *crtc,
56185618
struct intel_crtc *other)
56195619
{
5620-
const struct intel_plane_state *plane_state;
5620+
const struct intel_plane_state __maybe_unused *plane_state;
56215621
struct intel_plane *plane;
56225622
u8 plane_ids = 0;
56235623
int i;
@@ -5660,7 +5660,7 @@ static int intel_atomic_check_planes(struct intel_atomic_state *state)
56605660
{
56615661
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
56625662
struct intel_crtc_state *old_crtc_state, *new_crtc_state;
5663-
struct intel_plane_state *plane_state;
5663+
struct intel_plane_state __maybe_unused *plane_state;
56645664
struct intel_plane *plane;
56655665
struct intel_crtc *crtc;
56665666
int i, ret;

drivers/gpu/drm/i915/display/intel_fbc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ static bool __intel_fbc_pre_update(struct intel_atomic_state *state,
12541254
bool intel_fbc_pre_update(struct intel_atomic_state *state,
12551255
struct intel_crtc *crtc)
12561256
{
1257-
const struct intel_plane_state *plane_state;
1257+
const struct intel_plane_state __maybe_unused *plane_state;
12581258
bool need_vblank_wait = false;
12591259
struct intel_plane *plane;
12601260
int i;
@@ -1309,7 +1309,7 @@ static void __intel_fbc_post_update(struct intel_fbc *fbc)
13091309
void intel_fbc_post_update(struct intel_atomic_state *state,
13101310
struct intel_crtc *crtc)
13111311
{
1312-
const struct intel_plane_state *plane_state;
1312+
const struct intel_plane_state __maybe_unused *plane_state;
13131313
struct intel_plane *plane;
13141314
int i;
13151315

@@ -1408,7 +1408,7 @@ void intel_fbc_flush(struct drm_i915_private *i915,
14081408

14091409
int intel_fbc_atomic_check(struct intel_atomic_state *state)
14101410
{
1411-
struct intel_plane_state *plane_state;
1411+
struct intel_plane_state __maybe_unused *plane_state;
14121412
struct intel_plane *plane;
14131413
int i;
14141414

0 commit comments

Comments
 (0)