[PATCH 06/15] drm/i915/display: convert HAS_GMBUS_BURST_READ() to struct intel_display

[Jani Nikula]

Convert HAS_GMBUS_BURST_READ() to struct intel_display. Do minimal
drive-by conversions to struct intel_display in the callers while at it.

Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_device.h | 2 +-
 drivers/gpu/drm/i915/display/intel_gmbus.c          | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h 
b/drivers/gpu/drm/i915/display/intel_display_device.h
index c861a61839b8..6279c6c6e831 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.h
+++ b/drivers/gpu/drm/i915/display/intel_display_device.h
@@ -160,7 +160,7 @@ struct intel_display_platforms {
 #define HAS_FPGA_DBG_UNCLAIMED(i915)   (DISPLAY_INFO(i915)->has_fpga_dbg)
 #define HAS_FW_BLC(i915)               (DISPLAY_VER(i915) >= 3)
 #define HAS_GMBUS_IRQ(i915)            (DISPLAY_VER(i915) >= 4)
-#define HAS_GMBUS_BURST_READ(i915)     (DISPLAY_VER(i915) >= 10 || 
IS_KABYLAKE(i915))
+#define HAS_GMBUS_BURST_READ(__display)        (DISPLAY_VER(__display) >= 10 
|| (__display)->platform.kabylake)
 #define HAS_GMCH(i915)                 (DISPLAY_INFO(i915)->has_gmch)
 #define HAS_HW_SAGV_WM(i915)           (DISPLAY_VER(i915) >= 13 && 
!IS_DGFX(i915))
 #define HAS_IPC(i915)                  (DISPLAY_INFO(i915)->has_ipc)
diff --git a/drivers/gpu/drm/i915/display/intel_gmbus.c 
b/drivers/gpu/drm/i915/display/intel_gmbus.c
index e3d938c7f83e..807cf606e7a8 100644
--- a/drivers/gpu/drm/i915/display/intel_gmbus.c
+++ b/drivers/gpu/drm/i915/display/intel_gmbus.c
@@ -496,14 +496,13 @@ static int
 gmbus_xfer_read(struct intel_display *display, struct i2c_msg *msg,
                u32 gmbus0_reg, u32 gmbus1_index)
 {
-       struct drm_i915_private *i915 = to_i915(display->drm);
        u8 *buf = msg->buf;
        unsigned int rx_size = msg->len;
        unsigned int len;
        int ret;
 
        do {
-               if (HAS_GMBUS_BURST_READ(i915))
+               if (HAS_GMBUS_BURST_READ(display))
                        len = min(rx_size, INTEL_GMBUS_BURST_READ_MAX_LEN);
                else
                        len = min(rx_size, gmbus_max_xfer_size(display));
-- 
2.39.5