Commit 03427fcb authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass dev_priv to HAS_FW_BLC 



Unify our approach to things by passing around dev_priv instead of dev.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477946245-14134-20-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent ef0f5e93

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2893,7 +2893,7 @@ struct drm_i915_cmd_table { 
#define SUPPORTS_TV(dev)		(INTEL_INFO(dev)->supports_tv)

#define I915_HAS_HOTPLUG(dev)		 (INTEL_INFO(dev)->has_hotplug)



#define HAS_FW_BLC(dev) (INTEL_INFO(dev)->gen > 2)

#define HAS_FW_BLC(dev_priv) (INTEL_GEN(dev_priv) > 2)

#define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr)

#define HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc)

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1612,7 +1612,7 @@ static void i9xx_update_wm(struct intel_crtc *unused_crtc) 
	intel_set_memory_cxsr(dev_priv, false);



	/* Calc sr entries for one plane configs */

	if (HAS_FW_BLC(dev) && enabled) {

	if (HAS_FW_BLC(dev_priv) && enabled) {

		/* self-refresh has much higher latency */

		static const int sr_latency_ns = 6000;

		const struct drm_display_mode *adjusted_mode =

CRA Git | Maintained and supported by SUSTech CRA and CCSE