drm: Drop connector argument from __drm_atomic_helper_connector_destroy_state
It's unused, and really this helper should only look at the state structure and nothing else. Note that this conflicts with a patch from Dave that adds refcounting to drm_connectors. It's not yet clear whether the check Dave adds for connector != NULL is really needed or the right check. v2: Fix commmit message (Laurent). Cc: Dave Airlie <airlied@gmail.com> Acked-by: Thierry Reding <thierry.reding@gmail.com> Acked-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1462804451-15318-3-git-send-email-daniel.vetter@ffwll.chsteinar/wifi_calib_4_9_kernel
parent
2f701695fd
commit
fabd9106f7
|
@ -2756,8 +2756,7 @@ void drm_atomic_helper_connector_reset(struct drm_connector *connector)
|
||||||
kzalloc(sizeof(*conn_state), GFP_KERNEL);
|
kzalloc(sizeof(*conn_state), GFP_KERNEL);
|
||||||
|
|
||||||
if (connector->state)
|
if (connector->state)
|
||||||
__drm_atomic_helper_connector_destroy_state(connector,
|
__drm_atomic_helper_connector_destroy_state(connector->state);
|
||||||
connector->state);
|
|
||||||
|
|
||||||
kfree(connector->state);
|
kfree(connector->state);
|
||||||
__drm_atomic_helper_connector_reset(connector, conn_state);
|
__drm_atomic_helper_connector_reset(connector, conn_state);
|
||||||
|
@ -2890,7 +2889,6 @@ EXPORT_SYMBOL(drm_atomic_helper_duplicate_state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* __drm_atomic_helper_connector_destroy_state - release connector state
|
* __drm_atomic_helper_connector_destroy_state - release connector state
|
||||||
* @connector: connector object
|
|
||||||
* @state: connector state object to release
|
* @state: connector state object to release
|
||||||
*
|
*
|
||||||
* Releases all resources stored in the connector state without actually
|
* Releases all resources stored in the connector state without actually
|
||||||
|
@ -2898,8 +2896,7 @@ EXPORT_SYMBOL(drm_atomic_helper_duplicate_state);
|
||||||
* subclass the connector state.
|
* subclass the connector state.
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
__drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
__drm_atomic_helper_connector_destroy_state(struct drm_connector_state *state)
|
||||||
struct drm_connector_state *state)
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* This is currently a placeholder so that drivers that subclass the
|
* This is currently a placeholder so that drivers that subclass the
|
||||||
|
@ -2922,7 +2919,7 @@ EXPORT_SYMBOL(__drm_atomic_helper_connector_destroy_state);
|
||||||
void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
||||||
struct drm_connector_state *state)
|
struct drm_connector_state *state)
|
||||||
{
|
{
|
||||||
__drm_atomic_helper_connector_destroy_state(connector, state);
|
__drm_atomic_helper_connector_destroy_state(state);
|
||||||
kfree(state);
|
kfree(state);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_atomic_helper_connector_destroy_state);
|
EXPORT_SYMBOL(drm_atomic_helper_connector_destroy_state);
|
||||||
|
|
|
@ -144,8 +144,7 @@ struct drm_atomic_state *
|
||||||
drm_atomic_helper_duplicate_state(struct drm_device *dev,
|
drm_atomic_helper_duplicate_state(struct drm_device *dev,
|
||||||
struct drm_modeset_acquire_ctx *ctx);
|
struct drm_modeset_acquire_ctx *ctx);
|
||||||
void
|
void
|
||||||
__drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
__drm_atomic_helper_connector_destroy_state(struct drm_connector_state *state);
|
||||||
struct drm_connector_state *state);
|
|
||||||
void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
||||||
struct drm_connector_state *state);
|
struct drm_connector_state *state);
|
||||||
void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
|
void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
|
||||||
|
|
Loading…
Reference in New Issue