On Thu, Sep 04, 2014 at 12:27:47PM +0100, Damien Lespiau wrote:
> So we can use it in the modeset checker.
>
> v2: Rebase on top of nigthly
>
> v3: Rebase on top of -nigthly (minor conflict in intel_drv.h)
>
> Signed-off-by: Damien Lespiau <damien.lespiau@xxxxxxxxx>
I don't know if I should even bother with the r-b. Feel free to slap
one on if you want :)
> ---
> drivers/gpu/drm/i915/intel_drv.h | 2 ++
> drivers/gpu/drm/i915/intel_pm.c | 4 ++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index a407d04..782dfbc 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1108,6 +1108,8 @@ void intel_init_runtime_pm(struct drm_i915_private *dev_priv);
> void intel_fini_runtime_pm(struct drm_i915_private *dev_priv);
> void ilk_wm_get_hw_state(struct drm_device *dev);
> void skl_wm_get_hw_state(struct drm_device *dev);
> +void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,
> + struct skl_ddb_allocation *ddb /* out */);
>
>
> /* intel_sdvo.c */
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 8d24a4d..ff0d8cb 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3026,8 +3026,8 @@ static void skl_ddb_entry_init_from_hw(struct skl_ddb_entry *entry, u32 reg)
> entry->end = (reg >> 16) & 0x3ff;
> }
>
> -static void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,
> - struct skl_ddb_allocation *ddb /* out */)
> +void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,
> + struct skl_ddb_allocation *ddb /* out */)
> {
> struct drm_device *dev = dev_priv->dev;
> enum pipe pipe;
> --
> 1.8.3.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
