[Intel-gfx] [PATCH v9 2/6] drm: Move port definition back to i915 header

[Sharma, Shashank]

On 8/22/2019 8:49 PM, Ramalingam C wrote:
> Handled the need for exposing enum port to mei_hdcp driver, by
> converting the port into ddi index as per ME FW and sending to mei_hdcp.
>
> Hence move enum port definition into I915 driver itself.

This is a nitpick, but if we can re-arrange this commit message a bit, 
it would be easy to understand the changes and the reason behind that. 
How about something like:

We need to expose enum port to mei_hdcp driver, so that it can convert 
the port into MEI's respective DDI index.

So this patch moves definition of enum port from include/i915_drv.h, to 
intel_display.h, inside display driver.

> v2:
>    intel_display.h is included in intel_hdcp.h
> v3:
>    enum port is declared in headers.
>
> Signed-off-by: Ramalingam C <ramalingam.c at intel.com>
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_bios.h    |  1 +
>   drivers/gpu/drm/i915/display/intel_display.h | 18 ++++++++++++++++++
>   drivers/gpu/drm/i915/display/intel_dp.h      |  1 +
>   drivers/gpu/drm/i915/display/intel_hdcp.h    |  1 +
>   drivers/gpu/drm/i915/display/intel_hdmi.h    |  1 +
>   drivers/gpu/drm/i915/display/intel_hotplug.h |  1 +
>   drivers/gpu/drm/i915/display/intel_sdvo.h    |  1 +
>   include/drm/i915_drm.h                       | 18 ------------------
>   8 files changed, 24 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
> index 4969189e620f..4c6e56a3940a 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.h
> +++ b/drivers/gpu/drm/i915/display/intel_bios.h
> @@ -35,6 +35,7 @@
>   #include <drm/i915_drm.h>
>   
>   struct drm_i915_private;
> +enum port;
>   
>   enum intel_backlight_type {
>   	INTEL_BACKLIGHT_PMIC,
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index e57e6969051d..40610d51327e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -182,6 +182,24 @@ enum plane_id {
>   	for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
>   		for_each_if((__crtc)->plane_ids_mask & BIT(__p))
>   
> +enum port {
> +	PORT_NONE = -1,
> +
> +	PORT_A = 0,
> +	PORT_B,
> +	PORT_C,
> +	PORT_D,
> +	PORT_E,
> +	PORT_F,
> +	PORT_G,
> +	PORT_H,
> +	PORT_I,
> +
> +	I915_MAX_PORTS
> +};
> +
> +#define port_name(p) ((p) + 'A')
> +
>   /*
>    * Ports identifier referenced from other drivers.
>    * Expected to remain stable over time
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
> index 657bbb1f5ed0..e01d1f89409d 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.h
> +++ b/drivers/gpu/drm/i915/display/intel_dp.h
> @@ -13,6 +13,7 @@
>   #include "i915_reg.h"
>   
>   enum pipe;
> +enum port;
>   struct drm_connector_state;
>   struct drm_encoder;
>   struct drm_i915_private;
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h
> index 13555b054930..59a2b40405cc 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h
> @@ -15,6 +15,7 @@ struct drm_connector_state;
>   struct drm_i915_private;
>   struct intel_connector;
>   struct intel_hdcp_shim;
> +enum port;
>   
>   void intel_hdcp_atomic_check(struct drm_connector *connector,
>   			     struct drm_connector_state *old_state,
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
> index 106c2e0bc3c9..cf1ea5427639 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
> @@ -23,6 +23,7 @@ struct intel_crtc_state;
>   struct intel_hdmi;
>   struct drm_connector_state;
>   union hdmi_infoframe;
> +enum port;
>   
>   void intel_hdmi_init(struct drm_i915_private *dev_priv, i915_reg_t hdmi_reg,
>   		     enum port port);
> diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
> index b0cd447b7fbc..087b5f57b321 100644
> --- a/drivers/gpu/drm/i915/display/intel_hotplug.h
> +++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
> @@ -13,6 +13,7 @@
>   struct drm_i915_private;
>   struct intel_connector;
>   struct intel_encoder;
> +enum port;
>   
>   void intel_hpd_poll_init(struct drm_i915_private *dev_priv);
>   enum intel_hotplug_state intel_encoder_hotplug(struct intel_encoder *encoder,
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.h b/drivers/gpu/drm/i915/display/intel_sdvo.h
> index c9e05bcdd141..a66f224aa17d 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.h
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.h
> @@ -14,6 +14,7 @@
>   
>   struct drm_i915_private;
>   enum pipe;
> +enum port;
>   
>   bool intel_sdvo_port_enabled(struct drm_i915_private *dev_priv,
>   			     i915_reg_t sdvo_reg, enum pipe *pipe);
> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> index 23274cf92712..6722005884db 100644
> --- a/include/drm/i915_drm.h
> +++ b/include/drm/i915_drm.h
> @@ -100,22 +100,4 @@ extern struct resource intel_graphics_stolen_res;
>   #define INTEL_GEN11_BSM_DW1	0xc4
>   #define   INTEL_BSM_MASK	(-(1u << 20))
>   
> -enum port {
> -	PORT_NONE = -1,
> -
> -	PORT_A = 0,
> -	PORT_B,
> -	PORT_C,
> -	PORT_D,
> -	PORT_E,
> -	PORT_F,
> -	PORT_G,
> -	PORT_H,
> -	PORT_I,
> -
> -	I915_MAX_PORTS
> -};
> -
> -#define port_name(p) ((p) + 'A')
> -
>   #endif				/* _I915_DRM_H_ */

Otherwise patch looks good to me.

With(or without) above mentioned suggestion, Feel free to use: 
Reviewed-by: Shashank Sharma <shashank.sharma at intel.com>

- Shashank