From 16427803fe85ac001fe51baa531dfd19a3e86f89 Mon Sep 17 00:00:00 2001
From: Ansa89 <ansalonistefano@gmail.com>
Date: Tue, 4 Oct 2016 09:44:15 +0200
Subject: [PATCH] Linux 4.8

---
 avga3000.diff |  2 +-
 linux.diff    | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/avga3000.diff b/avga3000.diff
index 532dcad..0de07b3 100644
--- a/avga3000.diff
+++ b/avga3000.diff
@@ -66,7 +66,7 @@
 +				p2pll->pll_out_min = 50000;
 +		}
 +
- 		if (crev >= 4) {
+ 		if (((frev < 2) && (crev >= 4)) || (frev >= 2)) {
  			p1pll->lcd_pll_out_min =
  				le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100;
 --- a/drivers/gpu/drm/radeon/radeon_bios.c
diff --git a/linux.diff b/linux.diff
index 40ec66b..c569490 100644
--- a/linux.diff
+++ b/linux.diff
@@ -1,6 +1,6 @@
 --- a/drivers/gpu/drm/drm_edid.c
 +++ b/drivers/gpu/drm/drm_edid.c
-@@ -143,6 +143,67 @@ static struct edid_quirk {
+@@ -148,6 +148,67 @@ static struct edid_quirk {
  };
  
  /*
@@ -68,7 +68,7 @@
   * Autogenerated from the DMT spec.
   * This table is copied from xfree86/modes/xf86EdidModes.c.
   */
-@@ -1538,6 +1599,46 @@ mode_is_rb(const struct drm_display_mode *mode)
+@@ -1543,6 +1604,46 @@ mode_is_rb(const struct drm_display_mode *mode)
  	       (mode->vsync_start - mode->vdisplay == 3);
  }
  
@@ -117,7 +117,7 @@
   * @dev: Device to duplicate against
 --- a/drivers/gpu/drm/drm_fb_helper.c
 +++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1715,6 +1715,34 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
+@@ -1684,6 +1684,34 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
  	if (cmdline_mode->rb || cmdline_mode->margins)
  		goto create_mode;
  
@@ -154,7 +154,7 @@
  	list_for_each_entry(mode, &fb_helper_conn->connector->modes, head) {
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
-@@ -1264,6 +1264,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
+@@ -1266,6 +1266,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
  	bool interlace = false, margins = false, was_digit = false;
  	int i;
  	enum drm_connector_force force = DRM_FORCE_UNSPECIFIED;
@@ -163,7 +163,7 @@
  
  #ifdef CONFIG_FB
  	if (!mode_option)
-@@ -1353,6 +1355,14 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
+@@ -1355,6 +1357,14 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
  
  			force = DRM_FORCE_OFF;
  			break;
@@ -178,7 +178,7 @@
  		default:
  			goto done;
  		}
-@@ -1397,6 +1407,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
+@@ -1399,6 +1409,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
  	mode->interlace = interlace;
  	mode->margins = margins;
  	mode->force = force;
@@ -191,7 +191,7 @@
  }
 --- a/drivers/gpu/drm/drm_probe_helper.c
 +++ b/drivers/gpu/drm/drm_probe_helper.c
-@@ -258,6 +258,12 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connect
+@@ -275,6 +275,12 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connect
  		goto prune;
  	}
  
@@ -206,7 +206,7 @@
  
 --- a/include/drm/drm_crtc.h
 +++ b/include/drm/drm_crtc.h
-@@ -1245,6 +1245,12 @@ struct drm_connector {
+@@ -1392,6 +1392,12 @@ struct drm_connector {
  	uint8_t num_h_tile, num_v_tile;
  	uint8_t tile_h_loc, tile_v_loc;
  	uint16_t tile_h_size, tile_v_size;
@@ -219,20 +219,20 @@
  };
  
  /**
-@@ -2513,6 +2519,10 @@ extern int drm_edid_header_is_valid(const u8 *raw_edid);
- extern bool drm_edid_is_valid(struct edid *edid);
- extern void drm_edid_get_monitor_name(struct edid *edid, char *name,
- 				      int buflen);
+@@ -3173,6 +3179,10 @@ int drm_edid_header_is_valid(const u8 *raw_edid);
+ bool drm_edid_is_valid(struct edid *edid);
+ void drm_edid_get_monitor_name(struct edid *edid, char *name,
+ 			       int buflen);
 +struct drm_display_mode *drm_mode_find_c15khz(struct drm_device *dev,
 +					      int hsize, int vsize, int fresh);
 +struct drm_display_mode *drm_mode_find_c25khz(struct drm_device *dev,
-+					      int hsize, int vsize, int fresh);
- 
- extern struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev,
- 							 char topology[8]);
++					      int hsize, int vsize, int fresh); 
+ struct drm_display_mode *drm_mode_find_dmt(struct drm_device *dev,
+ 					   int hsize, int vsize, int fresh,
+					   bool rb);
 --- a/include/drm/drm_modes.h
 +++ b/include/drm/drm_modes.h
-@@ -411,6 +411,8 @@ struct drm_cmdline_mode {
+@@ -413,6 +413,8 @@ struct drm_cmdline_mode {
  	bool cvt;
  	bool margins;
  	enum drm_connector_force force;