Commit 5b6030da authored by Ramalingam C's avatar Ramalingam C Committed by Uma Shankar
Browse files

drm: Move port definition back to i915 header 



We dont need the definition of the enum port outside I915, anymore.
Hence move enum port definition into I915 driver itself.

v2:
  intel_display.h is included in intel_hdcp.h
v3:
  enum port is declared in headers.
v4:
  commit msg is rephrased.
v5:
  copyright year is updated [Tomas]

Signed-off-by: default avatarRamalingam C <ramalingam.c@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Reviewed-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190828164216.405-3-ramalingam.c@intel.com
parent 0dcceb35

drivers/gpu/drm/i915/display/intel_bios.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright © 2016 Intel Corporation

 * Copyright © 2016-2019 Intel Corporation

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),
@@ -35,6 +35,7 @@ 
#include <drm/i915_drm.h>



struct drm_i915_private;

enum port;



enum intel_backlight_type {

	INTEL_BACKLIGHT_PMIC,

drivers/gpu/drm/i915/display/intel_display.h

+19 −1
Original line number Diff line number Diff line 
/*

 * Copyright © 2006-2017 Intel Corporation

 * Copyright © 2006-2019 Intel Corporation

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),
@@ -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

drivers/gpu/drm/i915/display/intel_dp.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "i915_reg.h"



enum pipe;

enum port;

struct drm_connector_state;

struct drm_encoder;

struct drm_i915_private;

drivers/gpu/drm/i915/display/intel_hdcp.h

+1 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/i915/display/intel_hdmi.h

+1 −0
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE