Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d3308a authored by Akash Goel's avatar Akash Goel Committed by Daniel Vetter
Browse files

drm/i915: Add HAS_CORE_RING_FREQ macro 



Added a new HAS_CORE_RING_FREQ macro, currently used in
gen6_update_ring_freq & i915_ring_freq_table debugfs function.
The programming & read of ring frequency table is needed for newer
GEN(>=6) platforms, except VLV/CHV.

Issue: VIZ-5144
Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarAkash Goel <akash.goel@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 70e0bd74

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ static int i915_ring_freq_table(struct seq_file *m, void *unused) 
	int gpu_freq, ia_freq;

	unsigned int max_gpu_freq, min_gpu_freq;



	if (!(IS_GEN6(dev) || IS_GEN7(dev))) {

	if (!HAS_CORE_RING_FREQ(dev)) {

		seq_puts(m, "unsupported on this chipset\n");

		return 0;

	}

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -2548,6 +2548,9 @@ struct drm_i915_cmd_table { 
#define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \

				    INTEL_INFO(dev)->gen >= 8)



#define HAS_CORE_RING_FREQ(dev)	(INTEL_INFO(dev)->gen >= 6 && \

				 !IS_VALLEYVIEW(dev))



#define INTEL_PCH_DEVICE_ID_MASK		0xff00

#define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00

#define INTEL_PCH_CPT_DEVICE_ID_TYPE		0x1c00

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -5104,7 +5104,7 @@ void gen6_update_ring_freq(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (INTEL_INFO(dev)->gen < 6 || IS_VALLEYVIEW(dev))

	if (!HAS_CORE_RING_FREQ(dev))

		return;



	mutex_lock(&dev_priv->rps.hw_lock);