Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f559ec authored by Chris Wilson's avatar Chris Wilson Committed by Dave Airlie
Browse files

drm: Mark constant arrays of drm_display_mode const 



... and fixup some methods to accept the constant argument.

Now that constant module arrays are loaded into read-only memory, using
const appropriately has some benefits beyond warning the programmer
about likely mistakes.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 60b212f8

drivers/gpu/drm/drm_edid.c

+10 −9
Original line number Diff line number Diff line
@@ -449,12 +449,11 @@ static void edid_fixup_preferred(struct drm_connector *connector, 
struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,

					   int hsize, int vsize, int fresh)

{

	struct drm_display_mode *mode = NULL;

	int i;

	struct drm_display_mode *ptr, *mode;



	mode = NULL;

	for (i = 0; i < drm_num_dmt_modes; i++) {

		ptr = &drm_dmt_modes[i];

		const struct drm_display_mode *ptr = &drm_dmt_modes[i];

		if (hsize == ptr->hdisplay &&

			vsize == ptr->vdisplay &&

			fresh == drm_mode_vrefresh(ptr)) {
@@ -885,7 +884,7 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, 
}



static bool

mode_is_rb(struct drm_display_mode *mode)

mode_is_rb(const struct drm_display_mode *mode)

{

	return (mode->htotal - mode->hdisplay == 160) &&

	       (mode->hsync_end - mode->hdisplay == 80) &&
@@ -894,7 +893,8 @@ mode_is_rb(struct drm_display_mode *mode) 
}



static bool

mode_in_hsync_range(struct drm_display_mode *mode, struct edid *edid, u8 *t)

mode_in_hsync_range(const struct drm_display_mode *mode,

		    struct edid *edid, u8 *t)

{

	int hsync, hmin, hmax;
@@ -910,7 +910,8 @@ mode_in_hsync_range(struct drm_display_mode *mode, struct edid *edid, u8 *t) 
}



static bool

mode_in_vsync_range(struct drm_display_mode *mode, struct edid *edid, u8 *t)

mode_in_vsync_range(const struct drm_display_mode *mode,

		    struct edid *edid, u8 *t)

{

	int vsync, vmin, vmax;
@@ -941,7 +942,7 @@ range_pixel_clock(struct edid *edid, u8 *t) 
}



static bool

mode_in_range(struct drm_display_mode *mode, struct edid *edid,

mode_in_range(const struct drm_display_mode *mode, struct edid *edid,

	      struct detailed_timing *timing)

{

	u32 max_clock;
@@ -1472,7 +1473,7 @@ int drm_add_modes_noedid(struct drm_connector *connector, 
			int hdisplay, int vdisplay)

{

	int i, count, num_modes = 0;

	struct drm_display_mode *mode, *ptr;

	struct drm_display_mode *mode;

	struct drm_device *dev = connector->dev;



	count = sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);
@@ -1482,7 +1483,7 @@ int drm_add_modes_noedid(struct drm_connector *connector, 
		vdisplay = 0;



	for (i = 0; i < count; i++) {

		ptr = &drm_dmt_modes[i];

		const struct drm_display_mode *ptr = &drm_dmt_modes[i];

		if (hdisplay && vdisplay) {

			/*

			 * Only when two are valid, they will be used to check

drivers/gpu/drm/drm_edid_modes.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
 * This table is copied from xfree86/modes/xf86EdidModes.c.

 * But the mode with Reduced blank feature is deleted.

 */

static struct drm_display_mode drm_dmt_modes[] = {

static const struct drm_display_mode drm_dmt_modes[] = {

	/* 640x350@85Hz */

	{ DRM_MODE("640x350", DRM_MODE_TYPE_DRIVER, 31500, 640, 672,

		   736, 832, 0, 350, 382, 385, 445, 0,
@@ -266,7 +266,7 @@ static struct drm_display_mode drm_dmt_modes[] = { 
static const int drm_num_dmt_modes =

	sizeof(drm_dmt_modes) / sizeof(struct drm_display_mode);



static struct drm_display_mode edid_est_modes[] = {

static const struct drm_display_mode edid_est_modes[] = {

	{ DRM_MODE("800x600", DRM_MODE_TYPE_DRIVER, 40000, 800, 840,

		   968, 1056, 0, 600, 601, 605, 628, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, /* 800x600@60Hz */

drivers/gpu/drm/drm_modes.c

+3 −3
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ EXPORT_SYMBOL(drm_mode_height); 
 *

 * Return @modes's hsync rate in kHz, rounded to the nearest int.

 */

int drm_mode_hsync(struct drm_display_mode *mode)

int drm_mode_hsync(const struct drm_display_mode *mode)

{

	unsigned int calc_val;
@@ -627,7 +627,7 @@ EXPORT_SYMBOL(drm_mode_hsync); 
 * If it is 70.288, it will return 70Hz.

 * If it is 59.6, it will return 60Hz.

 */

int drm_mode_vrefresh(struct drm_display_mode *mode)

int drm_mode_vrefresh(const struct drm_display_mode *mode)

{

	int refresh = 0;

	unsigned int calc_val;
@@ -725,7 +725,7 @@ EXPORT_SYMBOL(drm_mode_set_crtcinfo); 
 * a pointer to it.  Used to create new instances of established modes.

 */

struct drm_display_mode *drm_mode_duplicate(struct drm_device *dev,

					    struct drm_display_mode *mode)

					    const struct drm_display_mode *mode)

{

	struct drm_display_mode *nmode;

	int new_id;

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector) 
 * Note!  This is in reply order (see loop in get_tv_modes).

 * XXX: all 60Hz refresh?

 */

struct drm_display_mode sdvo_tv_modes[] = {

static const struct drm_display_mode sdvo_tv_modes[] = {

	{ DRM_MODE("320x200", DRM_MODE_TYPE_DRIVER, 5815, 320, 321, 384,

		   416, 0, 200, 201, 232, 233, 0,

		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },

drivers/gpu/drm/nouveau/nv17_tv.c

+3 −1
Original line number Diff line number Diff line
@@ -197,10 +197,12 @@ static int nv17_tv_get_ld_modes(struct drm_encoder *encoder, 
				struct drm_connector *connector)

{

	struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);

	struct drm_display_mode *mode, *tv_mode;

	const struct drm_display_mode *tv_mode;

	int n = 0;



	for (tv_mode = nv17_tv_modes; tv_mode->hdisplay; tv_mode++) {

		struct drm_display_mode *mode;



		mode = drm_mode_duplicate(encoder->dev, tv_mode);



		mode->clock = tv_norm->tv_enc_mode.vrefresh *