mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/atomic: Remove drm_atomic_connectors_for_crtc.

Browse source 
Now that connector_mask is reliable there's no need for this
function any more.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1451908400-25147-6-git-send-email-maarten.lankhorst@linux.intel.com
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2016-01-04 12:53:20 +01:00 committed by Daniel Vetter
parent 2aa974c92b
commit 14de6c44d1
4 changed files with 5 additions and 41 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/gpu/drm/drm_atomic.c
View file

@ -1198,36 +1198,6 @@ drm_atomic_add_affected_planes(struct drm_atomic_state *state,
} }
EXPORT_SYMBOL(drm_atomic_add_affected_planes); EXPORT_SYMBOL(drm_atomic_add_affected_planes);
/**
* drm_atomic_connectors_for_crtc - count number of connected outputs
* @state: atomic state
* @crtc: DRM crtc
*
* This function counts all connectors which will be connected to @crtc
* according to @state. Useful to recompute the enable state for @crtc.
*/
int
drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,
struct drm_crtc *crtc)
{
struct drm_connector *connector;
struct drm_connector_state *conn_state;
int i, num_connected_connectors = 0;
for_each_connector_in_state(state, connector, conn_state, i) {
if (conn_state->crtc == crtc)
num_connected_connectors++;
}
DRM_DEBUG_ATOMIC("State %p has %i connectors for [CRTC:%d:%s]\n",
state, num_connected_connectors,
crtc->base.id, crtc->name);
return num_connected_connectors;
}
EXPORT_SYMBOL(drm_atomic_connectors_for_crtc);
/** /**
* drm_atomic_legacy_backoff - locking backoff for legacy ioctls * drm_atomic_legacy_backoff - locking backoff for legacy ioctls
* @state: atomic state * @state: atomic state

10
drivers/gpu/drm/drm_atomic_helper.c
View file

@ -463,7 +463,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
* crtc only changed its mode but has the same set of connectors. * crtc only changed its mode but has the same set of connectors.
*/ */
for_each_crtc_in_state(state, crtc, crtc_state, i) { for_each_crtc_in_state(state, crtc, crtc_state, i) {
int num_connectors; bool has_connectors =
!!crtc_state->connector_mask;
/* /*
* We must set ->active_changed after walking connectors for * We must set ->active_changed after walking connectors for
@ -492,10 +493,7 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
if (ret != 0) if (ret != 0)
return ret; return ret;
num_connectors = drm_atomic_connectors_for_crtc(state, if (crtc_state->enable != has_connectors) {
crtc);
if (crtc_state->enable != !!num_connectors) {
DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enabled/connectors mismatch\n", DRM_DEBUG_ATOMIC("[CRTC:%d:%s] enabled/connectors mismatch\n",
crtc->base.id, crtc->name); crtc->base.id, crtc->name);
@ -1754,7 +1752,7 @@ static int update_output_state(struct drm_atomic_state *state,
if (crtc == set->crtc) if (crtc == set->crtc)
continue; continue;
if (!drm_atomic_connectors_for_crtc(state, crtc)) { if (!crtc_state->connector_mask) {
ret = drm_atomic_set_mode_prop_for_crtc(crtc_state, ret = drm_atomic_set_mode_prop_for_crtc(crtc_state,
NULL); NULL);
if (ret < 0) if (ret < 0)

2
drivers/gpu/drm/vc4/vc4_crtc.c
View file

@ -328,7 +328,7 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
/* The pixelvalve can only feed one encoder (and encoders are /* The pixelvalve can only feed one encoder (and encoders are
* 1:1 with connectors.) * 1:1 with connectors.)
*/ */
if (drm_atomic_connectors_for_crtc(state->state, crtc) > 1) if (hweight32(state->connector_mask) > 1)
return -EINVAL; return -EINVAL;
drm_atomic_crtc_state_for_each_plane(plane, state) { drm_atomic_crtc_state_for_each_plane(plane, state) {

4
include/drm/drm_atomic.h
View file

@ -130,10 +130,6 @@ int __must_check
drm_atomic_add_affected_planes(struct drm_atomic_state *state, drm_atomic_add_affected_planes(struct drm_atomic_state *state,
struct drm_crtc *crtc); struct drm_crtc *crtc);
int
drm_atomic_connectors_for_crtc(struct drm_atomic_state *state,
struct drm_crtc *crtc);
void drm_atomic_legacy_backoff(struct drm_atomic_state *state); void drm_atomic_legacy_backoff(struct drm_atomic_state *state);
void void