aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_bufs.c2
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
-rw-r--r--drivers/gpu/drm/radeon/atombios.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index f7ba82ebf65a..2092e7bb788f 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -961,7 +961,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
961 dma->buflist[i + dma->buf_count] = &entry->buflist[i]; 961 dma->buflist[i + dma->buf_count] = &entry->buflist[i];
962 } 962 }
963 963
964 /* No allocations failed, so now we can replace the orginal pagelist 964 /* No allocations failed, so now we can replace the original pagelist
965 * with the new one. 965 * with the new one.
966 */ 966 */
967 if (dma->page_count) { 967 if (dma->page_count) {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c7502b6b1600..f27e3703a716 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -905,9 +905,9 @@ intel_g4x_find_best_PLL(const intel_limit_t *limit, struct drm_crtc *crtc,
905 905
906 memset(best_clock, 0, sizeof(*best_clock)); 906 memset(best_clock, 0, sizeof(*best_clock));
907 max_n = limit->n.max; 907 max_n = limit->n.max;
908 /* based on hardware requriment prefer smaller n to precision */ 908 /* based on hardware requirement, prefer smaller n to precision */
909 for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) { 909 for (clock.n = limit->n.min; clock.n <= max_n; clock.n++) {
910 /* based on hardware requirment prefere larger m1,m2 */ 910 /* based on hardware requirement, prefere larger m1,m2 */
911 for (clock.m1 = limit->m1.max; 911 for (clock.m1 = limit->m1.max;
912 clock.m1 >= limit->m1.min; clock.m1--) { 912 clock.m1 >= limit->m1.min; clock.m1--) {
913 for (clock.m2 = limit->m2.max; 913 for (clock.m2 = limit->m2.max;
diff --git a/drivers/gpu/drm/radeon/atombios.h b/drivers/gpu/drm/radeon/atombios.h
index 27e2c715be11..5319d9e2f7ba 100644
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@ -3780,7 +3780,7 @@ typedef struct _ATOM_ASIC_SS_ASSIGNMENT
3780 UCHAR ucReserved[2]; 3780 UCHAR ucReserved[2];
3781}ATOM_ASIC_SS_ASSIGNMENT; 3781}ATOM_ASIC_SS_ASSIGNMENT;
3782 3782
3783//Define ucClockIndication, SW uses the IDs below to search if the SS is requried/enabled on a clock branch/signal type. 3783//Define ucClockIndication, SW uses the IDs below to search if the SS is required/enabled on a clock branch/signal type.
3784//SS is not required or enabled if a match is not found. 3784//SS is not required or enabled if a match is not found.
3785#define ASIC_INTERNAL_MEMORY_SS 1 3785#define ASIC_INTERNAL_MEMORY_SS 1
3786#define ASIC_INTERNAL_ENGINE_SS 2 3786#define ASIC_INTERNAL_ENGINE_SS 2
@@ -5895,7 +5895,7 @@ typedef struct _ATOM_PPLIB_RS780_CLOCK_INFO
5895 UCHAR ucPadding; // For proper alignment and size. 5895 UCHAR ucPadding; // For proper alignment and size.
5896 USHORT usVDDC; // For the 780, use: None, Low, High, Variable 5896 USHORT usVDDC; // For the 780, use: None, Low, High, Variable
5897 UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16} 5897 UCHAR ucMaxHTLinkWidth; // From SBIOS - {2, 4, 8, 16}
5898 UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requriement. 5898 UCHAR ucMinHTLinkWidth; // From SBIOS - {2, 4, 8, 16}. Effective only if CDLW enabled. Minimum down stream width could be bigger as display BW requirement.
5899 USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200). 5899 USHORT usHTLinkFreq; // See definition ATOM_PPLIB_RS780_HTLINKFREQ_xxx or in MHz(>=200).
5900 ULONG ulFlags; 5900 ULONG ulFlags;
5901} ATOM_PPLIB_RS780_CLOCK_INFO; 5901} ATOM_PPLIB_RS780_CLOCK_INFO;