Unverified Commit 253f28b6 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Use state helper instead of CRTC state pointer 



Many drivers reference the crtc->pointer in order to get the current CRTC
state in their atomic_begin or atomic_flush hooks, which would be the new
CRTC state in the global atomic state since _swap_state happened when those
hooks are run.

Use the drm_atomic_get_new_crtc_state helper to get that state to make it
more obvious.

This was made using the coccinelle script below:

@ crtc_atomic_func @
identifier helpers;
identifier func;
@@

(
static struct drm_crtc_helper_funcs helpers = {
	...,
	.atomic_begin = func,
	...,
};
|
static struct drm_crtc_helper_funcs helpers = {
	...,
	.atomic_flush = func,
	...,
};
)

@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
  ...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
  <+...
-       crtc_state
+	dc_state
  ...+>
  }

@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
  ...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
  <+...
-       crtc_state
+	mtk_crtc_state
  ...+>
  }

@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
  ...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
  ...
 }

@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
  struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
  ...
- crtc->state
+ crtc_state
  ...
 }

@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
  ...
- crtc->state
+ crtc_state
  ...
 }

@ include depends on adds_new_state || replaces_new_state @
@@

 #include <drm/drm_atomic.h>

@ no_include depends on !include && (adds_new_state || replaces_new_state) @
@@

+ #include <drm/drm_atomic.h>
  #include <drm/...>

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: "James (Qian) Wang" <james.qian.wang@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Mihail Atanassov <mihail.atanassov@arm.com>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201105164518.392891-1-maxime@cerno.tech
parent 7e542ff8

drivers/gpu/drm/arm/display/komeda/komeda_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -387,10 +387,12 @@ static void 
komeda_crtc_atomic_flush(struct drm_crtc *crtc,

			 struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct drm_crtc_state *old = drm_atomic_get_old_crtc_state(state,

								   crtc);

	/* commit with modeset will be handled in enable/disable */

	if (drm_atomic_crtc_needs_modeset(crtc->state))

	if (drm_atomic_crtc_needs_modeset(crtc_state))

		return;



	komeda_crtc_do_flush(crtc, old);

drivers/gpu/drm/armada/armada_crtc.c

+6 −2
Original line number Diff line number Diff line
@@ -431,11 +431,13 @@ static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc, 
static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc,

					 struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);



	DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);



	if (crtc->state->color_mgmt_changed)

	if (crtc_state->color_mgmt_changed)

		armada_drm_update_gamma(crtc);



	dcrtc->regs_idx = 0;
@@ -445,6 +447,8 @@ static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc, 
static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc,

					 struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);



	DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
@@ -455,7 +459,7 @@ static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc, 
	 * If we aren't doing a full modeset, then we need to queue

	 * the event here.

	 */

	if (!drm_atomic_crtc_needs_modeset(crtc->state)) {

	if (!drm_atomic_crtc_needs_modeset(crtc_state)) {

		dcrtc->update_pending = true;

		armada_drm_crtc_queue_state_event(crtc);

		spin_lock_irq(&dcrtc->irq_lock);

drivers/gpu/drm/ast/ast_mode.c

+3 −1
Original line number Diff line number Diff line
@@ -782,10 +782,12 @@ static void 
ast_crtc_helper_atomic_flush(struct drm_crtc *crtc,

			     struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct drm_crtc_state *old_crtc_state = drm_atomic_get_old_crtc_state(state,

									      crtc);

	struct ast_private *ast = to_ast_private(crtc->dev);

	struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc->state);

	struct ast_crtc_state *ast_crtc_state = to_ast_crtc_state(crtc_state);

	struct ast_crtc_state *old_ast_crtc_state = to_ast_crtc_state(old_crtc_state);



	/*

drivers/gpu/drm/ingenic/ingenic-drm-drv.c

+5 −2
Original line number Diff line number Diff line
@@ -305,11 +305,13 @@ ingenic_drm_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode 
static void ingenic_drm_crtc_atomic_begin(struct drm_crtc *crtc,

					  struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct ingenic_drm *priv = drm_crtc_get_priv(crtc);

	u32 ctrl = 0;



	if (priv->soc_info->has_osd &&

	    drm_atomic_crtc_needs_modeset(crtc->state)) {

	    drm_atomic_crtc_needs_modeset(crtc_state)) {

		/*

		 * If IPU plane is enabled, enable IPU as source for the F1

		 * plane; otherwise use regular DMA.
@@ -326,7 +328,8 @@ static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc, 
					  struct drm_atomic_state *state)

{

	struct ingenic_drm *priv = drm_crtc_get_priv(crtc);

	struct drm_crtc_state *crtc_state = crtc->state;

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct drm_pending_vblank_event *event = crtc_state->event;



	if (drm_atomic_crtc_needs_modeset(crtc_state)) {

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+9 −6
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/barrier.h>

#include <soc/mediatek/smi.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_probe_helper.h>
@@ -577,17 +578,19 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, 
static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,

				      struct drm_atomic_state *state)

{

	struct mtk_crtc_state *crtc_state = to_mtk_crtc_state(crtc->state);

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct mtk_crtc_state *mtk_crtc_state = to_mtk_crtc_state(crtc_state);

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);



	if (mtk_crtc->event && crtc_state->base.event)

	if (mtk_crtc->event && mtk_crtc_state->base.event)

		DRM_ERROR("new event while there is still a pending event\n");



	if (crtc_state->base.event) {

		crtc_state->base.event->pipe = drm_crtc_index(crtc);

	if (mtk_crtc_state->base.event) {

		mtk_crtc_state->base.event->pipe = drm_crtc_index(crtc);

		WARN_ON(drm_crtc_vblank_get(crtc) != 0);

		mtk_crtc->event = crtc_state->base.event;

		crtc_state->base.event = NULL;

		mtk_crtc->event = mtk_crtc_state->base.event;

		mtk_crtc_state->base.event = NULL;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE