aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_modes.c4
-rw-r--r--drivers/gpu/drm/i2c/adv7511.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 487d0e35c134..2cca85f23138 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -278,7 +278,7 @@ struct drm_display_mode *drm_cvt_mode(struct drm_device *dev, int hdisplay,
278 hblank = drm_mode->hdisplay * hblank_percentage / 278 hblank = drm_mode->hdisplay * hblank_percentage /
279 (100 * HV_FACTOR - hblank_percentage); 279 (100 * HV_FACTOR - hblank_percentage);
280 hblank -= hblank % (2 * CVT_H_GRANULARITY); 280 hblank -= hblank % (2 * CVT_H_GRANULARITY);
281 /* 14. find the total pixes per line */ 281 /* 14. find the total pixels per line */
282 drm_mode->htotal = drm_mode->hdisplay + hblank; 282 drm_mode->htotal = drm_mode->hdisplay + hblank;
283 drm_mode->hsync_end = drm_mode->hdisplay + hblank / 2; 283 drm_mode->hsync_end = drm_mode->hdisplay + hblank / 2;
284 drm_mode->hsync_start = drm_mode->hsync_end - 284 drm_mode->hsync_start = drm_mode->hsync_end -
@@ -1209,7 +1209,7 @@ EXPORT_SYMBOL(drm_mode_connector_list_update);
1209 * <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd] 1209 * <xres>x<yres>[M][R][-<bpp>][@<refresh>][i][m][eDd]
1210 * 1210 *
1211 * The intermediate drm_cmdline_mode structure is required to store additional 1211 * The intermediate drm_cmdline_mode structure is required to store additional
1212 * options from the command line modline like the force-enabel/disable flag. 1212 * options from the command line modline like the force-enable/disable flag.
1213 * 1213 *
1214 * Returns: 1214 * Returns:
1215 * True if a valid modeline has been parsed, false otherwise. 1215 * True if a valid modeline has been parsed, false otherwise.
diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c
index fa140e04d5fa..61aa824d45d2 100644
--- a/drivers/gpu/drm/i2c/adv7511.c
+++ b/drivers/gpu/drm/i2c/adv7511.c
@@ -573,7 +573,7 @@ static void adv7511_encoder_dpms(struct drm_encoder *encoder, int mode)
573 * goes low the adv7511 is reset and the outputs are disabled 573 * goes low the adv7511 is reset and the outputs are disabled
574 * which might cause the monitor to go to standby again. To 574 * which might cause the monitor to go to standby again. To
575 * avoid this we ignore the HDP pin for the first few seconds 575 * avoid this we ignore the HDP pin for the first few seconds
576 * after enabeling the output. 576 * after enabling the output.
577 */ 577 */
578 regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2, 578 regmap_update_bits(adv7511->regmap, ADV7511_REG_POWER2,
579 ADV7511_REG_POWER2_HDP_SRC_MASK, 579 ADV7511_REG_POWER2_HDP_SRC_MASK,