openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Rename plane_config to initial_plane_config 

This vfunc and related structure are only used for fast boot, so let's
rename them to not take them as general purpose ones.

v2: Fix conflicts caused by the introduction of struct intel_crtc_state

Reviewed-By: Tvrtko Ursulin <tvrtko.ursulin@intel.com> (v1)
Suggested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Damien Lespiau 2015-01-20 12:51:52 +00:00 committed by Daniel Vetter
parent bc8d7dffac
commit 5724dbd167
4 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/i915_drv.h
View File

@ -504,7 +504,7 @@ struct drm_i915_error_state {
struct intel_connector; struct intel_connector;
struct intel_encoder; struct intel_encoder;
struct intel_crtc_state; struct intel_crtc_state;
struct intel_plane_config; struct intel_initial_plane_config;
struct intel_crtc; struct intel_crtc;
struct intel_limit; struct intel_limit;
struct dpll; struct dpll;
@ -543,8 +543,8 @@ struct drm_i915_display_funcs {
* fills out the pipe-config with the hw state. */ * fills out the pipe-config with the hw state. */
bool (*get_pipe_config)(struct intel_crtc *, bool (*get_pipe_config)(struct intel_crtc *,
struct intel_crtc_state *); struct intel_crtc_state *);
void (*get_plane_config)(struct intel_crtc *, void (*get_initial_plane_config)(struct intel_crtc *,
struct intel_plane_config *); struct intel_initial_plane_config *);
int (*crtc_compute_clock)(struct intel_crtc *crtc, int (*crtc_compute_clock)(struct intel_crtc *crtc,
struct intel_crtc_state *crtc_state); struct intel_crtc_state *crtc_state);
void (*crtc_enable)(struct drm_crtc *crtc); void (*crtc_enable)(struct drm_crtc *crtc);

44
drivers/gpu/drm/i915/intel_display.c
View File

@ -2363,8 +2363,9 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
} }
} }
static bool intel_alloc_plane_obj(struct intel_crtc *crtc, static bool
struct intel_plane_config *plane_config) intel_alloc_plane_obj(struct intel_crtc *crtc,
struct intel_initial_plane_config *plane_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_gem_object *obj = NULL; struct drm_i915_gem_object *obj = NULL;
@ -2408,8 +2409,9 @@ static bool intel_alloc_plane_obj(struct intel_crtc *crtc,
return false; return false;
} }
static void intel_find_plane_obj(struct intel_crtc *intel_crtc, static void
struct intel_plane_config *plane_config) intel_find_plane_obj(struct intel_crtc *intel_crtc,
struct intel_initial_plane_config *plane_config)
{ {
struct drm_device *dev = intel_crtc->base.dev; struct drm_device *dev = intel_crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@ -6571,8 +6573,9 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,
pipe_config->port_clock = clock.dot / 5; pipe_config->port_clock = clock.dot / 5;
} }
static void i9xx_get_plane_config(struct intel_crtc *crtc, static void
struct intel_plane_config *plane_config) i9xx_get_initial_plane_config(struct intel_crtc *crtc,
struct intel_initial_plane_config *plane_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@ -7599,8 +7602,9 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,
} }
} }
static void skylake_get_plane_config(struct intel_crtc *crtc, static void
struct intel_plane_config *plane_config) skylake_get_initial_plane_config(struct intel_crtc *crtc,
struct intel_initial_plane_config *plane_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@ -7691,8 +7695,9 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc,
} }
} }
static void ironlake_get_plane_config(struct intel_crtc *crtc, static void
struct intel_plane_config *plane_config) ironlake_get_initial_plane_config(struct intel_crtc *crtc,
struct intel_initial_plane_config *plane_config)
{ {
struct drm_device *dev = crtc->base.dev; struct drm_device *dev = crtc->base.dev;
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@ -12764,7 +12769,8 @@ static void intel_init_display(struct drm_device *dev)
if (INTEL_INFO(dev)->gen >= 9) { if (INTEL_INFO(dev)->gen >= 9) {
dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_pipe_config = haswell_get_pipe_config;
dev_priv->display.get_plane_config = skylake_get_plane_config; dev_priv->display.get_initial_plane_config =
skylake_get_initial_plane_config;
dev_priv->display.crtc_compute_clock = dev_priv->display.crtc_compute_clock =
haswell_crtc_compute_clock; haswell_crtc_compute_clock;
dev_priv->display.crtc_enable = haswell_crtc_enable; dev_priv->display.crtc_enable = haswell_crtc_enable;
@ -12774,7 +12780,8 @@ static void intel_init_display(struct drm_device *dev)
skylake_update_primary_plane; skylake_update_primary_plane;
} else if (HAS_DDI(dev)) { } else if (HAS_DDI(dev)) {
dev_priv->display.get_pipe_config = haswell_get_pipe_config; dev_priv->display.get_pipe_config = haswell_get_pipe_config;
dev_priv->display.get_plane_config = ironlake_get_plane_config; dev_priv->display.get_initial_plane_config =
ironlake_get_initial_plane_config;
dev_priv->display.crtc_compute_clock = dev_priv->display.crtc_compute_clock =
haswell_crtc_compute_clock; haswell_crtc_compute_clock;
dev_priv->display.crtc_enable = haswell_crtc_enable; dev_priv->display.crtc_enable = haswell_crtc_enable;
@ -12784,7 +12791,8 @@ static void intel_init_display(struct drm_device *dev)
ironlake_update_primary_plane; ironlake_update_primary_plane;
} else if (HAS_PCH_SPLIT(dev)) { } else if (HAS_PCH_SPLIT(dev)) {
dev_priv->display.get_pipe_config = ironlake_get_pipe_config; dev_priv->display.get_pipe_config = ironlake_get_pipe_config;
dev_priv->display.get_plane_config = ironlake_get_plane_config; dev_priv->display.get_initial_plane_config =
ironlake_get_initial_plane_config;
dev_priv->display.crtc_compute_clock = dev_priv->display.crtc_compute_clock =
ironlake_crtc_compute_clock; ironlake_crtc_compute_clock;
dev_priv->display.crtc_enable = ironlake_crtc_enable; dev_priv->display.crtc_enable = ironlake_crtc_enable;
@ -12794,7 +12802,8 @@ static void intel_init_display(struct drm_device *dev)
ironlake_update_primary_plane; ironlake_update_primary_plane;
} else if (IS_VALLEYVIEW(dev)) { } else if (IS_VALLEYVIEW(dev)) {
dev_priv->display.get_pipe_config = i9xx_get_pipe_config; dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
dev_priv->display.get_plane_config = i9xx_get_plane_config; dev_priv->display.get_initial_plane_config =
i9xx_get_initial_plane_config;
dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock; dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock;
dev_priv->display.crtc_enable = valleyview_crtc_enable; dev_priv->display.crtc_enable = valleyview_crtc_enable;
dev_priv->display.crtc_disable = i9xx_crtc_disable; dev_priv->display.crtc_disable = i9xx_crtc_disable;
@ -12803,7 +12812,8 @@ static void intel_init_display(struct drm_device *dev)
i9xx_update_primary_plane; i9xx_update_primary_plane;
} else { } else {
dev_priv->display.get_pipe_config = i9xx_get_pipe_config; dev_priv->display.get_pipe_config = i9xx_get_pipe_config;
dev_priv->display.get_plane_config = i9xx_get_plane_config; dev_priv->display.get_initial_plane_config =
i9xx_get_initial_plane_config;
dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock; dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock;
dev_priv->display.crtc_enable = i9xx_crtc_enable; dev_priv->display.crtc_enable = i9xx_crtc_enable;
dev_priv->display.crtc_disable = i9xx_crtc_disable; dev_priv->display.crtc_disable = i9xx_crtc_disable;
@ -13175,8 +13185,8 @@ void intel_modeset_init(struct drm_device *dev)
* can even allow for smooth boot transitions if the BIOS * can even allow for smooth boot transitions if the BIOS
* fb is large enough for the active pipe configuration. * fb is large enough for the active pipe configuration.
*/ */
if (dev_priv->display.get_plane_config) { if (dev_priv->display.get_initial_plane_config) {
dev_priv->display.get_plane_config(crtc, dev_priv->display.get_initial_plane_config(crtc,
&crtc->plane_config); &crtc->plane_config);
/* /*
* If the fb is shared between multiple heads, we'll * If the fb is shared between multiple heads, we'll

4
drivers/gpu/drm/i915/intel_drv.h
View File

@ -257,7 +257,7 @@ struct intel_plane_state {
bool hides_primary; bool hides_primary;
}; };
struct intel_plane_config { struct intel_initial_plane_config {
unsigned int tiling; unsigned int tiling;
int size; int size;
u32 base; u32 base;
@ -468,7 +468,7 @@ struct intel_crtc {
uint32_t cursor_size; uint32_t cursor_size;
uint32_t cursor_base; uint32_t cursor_base;
struct intel_plane_config plane_config; struct intel_initial_plane_config plane_config;
struct intel_crtc_state *config; struct intel_crtc_state *config;
struct intel_crtc_state *new_config; struct intel_crtc_state *new_config;
bool new_enabled; bool new_enabled;

2
drivers/gpu/drm/i915/intel_fbdev.c
View File

@ -531,7 +531,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
struct intel_framebuffer *fb = NULL; struct intel_framebuffer *fb = NULL;
struct drm_crtc *crtc; struct drm_crtc *crtc;
struct intel_crtc *intel_crtc; struct intel_crtc *intel_crtc;
struct intel_plane_config *plane_config = NULL; struct intel_initial_plane_config *plane_config = NULL;
unsigned int max_size = 0; unsigned int max_size = 0;
if (!i915.fastboot) if (!i915.fastboot)