UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Pass intel_crtc to intel_crtc_active() 

Unify our approach to things by passing around intel_crtc instead of
drm_crtc.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1477946245-14134-4-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Ville Syrjälä 2016-10-31 22:37:02 +02:00
parent 65edcccef3
commit 525b9311be
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1008,10 +1008,8 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock,
target_clock, refclk, NULL, best_clock); target_clock, refclk, NULL, best_clock);
} }
bool intel_crtc_active(struct drm_crtc *crtc) bool intel_crtc_active(struct intel_crtc *crtc)
{ {
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
/* Be paranoid as we can arrive here with only partial /* Be paranoid as we can arrive here with only partial
* state retrieved from the hardware during setup. * state retrieved from the hardware during setup.
* *
@ -1025,8 +1023,8 @@ bool intel_crtc_active(struct drm_crtc *crtc)
* crtc->state->active once we have proper CRTC states wired up * crtc->state->active once we have proper CRTC states wired up
* for atomic. * for atomic.
*/ */
return intel_crtc->active && crtc->primary->state->fb && return crtc->active && crtc->base.primary->state->fb &&
intel_crtc->config->base.adjusted_mode.crtc_clock; crtc->config->base.adjusted_mode.crtc_clock;
} }
enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv, enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,

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

@ -1349,7 +1349,7 @@ bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock,
struct dpll *best_clock); struct dpll *best_clock);
int chv_calc_dpll_params(int refclk, struct dpll *pll_clock); int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
bool intel_crtc_active(struct drm_crtc *crtc); bool intel_crtc_active(struct intel_crtc *crtc);
void hsw_enable_ips(struct intel_crtc *crtc); void hsw_enable_ips(struct intel_crtc *crtc);
void hsw_disable_ips(struct intel_crtc *crtc); void hsw_disable_ips(struct intel_crtc *crtc);
enum intel_display_power_domain enum intel_display_power_domain

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

@ -1306,7 +1306,7 @@ void intel_fbc_init_pipe_state(struct drm_i915_private *dev_priv)
return; return;
for_each_intel_crtc(&dev_priv->drm, crtc) for_each_intel_crtc(&dev_priv->drm, crtc)
if (intel_crtc_active(&crtc->base) && if (intel_crtc_active(crtc) &&
to_intel_plane_state(crtc->base.primary->state)->base.visible) to_intel_plane_state(crtc->base.primary->state)->base.visible)
dev_priv->fbc.visible_pipes_mask |= (1 << crtc->pipe); dev_priv->fbc.visible_pipes_mask |= (1 << crtc->pipe);
} }

8
drivers/gpu/drm/i915/intel_pm.c
View File

@ -630,7 +630,7 @@ static struct drm_crtc *single_enabled_crtc(struct drm_device *dev)
struct drm_crtc *crtc, *enabled = NULL; struct drm_crtc *crtc, *enabled = NULL;
for_each_crtc(dev, crtc) { for_each_crtc(dev, crtc) {
if (intel_crtc_active(crtc)) { if (intel_crtc_active(to_intel_crtc(crtc))) {
if (enabled) if (enabled)
return NULL; return NULL;
enabled = crtc; enabled = crtc;
@ -725,7 +725,7 @@ static bool g4x_compute_wm0(struct drm_device *dev,
int entries, tlb_miss; int entries, tlb_miss;
crtc = intel_get_crtc_for_plane(dev, plane); crtc = intel_get_crtc_for_plane(dev, plane);
if (!intel_crtc_active(crtc)) { if (!intel_crtc_active(to_intel_crtc(crtc))) {
*cursor_wm = cursor->guard_size; *cursor_wm = cursor->guard_size;
*plane_wm = display->guard_size; *plane_wm = display->guard_size;
return false; return false;
@ -1538,7 +1538,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)
fifo_size = dev_priv->display.get_fifo_size(dev, 0); fifo_size = dev_priv->display.get_fifo_size(dev, 0);
crtc = intel_get_crtc_for_plane(dev, 0); crtc = intel_get_crtc_for_plane(dev, 0);
if (intel_crtc_active(crtc)) { if (intel_crtc_active(to_intel_crtc(crtc))) {
const struct drm_display_mode *adjusted_mode; const struct drm_display_mode *adjusted_mode;
int cpp = drm_format_plane_cpp(crtc->primary->state->fb->pixel_format, 0); int cpp = drm_format_plane_cpp(crtc->primary->state->fb->pixel_format, 0);
if (IS_GEN2(dev_priv)) if (IS_GEN2(dev_priv))
@ -1560,7 +1560,7 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc)
fifo_size = dev_priv->display.get_fifo_size(dev, 1); fifo_size = dev_priv->display.get_fifo_size(dev, 1);
crtc = intel_get_crtc_for_plane(dev, 1); crtc = intel_get_crtc_for_plane(dev, 1);
if (intel_crtc_active(crtc)) { if (intel_crtc_active(to_intel_crtc(crtc))) {
const struct drm_display_mode *adjusted_mode; const struct drm_display_mode *adjusted_mode;
int cpp = drm_format_plane_cpp(crtc->primary->state->fb->pixel_format, 0); int cpp = drm_format_plane_cpp(crtc->primary->state->fb->pixel_format, 0);
if (IS_GEN2(dev_priv)) if (IS_GEN2(dev_priv))