korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 18:44:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/glk: Pass dev_priv to intel_atomic_setup_scalers()

Browse Source 
Pass dev_priv to intel_atomic_setup_scalers(). The next patch will need
a dev_priv pointer.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170223071600.14356-4-ander.conselvan.de.oliveira@intel.com
This commit is contained in:
Ander Conselvan de Oliveira 2017-02-23 09:15:59 +02:00
parent 5b7280f03c
commit 6ebc69238d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/intel_atomic.c
View File

@ -121,7 +121,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,
/** /**
* intel_atomic_setup_scalers() - setup scalers for crtc per staged requests * intel_atomic_setup_scalers() - setup scalers for crtc per staged requests
* @dev: DRM device * @dev_priv: i915 device
* @crtc: intel crtc * @crtc: intel crtc
* @crtc_state: incoming crtc_state to validate and setup scalers * @crtc_state: incoming crtc_state to validate and setup scalers
* *
@ -136,7 +136,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc,
* 0 - scalers were setup succesfully * 0 - scalers were setup succesfully
* error code - otherwise * error code - otherwise
*/ */
int intel_atomic_setup_scalers(struct drm_device *dev, int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
struct intel_crtc *intel_crtc, struct intel_crtc *intel_crtc,
struct intel_crtc_state *crtc_state) struct intel_crtc_state *crtc_state)
{ {
@ -199,7 +199,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev,
*/ */
if (!plane) { if (!plane) {
struct drm_plane_state *state; struct drm_plane_state *state;
plane = drm_plane_from_index(dev, i); plane = drm_plane_from_index(&dev_priv->drm, i);
state = drm_atomic_get_plane_state(drm_state, plane); state = drm_atomic_get_plane_state(drm_state, plane);
if (IS_ERR(state)) { if (IS_ERR(state)) {
DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state\n", DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state\n",

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

@ -11036,7 +11036,7 @@ static int intel_crtc_atomic_check(struct drm_crtc *crtc,
ret = skl_update_scaler_crtc(pipe_config); ret = skl_update_scaler_crtc(pipe_config);
if (!ret) if (!ret)
ret = intel_atomic_setup_scalers(dev, intel_crtc, ret = intel_atomic_setup_scalers(dev_priv, intel_crtc,
pipe_config); pipe_config);
} }

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

@ -1894,7 +1894,7 @@ intel_atomic_get_existing_plane_state(struct drm_atomic_state *state,
return to_intel_plane_state(plane_state); return to_intel_plane_state(plane_state);
} }
int intel_atomic_setup_scalers(struct drm_device *dev, int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
struct intel_crtc *intel_crtc, struct intel_crtc *intel_crtc,
struct intel_crtc_state *crtc_state); struct intel_crtc_state *crtc_state);