Commit 31409e97 authored by Matt Roper's avatar Matt Roper Committed by Daniel Vetter

drm/i915: Determine I915_MAX_PLANES from plane enum

Let the compiler figure out what I915_MAX_PLANES is from 'enum plane' so
that we don't need a separate #define.

While we're at it, add the cursor plane to the enum.  This will cause
I915_MAX_PLANES to now include the cursor plane in its count (it didn't
previously).   This change is safe since we currently only use this
value in array declarations (never in the actual code logic); we just
wind up allocating slightly more memory than we need to.  A followup
patch will cause various parts of the code to start using the extra
array element where appropriate.

(This patch probably should have been squashed with the followup patch,
but I couldn't figure out how to get Coccinelle to modify enum
declarations...)
Suggested-by: default avatarAnder Conselvan De Oliveira <conselvan2@gmail.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7221fc33
...@@ -131,17 +131,17 @@ enum transcoder { ...@@ -131,17 +131,17 @@ enum transcoder {
#define transcoder_name(t) ((t) + 'A') #define transcoder_name(t) ((t) + 'A')
/* /*
* This is the maximum (across all platforms) number of planes (primary + * I915_MAX_PLANES in the enum below is the maximum (across all platforms)
* sprites) that can be active at the same time on one pipe. * number of planes per CRTC. Not all platforms really have this many planes,
* * which means some arrays of size I915_MAX_PLANES may have unused entries
* This value doesn't count the cursor plane. * between the topmost sprite plane and the cursor plane.
*/ */
#define I915_MAX_PLANES 4
enum plane { enum plane {
PLANE_A = 0, PLANE_A = 0,
PLANE_B, PLANE_B,
PLANE_C, PLANE_C,
PLANE_CURSOR,
I915_MAX_PLANES,
}; };
#define plane_name(p) ((p) + 'A') #define plane_name(p) ((p) + 'A')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment