Commit 0425662f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Nuke mode->vrefresh 



Get rid of mode->vrefresh and just calculate it on demand. Saves
a bit of space and avoids the cached value getting out of sync
with reality.

Mostly done with cocci, with the following manual fixups:
- Remove the now empty loop in drm_helper_probe_single_connector_modes()
- Fix __MODE() macro in ch7006_mode.c
- Fix DRM_MODE_ARG() macro in drm_modes.h
- Remove leftover comment from samsung_s6d16d0_mode
- Drop the TODO

@@
@@
struct drm_display_mode {
	...
-	int vrefresh;
	...
};

@@
identifier N;
expression E;
@@
struct drm_display_mode N = {
-	.vrefresh = E
};

@@
identifier N;
expression E;
@@
struct drm_display_mode N[...] = {
...,
{
-	.vrefresh = E
}
,...
};

@@
expression E;
@@
{
	DRM_MODE(...),
-	.vrefresh = E,
}

@@
identifier M, R;
@@
int drm_mode_vrefresh(const struct drm_display_mode *M)
{
  ...
- if (M->vrefresh > 0)
- 	R = M->vrefresh;
- else
  if (...) {
  ...
  }
  ...
}

@@
struct drm_display_mode *p;
expression E;
@@
(
- p->vrefresh = E;
|
- p->vrefresh
+ drm_mode_vrefresh(p)
)

@@
struct drm_display_mode s;
expression E;
@@
(
- s.vrefresh = E;
|
- s.vrefresh
+ drm_mode_vrefresh(&s)
)

@@
expression E;
@@
- drm_mode_vrefresh(E) ? drm_mode_vrefresh(E) : drm_mode_vrefresh(E)
+ drm_mode_vrefresh(E)

@find_substruct@
identifier X;
identifier S;
@@
struct X {
...
	struct drm_display_mode S;
...
};

@@
identifier find_substruct.S;
expression E;
identifier I;
@@
{
.S = {
-	.vrefresh = E
}
}

@@
identifier find_substruct.S;
identifier find_substruct.X;
expression E;
identifier I;
@@
struct X I[...] = {
...,
.S = {
-	.vrefresh = E
}
,...
};

v2: Drop TODO
v3: Rebase
v4: Rebase

Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@siol.net>
Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: CK Hu <ck.hu@mediatek.com>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Jerry Han <hanxu5@huaqin.corp-partner.google.com>
Cc: Icenowy Zheng <icenowy@aosc.io>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Stefan Mavrodiev <stefan@olimex.com>
Cc: Robert Chiras <robert.chiras@nxp.com>
Cc: "Guido Günther" <agx@sigxcpu.org>
Cc: Purism Kernel Team <kernel@puri.sm>
Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Cc: Vincent Abriou <vincent.abriou@st.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Cc: linux-amlogic@lists.infradead.org
Cc: nouveau@lists.freedesktop.org
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200428171940.19552-4-ville.syrjala@linux.intel.com
parent 6770ef33

Documentation/gpu/todo.rst

+0 −20
Original line number Diff line number Diff line
@@ -327,26 +327,6 @@ Contact: Laurent Pinchart, Daniel Vetter 
Level: Intermediate (mostly because it is a huge tasks without good partial

milestones, not technically itself that challenging)



Convert direct mode.vrefresh accesses to use drm_mode_vrefresh()

----------------------------------------------------------------



drm_display_mode.vrefresh isn't guaranteed to be populated. As such, using it

is risky and has been known to cause div-by-zero bugs. Fortunately, drm core

has helper which will use mode.vrefresh if it's !0 and will calculate it from

the timings when it's 0.



Use simple search/replace, or (more fun) cocci to replace instances of direct

vrefresh access with a call to the helper. Check out

https://lists.freedesktop.org/archives/dri-devel/2019-January/205186.html for

inspiration.



Once all instances of vrefresh have been converted, remove vrefresh from

drm_display_mode to avoid future use.



Contact: Sean Paul



Level: Starter



connector register/unregister fixes

-----------------------------------

drivers/gpu/drm/bridge/sii902x.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge, 


	buf[0] = pixel_clock_10kHz & 0xff;

	buf[1] = pixel_clock_10kHz >> 8;

	buf[2] = adj->vrefresh;

	buf[2] = drm_mode_vrefresh(adj);

	buf[3] = 0x00;

	buf[4] = adj->hdisplay;

	buf[5] = adj->hdisplay >> 8;

drivers/gpu/drm/drm_client_modeset.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ again: 
			continue;



		if (cmdline_mode->refresh_specified) {

			if (mode->vrefresh != cmdline_mode->refresh)

			if (drm_mode_vrefresh(mode) != cmdline_mode->refresh)

				continue;

		}

drivers/gpu/drm/drm_edid.c

+161 −167

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/drm_modes.c

+3 −6
Original line number Diff line number Diff line
@@ -759,9 +759,7 @@ int drm_mode_vrefresh(const struct drm_display_mode *mode) 
{

	int refresh = 0;



	if (mode->vrefresh > 0)

		refresh = mode->vrefresh;

	else if (mode->htotal > 0 && mode->vtotal > 0) {

	if (mode->htotal > 0 && mode->vtotal > 0) {

		unsigned int num, den;



		num = mode->clock * 1000;
@@ -1308,7 +1306,7 @@ static int drm_mode_compare(void *priv, struct list_head *lh_a, struct list_head 
	if (diff)

		return diff;



	diff = b->vrefresh - a->vrefresh;

	diff = drm_mode_vrefresh(b) - drm_mode_vrefresh(a);

	if (diff)

		return diff;
@@ -1921,7 +1919,7 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, 
	out->vsync_end = in->vsync_end;

	out->vtotal = in->vtotal;

	out->vscan = in->vscan;

	out->vrefresh = in->vrefresh;

	out->vrefresh = drm_mode_vrefresh(in);

	out->flags = in->flags;

	out->type = in->type;
@@ -1981,7 +1979,6 @@ int drm_mode_convert_umode(struct drm_device *dev, 
	out->vsync_end = in->vsync_end;

	out->vtotal = in->vtotal;

	out->vscan = in->vscan;

	out->vrefresh = in->vrefresh;

	out->flags = in->flags;

	/*

	 * Old xf86-video-vmware (possibly others too) used to

CRA Git | Maintained and supported by SUSTech CRA and CCSE