Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 133b0d12 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Clean up intel_atomic_setup_scalers slightly. 



Get rid of a whole lot of ternary operators and assign the index
in scaler_id, instead of the id. They're the same thing.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b359283a

drivers/gpu/drm/i915/intel_atomic.c

+11 −10
Original line number Diff line number Diff line
@@ -309,15 +309,23 @@ int intel_atomic_setup_scalers(struct drm_device *dev, 
	/* walkthrough scaler_users bits and start assigning scalers */

	for (i = 0; i < sizeof(scaler_state->scaler_users) * 8; i++) {

		int *scaler_id;

		const char *name;

		int idx;



		/* skip if scaler not required */

		if (!(scaler_state->scaler_users & (1 << i)))

			continue;



		if (i == SKL_CRTC_INDEX) {

			name = "CRTC";

			idx = intel_crtc->base.base.id;



			/* panel fitter case: assign as a crtc scaler */

			scaler_id = &scaler_state->scaler_id;

		} else {

			name = "PLANE";

			idx = plane->base.id;



			if (!drm_state)

				continue;
@@ -356,23 +364,16 @@ int intel_atomic_setup_scalers(struct drm_device *dev, 
			for (j = 0; j < intel_crtc->num_scalers; j++) {

				if (!scaler_state->scalers[j].in_use) {

					scaler_state->scalers[j].in_use = 1;

					*scaler_id = scaler_state->scalers[j].id;

					*scaler_id = j;

					DRM_DEBUG_KMS("Attached scaler id %u.%u to %s:%d\n",

						intel_crtc->pipe,

						i == SKL_CRTC_INDEX ? scaler_state->scaler_id :

							plane_state->scaler_id,

						i == SKL_CRTC_INDEX ? "CRTC" : "PLANE",

						i == SKL_CRTC_INDEX ?  intel_crtc->base.base.id :

						plane->base.id);

						intel_crtc->pipe, *scaler_id, name, idx);

					break;

				}

			}

		}



		if (WARN_ON(*scaler_id < 0)) {

			DRM_DEBUG_KMS("Cannot find scaler for %s:%d\n",

				i == SKL_CRTC_INDEX ? "CRTC" : "PLANE",

				i == SKL_CRTC_INDEX ? intel_crtc->base.base.id:plane->base.id);

			DRM_DEBUG_KMS("Cannot find scaler for %s:%d\n", name, idx);

			continue;

		}

drivers/gpu/drm/i915/intel_display.c

+0 −2
Original line number Diff line number Diff line
@@ -14070,8 +14070,6 @@ static void skl_init_scalers(struct drm_device *dev, struct intel_crtc *intel_cr 
	for (i = 0; i < intel_crtc->num_scalers; i++) {

		intel_scaler = &scaler_state->scalers[i];

		intel_scaler->in_use = 0;

		intel_scaler->id = i;



		intel_scaler->mode = PS_SCALER_MODE_DYN;

	}

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ struct intel_initial_plane_config { 
#define SKL_MAX_DST_H 4096



struct intel_scaler {

	int id;

	int in_use;

	uint32_t mode;

};