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: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Tested-by(IVB): Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 4df6d2d7a9c8e9af1fa7ed474f96ebf814677fbc..041bff50462917d4bbf4d075d613777925e98ef1 100644 (file)
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -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;
                }
 

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a483a65f07575b09cef499486864b44ab4a0c8d8..df301cdb6a95ef3ad44a322dc48a88d9bdaaddf8 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;
        }
 

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index bcafefcf048b0e8730d1eb355b10cf248ce45aa7..02b18a173472b8c3bb333df9b2db01cb61788bff 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -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;
 };