| Message ID | 1386859003-17246-2-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 12, 2013 at 02:36:36PM +0000, Damien Lespiau wrote: > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Merged this one here, not really sure what to do with the rest. -Daniel > --- > drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index c01d08d..351065d 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3584,9 +3584,11 @@ void gen6_set_rps(struct drm_device *dev, u8 val) > > void gen6_rps_idle(struct drm_i915_private *dev_priv) > { > + struct drm_device *dev = dev_priv->dev; > + > mutex_lock(&dev_priv->rps.hw_lock); > if (dev_priv->rps.enabled) { > - if (dev_priv->info->is_valleyview) > + if (IS_VALLEYVIEW(dev)) > valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_delay); > else > gen6_set_rps(dev_priv->dev, dev_priv->rps.min_delay); > @@ -3597,9 +3599,11 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv) > > void gen6_rps_boost(struct drm_i915_private *dev_priv) > { > + struct drm_device *dev = dev_priv->dev; > + > mutex_lock(&dev_priv->rps.hw_lock); > if (dev_priv->rps.enabled) { > - if (dev_priv->info->is_valleyview) > + if (IS_VALLEYVIEW(dev)) > valleyview_set_rps(dev_priv->dev, dev_priv->rps.max_delay); > else > gen6_set_rps(dev_priv->dev, dev_priv->rps.max_delay); > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, Dec 17, 2013 at 10:38:48AM +0100, Daniel Vetter wrote: > On Thu, Dec 12, 2013 at 02:36:36PM +0000, Damien Lespiau wrote: > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > > Merged this one here, not really sure what to do with the rest. So, apparently, there's some unhappiness with INTEL_INFO, which is somewhat understandable, it doesn't provide much more convenience than dev_priv->info. I can resend the series getting rid of INTEL_INFO() if the sentiment is shared. To provide the const safety, we can then declare the info struct as const in the private structure and cast it as non const at initialization time (as Ville suggests).
On Tue, Dec 17, 2013 at 12:17 PM, Damien Lespiau <damien.lespiau@intel.com> wrote: > On Tue, Dec 17, 2013 at 10:38:48AM +0100, Daniel Vetter wrote: >> On Thu, Dec 12, 2013 at 02:36:36PM +0000, Damien Lespiau wrote: >> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> >> >> Merged this one here, not really sure what to do with the rest. > > So, apparently, there's some unhappiness with INTEL_INFO, which is > somewhat understandable, it doesn't provide much more convenience than > dev_priv->info. > > I can resend the series getting rid of INTEL_INFO() if the sentiment is > shared. To provide the const safety, we can then declare the info struct > as const in the private structure and cast it as non const at > initialization time (as Ville suggests). I'd be ok with that plan. Like I've said on irc, no opinions really on this matter, as long as we can keep the const safety around - imo that helps a lot with reviewing code. E.g. Chris just spotted that some of Ben's semaphore changes aren't too safe since we can frob semaphores at runtime. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index c01d08d..351065d 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3584,9 +3584,11 @@ void gen6_set_rps(struct drm_device *dev, u8 val) void gen6_rps_idle(struct drm_i915_private *dev_priv) { + struct drm_device *dev = dev_priv->dev; + mutex_lock(&dev_priv->rps.hw_lock); if (dev_priv->rps.enabled) { - if (dev_priv->info->is_valleyview) + if (IS_VALLEYVIEW(dev)) valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_delay); else gen6_set_rps(dev_priv->dev, dev_priv->rps.min_delay); @@ -3597,9 +3599,11 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv) void gen6_rps_boost(struct drm_i915_private *dev_priv) { + struct drm_device *dev = dev_priv->dev; + mutex_lock(&dev_priv->rps.hw_lock); if (dev_priv->rps.enabled) { - if (dev_priv->info->is_valleyview) + if (IS_VALLEYVIEW(dev)) valleyview_set_rps(dev_priv->dev, dev_priv->rps.max_delay); else gen6_set_rps(dev_priv->dev, dev_priv->rps.max_delay);
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)