From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Fri, 14 Oct 2016 13:55:02 +0000 (+0100)
Subject: drm/i915: Fix cxsr_latency_table reorg
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c13fb7789096596f7cd5a64b24dbb66116bfc519;p=linux-beck.git

drm/i915: Fix cxsr_latency_table reorg

I have re-ordered some struct members in patch:

  commit 44a655cae3043453f9dd8076538712d52e2e0ce4
  Author: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
  Date:   Thu Oct 13 11:09:23 2016 +0100

      drm/i915: Shrink cxsr_latency_table

but that particular one is not initialized with named
initializers which broke it.

Move the bitfields back at the beginning. Space saving
is still there.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Fixes: 44a655cae304 ("drm/i915: Shrink cxsr_latency_table")
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1476453302-7580-1-git-send-email-tvrtko.ursulin@linux.intel.com
---

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index a885b2ac9618..5bc115496355 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -807,14 +807,14 @@ struct intel_watermark_params {
 };
 
 struct cxsr_latency {
+	bool is_desktop : 1;
+	bool is_ddr3 : 1;
 	u16 fsb_freq;
 	u16 mem_freq;
 	u16 display_sr;
 	u16 display_hpll_disable;
 	u16 cursor_sr;
 	u16 cursor_hpll_disable;
-	bool is_desktop : 1;
-	bool is_ddr3 : 1;
 };
 
 #define to_intel_atomic_state(x) container_of(x, struct intel_atomic_state, base)