Skip to content

Commit

Permalink
drm/i915: introduce macros to check pipe config properties
Browse files Browse the repository at this point in the history
This code will get _really_ repetive, and we'll end up with tons more
of this kind. So extract the common patterns.

This should also help when we add a lazy pipe_config compare mode for
fastboot.

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Apr 29, 2013
1 parent 0973f18 commit 08a2403
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -7949,21 +7949,19 @@ static bool
intel_pipe_config_compare(struct intel_crtc_config *current_config,
struct intel_crtc_config *pipe_config)
{
if (current_config->has_pch_encoder != pipe_config->has_pch_encoder) {
DRM_ERROR("mismatch in has_pch_encoder "
"(expected %i, found %i)\n",
current_config->has_pch_encoder,
pipe_config->has_pch_encoder);
return false;
#define PIPE_CONF_CHECK_I(name) \
if (current_config->name != pipe_config->name) { \
DRM_ERROR("mismatch in " #name " " \
"(expected %i, found %i)\n", \
current_config->name, \
pipe_config->name); \
return false; \
}

if (current_config->fdi_lanes != pipe_config->fdi_lanes) {
DRM_ERROR("mismatch in fdi_lanes "
"(expected %i, found %i)\n",
current_config->fdi_lanes,
pipe_config->fdi_lanes);
return false;
}
PIPE_CONF_CHECK_I(has_pch_encoder);
PIPE_CONF_CHECK_I(fdi_lanes);

#undef PIPE_CONF_CHECK_I

return true;
}
Expand Down

0 comments on commit 08a2403

Please sign in to comment.