[Intel-gfx] [PATCH v2 2/2] drm/i915/fbdev: hide struct intel_fbdev in intel_fbdev.c

[Jani Nikula]

On Tue, 15 Feb 2022, Jani Nikula <jani.nikula at intel.com> wrote:
> As all access to struct intel_fbdev guts is nicely stowed away in
> intel_fbdev.c, we can hide the struct definition there too.
>
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Pushed to din, thanks for the review.

BR,
Jani.

> ---
>  .../drm/i915/display/intel_display_types.h    | 21 -------------------
>  drivers/gpu/drm/i915/display/intel_fbdev.c    | 17 +++++++++++++++
>  2 files changed, 17 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index 60e15226a8cb..ff9288eea541 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -26,7 +26,6 @@
>  #ifndef __INTEL_DISPLAY_TYPES_H__
>  #define __INTEL_DISPLAY_TYPES_H__
>  
> -#include <linux/async.h>
>  #include <linux/i2c.h>
>  #include <linux/pm_qos.h>
>  #include <linux/pwm.h>
> @@ -38,7 +37,6 @@
>  #include <drm/drm_crtc.h>
>  #include <drm/drm_dsc.h>
>  #include <drm/drm_encoder.h>
> -#include <drm/drm_fb_helper.h>
>  #include <drm/drm_fourcc.h>
>  #include <drm/drm_probe_helper.h>
>  #include <drm/drm_rect.h>
> @@ -145,25 +143,6 @@ struct intel_framebuffer {
>  	struct i915_address_space *dpt_vm;
>  };
>  
> -struct intel_fbdev {
> -	struct drm_fb_helper helper;
> -	struct intel_framebuffer *fb;
> -	struct i915_vma *vma;
> -	unsigned long vma_flags;
> -	async_cookie_t cookie;
> -	int preferred_bpp;
> -
> -	/* Whether or not fbdev hpd processing is temporarily suspended */
> -	bool hpd_suspended : 1;
> -	/* Set when a hotplug was received while HPD processing was
> -	 * suspended
> -	 */
> -	bool hpd_waiting : 1;
> -
> -	/* Protects hpd_suspended */
> -	struct mutex hpd_lock;
> -};
> -
>  enum intel_hotplug_state {
>  	INTEL_HOTPLUG_UNCHANGED,
>  	INTEL_HOTPLUG_CHANGED,
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index 0f188cd28f2d..fd5bc7acf08d 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -50,6 +50,23 @@
>  #include "intel_fbdev.h"
>  #include "intel_frontbuffer.h"
>  
> +struct intel_fbdev {
> +	struct drm_fb_helper helper;
> +	struct intel_framebuffer *fb;
> +	struct i915_vma *vma;
> +	unsigned long vma_flags;
> +	async_cookie_t cookie;
> +	int preferred_bpp;
> +
> +	/* Whether or not fbdev hpd processing is temporarily suspended */
> +	bool hpd_suspended: 1;
> +	/* Set when a hotplug was received while HPD processing was suspended */
> +	bool hpd_waiting: 1;
> +
> +	/* Protects hpd_suspended */
> +	struct mutex hpd_lock;
> +};
> +
>  static struct intel_frontbuffer *to_frontbuffer(struct intel_fbdev *ifbdev)
>  {
>  	return ifbdev->fb->frontbuffer;

-- 
Jani Nikula, Intel Open Source Graphics Center