Skip to content

Commit

Permalink
Linux 4.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Ansa89 committed May 2, 2017
1 parent 47a79e8 commit f0d2324
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion avga3000.diff
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
#include <linux/slab.h>
#include <linux/acpi.h>
/*
@@ -652,10 +654,32 @@ static inline bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
@@ -656,10 +658,32 @@ static inline bool radeon_acpi_vfct_bios(struct radeon_device *rdev)

bool radeon_get_bios(struct radeon_device *rdev)
{
Expand Down
18 changes: 9 additions & 9 deletions linux.diff
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -148,6 +148,67 @@ static struct edid_quirk {
@@ -154,6 +154,67 @@ static struct edid_quirk {
};

/*
Expand Down Expand Up @@ -68,7 +68,7 @@
* Autogenerated from the DMT spec.
* This table is copied from xfree86/modes/xf86EdidModes.c.
*/
@@ -1574,6 +1635,46 @@ mode_is_rb(const struct drm_display_mode *mode)
@@ -1580,6 +1641,46 @@ mode_is_rb(const struct drm_display_mode *mode)
(mode->vsync_start - mode->vdisplay == 3);
}

Expand Down Expand Up @@ -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
@@ -1765,6 +1765,34 @@ struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *f
@@ -1771,6 +1771,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;

Expand Down Expand Up @@ -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
@@ -1292,6 +1292,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -1312,6 +1312,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;
Expand All @@ -163,7 +163,7 @@

#ifdef CONFIG_FB
if (!mode_option)
@@ -1381,6 +1383,14 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -1401,6 +1403,14 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,

force = DRM_FORCE_OFF;
break;
Expand All @@ -178,7 +178,7 @@
default:
goto done;
}
@@ -1425,6 +1435,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -1445,6 +1455,10 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
mode->interlace = interlace;
mode->margins = margins;
mode->force = force;
Expand All @@ -191,7 +191,7 @@
}
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -299,6 +299,12 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connect
@@ -305,6 +305,12 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connect
goto prune;
}

Expand All @@ -215,7 +215,7 @@
};

/**
@@ -744,6 +746,12 @@ struct drm_connector {
@@ -759,6 +761,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;
Expand All @@ -230,7 +230,7 @@
#define obj_to_connector(x) container_of(x, struct drm_connector, base)
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -453,6 +453,10 @@ int drm_edid_header_is_valid(const u8 *raw_edid);
@@ -472,6 +472,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);
Expand Down

0 comments on commit f0d2324

Please sign in to comment.