drm: Drop crtc argument from __drm_atomic_helper_crtc_destroy_state
It's unused, and really this helper should only look at the state structure and nothing else. v2: Rebase on top of rockchip changes v3: Drop unrelated hunk, spotted by Laurent. v4: Rebase onto mtk driver merge. Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Thierry Reding <thierry.reding@gmail.com> Cc: Eric Anholt <eric@anholt.net> Cc: Mark Yao <mark.yao@rock-chips.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> Acked-by: Eric Anholt <eric@anholt.net> 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-1-git-send-email-daniel.vetter@ffwll.ch
This commit is contained in:
parent
a8ad0bd84f
commit
ec2dc6a0fe
|
@ -430,7 +430,7 @@ static void atmel_hlcdc_crtc_destroy_state(struct drm_crtc *crtc,
|
||||||
struct atmel_hlcdc_crtc_state *state;
|
struct atmel_hlcdc_crtc_state *state;
|
||||||
|
|
||||||
state = drm_crtc_state_to_atmel_hlcdc_crtc_state(s);
|
state = drm_crtc_state_to_atmel_hlcdc_crtc_state(s);
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, s);
|
__drm_atomic_helper_crtc_destroy_state(s);
|
||||||
kfree(state);
|
kfree(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2530,7 +2530,7 @@ EXPORT_SYMBOL(drm_atomic_helper_best_encoder);
|
||||||
void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc)
|
void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc)
|
||||||
{
|
{
|
||||||
if (crtc->state)
|
if (crtc->state)
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, crtc->state);
|
__drm_atomic_helper_crtc_destroy_state(crtc->state);
|
||||||
|
|
||||||
kfree(crtc->state);
|
kfree(crtc->state);
|
||||||
crtc->state = kzalloc(sizeof(*crtc->state), GFP_KERNEL);
|
crtc->state = kzalloc(sizeof(*crtc->state), GFP_KERNEL);
|
||||||
|
@ -2595,15 +2595,13 @@ EXPORT_SYMBOL(drm_atomic_helper_crtc_duplicate_state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* __drm_atomic_helper_crtc_destroy_state - release CRTC state
|
* __drm_atomic_helper_crtc_destroy_state - release CRTC state
|
||||||
* @crtc: CRTC object
|
|
||||||
* @state: CRTC state object to release
|
* @state: CRTC state object to release
|
||||||
*
|
*
|
||||||
* Releases all resources stored in the CRTC state without actually freeing
|
* Releases all resources stored in the CRTC state without actually freeing
|
||||||
* the memory of the CRTC state. This is useful for drivers that subclass the
|
* the memory of the CRTC state. This is useful for drivers that subclass the
|
||||||
* CRTC state.
|
* CRTC state.
|
||||||
*/
|
*/
|
||||||
void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state)
|
||||||
struct drm_crtc_state *state)
|
|
||||||
{
|
{
|
||||||
drm_property_unreference_blob(state->mode_blob);
|
drm_property_unreference_blob(state->mode_blob);
|
||||||
drm_property_unreference_blob(state->degamma_lut);
|
drm_property_unreference_blob(state->degamma_lut);
|
||||||
|
@ -2623,7 +2621,7 @@ EXPORT_SYMBOL(__drm_atomic_helper_crtc_destroy_state);
|
||||||
void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
||||||
struct drm_crtc_state *state)
|
struct drm_crtc_state *state)
|
||||||
{
|
{
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, state);
|
__drm_atomic_helper_crtc_destroy_state(state);
|
||||||
kfree(state);
|
kfree(state);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state);
|
EXPORT_SYMBOL(drm_atomic_helper_crtc_destroy_state);
|
||||||
|
|
|
@ -12924,7 +12924,7 @@ verify_crtc_state(struct drm_crtc *crtc,
|
||||||
bool active;
|
bool active;
|
||||||
|
|
||||||
old_state = old_crtc_state->state;
|
old_state = old_crtc_state->state;
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, old_crtc_state);
|
__drm_atomic_helper_crtc_destroy_state(old_crtc_state);
|
||||||
pipe_config = to_intel_crtc_state(old_crtc_state);
|
pipe_config = to_intel_crtc_state(old_crtc_state);
|
||||||
memset(pipe_config, 0, sizeof(*pipe_config));
|
memset(pipe_config, 0, sizeof(*pipe_config));
|
||||||
pipe_config->base.crtc = crtc;
|
pipe_config->base.crtc = crtc;
|
||||||
|
@ -15760,7 +15760,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
|
||||||
struct intel_crtc_state *crtc_state = crtc->config;
|
struct intel_crtc_state *crtc_state = crtc->config;
|
||||||
int pixclk = 0;
|
int pixclk = 0;
|
||||||
|
|
||||||
__drm_atomic_helper_crtc_destroy_state(&crtc->base, &crtc_state->base);
|
__drm_atomic_helper_crtc_destroy_state(&crtc_state->base);
|
||||||
memset(crtc_state, 0, sizeof(*crtc_state));
|
memset(crtc_state, 0, sizeof(*crtc_state));
|
||||||
crtc_state->base.crtc = &crtc->base;
|
crtc_state->base.crtc = &crtc->base;
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@ static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc
|
||||||
static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc,
|
static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc,
|
||||||
struct drm_crtc_state *state)
|
struct drm_crtc_state *state)
|
||||||
{
|
{
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, state);
|
__drm_atomic_helper_crtc_destroy_state(state);
|
||||||
kfree(to_mtk_crtc_state(state));
|
kfree(to_mtk_crtc_state(state));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1065,7 +1065,7 @@ static void vop_crtc_destroy_state(struct drm_crtc *crtc,
|
||||||
{
|
{
|
||||||
struct rockchip_crtc_state *s = to_rockchip_crtc_state(state);
|
struct rockchip_crtc_state *s = to_rockchip_crtc_state(state);
|
||||||
|
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, &s->base);
|
__drm_atomic_helper_crtc_destroy_state(&s->base);
|
||||||
kfree(s);
|
kfree(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -998,7 +998,7 @@ static void tegra_crtc_reset(struct drm_crtc *crtc)
|
||||||
struct tegra_dc_state *state;
|
struct tegra_dc_state *state;
|
||||||
|
|
||||||
if (crtc->state)
|
if (crtc->state)
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, crtc->state);
|
__drm_atomic_helper_crtc_destroy_state(crtc->state);
|
||||||
|
|
||||||
kfree(crtc->state);
|
kfree(crtc->state);
|
||||||
crtc->state = NULL;
|
crtc->state = NULL;
|
||||||
|
@ -1034,7 +1034,7 @@ tegra_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
|
||||||
static void tegra_crtc_atomic_destroy_state(struct drm_crtc *crtc,
|
static void tegra_crtc_atomic_destroy_state(struct drm_crtc *crtc,
|
||||||
struct drm_crtc_state *state)
|
struct drm_crtc_state *state)
|
||||||
{
|
{
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, state);
|
__drm_atomic_helper_crtc_destroy_state(state);
|
||||||
kfree(state);
|
kfree(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -650,7 +650,7 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__drm_atomic_helper_crtc_destroy_state(crtc, state);
|
__drm_atomic_helper_crtc_destroy_state(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct drm_crtc_funcs vc4_crtc_funcs = {
|
static const struct drm_crtc_funcs vc4_crtc_funcs = {
|
||||||
|
|
|
@ -119,8 +119,7 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc,
|
||||||
struct drm_crtc_state *state);
|
struct drm_crtc_state *state);
|
||||||
struct drm_crtc_state *
|
struct drm_crtc_state *
|
||||||
drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc);
|
drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc);
|
||||||
void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc_state *state);
|
||||||
struct drm_crtc_state *state);
|
|
||||||
void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
||||||
struct drm_crtc_state *state);
|
struct drm_crtc_state *state);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue